walkero/cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Borland C++: Fixed compiler errors. When using 'a?b:c', Borland requires that b and c are the same type

Browse Source
This commit is contained in:
Daniel Marjamäki 2010-06-19 08:52:14 +02:00
parent 9cccdf0f9f
commit dcdbe117e6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/checkbufferoverrun.cpp
View File

@ -676,7 +676,7 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str
// Detect few strcat() calls // Detect few strcat() calls
const std::string strcatPattern = varid > 0 ? "strcat ( %varid% , %str% ) ;" : ("strcat ( " + varnames + " , %str% ) ;"); const std::string strcatPattern = varid > 0 ? std::string("strcat ( %varid% , %str% ) ;") : ("strcat ( " + varnames + " , %str% ) ;");
if (Token::Match(tok, strcatPattern.c_str(), varid)) if (Token::Match(tok, strcatPattern.c_str(), varid))
{ {
size_t charactersAppend = 0; size_t charactersAppend = 0;
@ -695,14 +695,14 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str
} }
// sprintf.. // sprintf..
const std::string sprintfPattern = varid > 0 ? "sprintf ( %varid% , %str% [,)]" : ("sprintf ( " + varnames + " , %str% [,)]"); const std::string sprintfPattern = varid > 0 ? std::string("sprintf ( %varid% , %str% [,)]") : ("sprintf ( " + varnames + " , %str% [,)]");
if (Token::Match(tok, sprintfPattern.c_str(), varid)) if (Token::Match(tok, sprintfPattern.c_str(), varid))
{ {
checkSprintfCall(tok, total_size); checkSprintfCall(tok, total_size);
} }
// snprintf.. // snprintf..
const std::string snprintfPattern = varid > 0 ? "snprintf ( %varid% , %num% ," : ("snprintf ( " + varnames + " , %num% ,"); const std::string snprintfPattern = varid > 0 ? std::string("snprintf ( %varid% , %num% ,") : ("snprintf ( " + varnames + " , %num% ,");
if (Token::Match(tok, snprintfPattern.c_str(), varid)) if (Token::Match(tok, snprintfPattern.c_str(), varid))
{ {
int n = MathLib::toLongNumber(tok->strAt(4 + varc)); int n = MathLib::toLongNumber(tok->strAt(4 + varc));