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

Rename errorOutput=>mErrorOutput

This commit is contained in:
Daniel Marjamäki 2019-07-15 18:16:07 +02:00
parent 876d8c9829
commit 122ae198b7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/cppcheckexecutor.cpp
View File

@ -79,13 +79,13 @@
/*static*/ FILE* CppCheckExecutor::mExceptionOutput = stdout; /*static*/ FILE* CppCheckExecutor::mExceptionOutput = stdout;
CppCheckExecutor::CppCheckExecutor() CppCheckExecutor::CppCheckExecutor()
: _settings(nullptr), latestProgressOutputTime(0), errorOutput(nullptr), errorlist(false) : _settings(nullptr), latestProgressOutputTime(0), mErrorOutput(nullptr), errorlist(false)
{ {
} }
CppCheckExecutor::~CppCheckExecutor() CppCheckExecutor::~CppCheckExecutor()
{ {
delete errorOutput; delete mErrorOutput;
} }
bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* const argv[]) bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* const argv[])
@ -851,7 +851,7 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck, int /*argc*/, const cha
latestProgressOutputTime = std::time(nullptr); latestProgressOutputTime = std::time(nullptr);
if (!settings.outputFile.empty()) { if (!settings.outputFile.empty()) {
errorOutput = new std::ofstream(settings.outputFile); mErrorOutput = new std::ofstream(settings.outputFile);
} }
if (settings.xml) { if (settings.xml) {
@ -1000,8 +1000,8 @@ void CppCheckExecutor::reportErr(const std::string &errmsg)
return; return;
_errorList.insert(errmsg); _errorList.insert(errmsg);
if (errorOutput) if (mErrorOutput)
*errorOutput << errmsg << std::endl; *mErrorOutput << errmsg << std::endl;
else { else {
std::cerr << ansiToOEM(errmsg, (_settings == nullptr) ? true : !_settings->xml) << std::endl; std::cerr << ansiToOEM(errmsg, (_settings == nullptr) ? true : !_settings->xml) << std::endl;
} }

2
cli/cppcheckexecutor.h
View File

@ -185,7 +185,7 @@ private:
/** /**
* Error output * Error output
*/ */
std::ofstream *errorOutput; std::ofstream *mErrorOutput;
/** /**
* Has --errorlist been given? * Has --errorlist been given?