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

Refactoring: Replace '1', '2', '3' magic characters with enum names: REPORT_OUT='1',REPORT_ERROR='2', CHILD_END='3' in ThreadExecutor.

This commit is contained in:
Reijo Tomperi 2012-01-03 20:51:16 +02:00
parent 8d84e5f852
commit 1b03667d5b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cli/threadexecutor.cpp
View File

@ -67,7 +67,7 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
return -1; return -1;
} }
if (type != '1' && type != '2' && type != '3') { if (type != REPORT_OUT && type != REPORT_ERROR && type != CHILD_END) {
std::cerr << "#### You found a bug from cppcheck.\nThreadExecutor::handleRead error, type was:" << type << std::endl; std::cerr << "#### You found a bug from cppcheck.\nThreadExecutor::handleRead error, type was:" << type << std::endl;
exit(0); exit(0);
} }
@ -84,9 +84,9 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
exit(0); exit(0);
} }
if (type == '1') { if (type == REPORT_OUT) {
_errorLogger.reportOut(buf); _errorLogger.reportOut(buf);
} else if (type == '2') { } else if (type == REPORT_ERROR) {
ErrorLogger::ErrorMessage msg; ErrorLogger::ErrorMessage msg;
msg.deserialize(buf); msg.deserialize(buf);
@ -105,7 +105,7 @@ int ThreadExecutor::handleRead(int rpipe, unsigned int &result)
_errorLogger.reportErr(msg); _errorLogger.reportErr(msg);
} }
} }
} else if (type == '3') { } else if (type == CHILD_END) {
std::istringstream iss(buf); std::istringstream iss(buf);
unsigned int fileResult = 0; unsigned int fileResult = 0;
iss >> fileResult; iss >> fileResult;
@ -176,7 +176,7 @@ unsigned int ThreadExecutor::check()
std::ostringstream oss; std::ostringstream oss;
oss << resultOfCheck; oss << resultOfCheck;
writeToPipe('3', oss.str()); writeToPipe(CHILD_END, oss.str());
exit(0); exit(0);
} }
@ -280,12 +280,12 @@ void ThreadExecutor::writeToPipe(char type, const std::string &data)
void ThreadExecutor::reportOut(const std::string &outmsg) void ThreadExecutor::reportOut(const std::string &outmsg)
{ {
writeToPipe('1', outmsg); writeToPipe(REPORT_OUT, outmsg);
} }
void ThreadExecutor::reportErr(const ErrorLogger::ErrorMessage &msg) void ThreadExecutor::reportErr(const ErrorLogger::ErrorMessage &msg)
{ {
writeToPipe('2', msg.serialize()); writeToPipe(REPORT_ERROR, msg.serialize());
} }
#else #else

1
cli/threadexecutor.h
View File

@ -79,6 +79,7 @@ private:
*/ */
int _wpipe; int _wpipe;
std::list<std::string> _errorList; std::list<std::string> _errorList;
enum PipeSignal {REPORT_OUT='1',REPORT_ERROR='2', CHILD_END='3'};
public: public:
/** /**
* @return true if support for threads exist. * @return true if support for threads exist.