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

tools/reduce: remove cast in function parameter

This commit is contained in:
Daniel Marjamäki 2013-01-03 18:28:20 +01:00
parent 16612d010d
commit 76c8887f5f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/reduce.cpp
View File

@ -482,7 +482,7 @@ static bool cleanupStatements(const ReduceSettings &settings, std::vector<std::s
// function parameter.. // function parameter..
if (std::strchr("(,", line[pos])) { if (std::strchr("(,", line[pos])) {
std::string::size_type pos1 = (line[pos] == ',') ? pos : (pos + 1U); const std::string::size_type pos1 = (line[pos] == ',') ? pos : (pos + 1U);
std::string::size_type pos2 = pos + 1; std::string::size_type pos2 = pos + 1;
while (pos2 < line.size() && std::isspace(line[pos2])) while (pos2 < line.size() && std::isspace(line[pos2]))
++pos2; ++pos2;
@ -497,6 +497,7 @@ static bool cleanupStatements(const ReduceSettings &settings, std::vector<std::s
std::cout << "Removed function parameter at line " << i << ", column " << pos1 << std::endl; std::cout << "Removed function parameter at line " << i << ", column " << pos1 << std::endl;
line = filedata[i]; line = filedata[i];
changed = true; changed = true;
continue;
} else { } else {
std::cout << "Kept function parameter at line " << i << ", column " << pos1 << std::endl; std::cout << "Kept function parameter at line " << i << ", column " << pos1 << std::endl;
filedata[i] = backup; filedata[i] = backup;
@ -505,7 +506,7 @@ static bool cleanupStatements(const ReduceSettings &settings, std::vector<std::s
} }
// cast // cast
else if (line[pos] == '=') { if (line[pos] == '=' || line[pos] == '(') {
const std::string::size_type pos1 = pos + 1; const std::string::size_type pos1 = pos + 1;
std::string::size_type pos2 = pos + 1; std::string::size_type pos2 = pos + 1;
while (pos2 < line.size() && std::isspace(line[pos2])) while (pos2 < line.size() && std::isspace(line[pos2]))
@ -553,9 +554,11 @@ int main(int argc, char *argv[])
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
if (strcmp(argv[i], "--stdout") == 0) if (strcmp(argv[i], "--stdout") == 0)
stdout = true; stdout = true;
else if (strcmp(argv[i], "--hang") == 0) else if (strcmp(argv[i], "--hang") == 0) {
settings.hang = true; settings.hang = true;
else if (strncmp(argv[i], "--maxtime=", 10) == 0) if (settings.maxtime == ~0U)
settings.maxtime = 300; // default timeout = 5 minutes
} else if (strncmp(argv[i], "--maxtime=", 10) == 0)
settings.maxtime = std::atoi(argv[i] + 10); settings.maxtime = std::atoi(argv[i] + 10);
else if (settings.filename==NULL && strchr(argv[i],'.')) else if (settings.filename==NULL && strchr(argv[i],'.'))
settings.filename = argv[i]; settings.filename = argv[i];