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

Renamed private member file0

This commit is contained in:
Daniel Marjamäki 2018-06-17 09:06:16 +02:00
parent 517d8f9684
commit 0ca96f2a7d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/preprocessor.cpp
View File

@ -492,8 +492,8 @@ void Preprocessor::preprocess(std::istream &srcCodeStream, std::string &processe
{ {
(void)includePaths; (void)includePaths;
if (file0.empty()) if (mFile0.empty())
file0 = filename; mFile0 = filename;
simplecpp::OutputList outputList; simplecpp::OutputList outputList;
std::vector<std::string> files; std::vector<std::string> files;
@ -732,7 +732,7 @@ void Preprocessor::error(const std::string &filename, unsigned int linenr, const
locationList.push_back(loc); locationList.push_back(loc);
} }
mErrorLogger->reportErr(ErrorLogger::ErrorMessage(locationList, mErrorLogger->reportErr(ErrorLogger::ErrorMessage(locationList,
file0, mFile0,
Severity::error, Severity::error,
msg, msg,
"preprocessorErrorDirective", "preprocessorErrorDirective",
@ -766,7 +766,7 @@ void Preprocessor::missingInclude(const std::string &filename, unsigned int line
loc.setfile(Path::toNativeSeparators(filename)); loc.setfile(Path::toNativeSeparators(filename));
locationList.push_back(loc); locationList.push_back(loc);
} }
ErrorLogger::ErrorMessage errmsg(locationList, file0, Severity::information, ErrorLogger::ErrorMessage errmsg(locationList, mFile0, Severity::information,
(headerType==SystemHeader) ? (headerType==SystemHeader) ?
"Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results." : "Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results." :
"Include file: \"" + header + "\" not found.", "Include file: \"" + header + "\" not found.",
@ -812,7 +812,7 @@ void Preprocessor::validateCfgError(const std::string &file, const unsigned int
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList; std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
const ErrorLogger::ErrorMessage::FileLocation loc(file, line); const ErrorLogger::ErrorMessage::FileLocation loc(file, line);
locationList.push_back(loc); locationList.push_back(loc);
const ErrorLogger::ErrorMessage errmsg(locationList, file0, Severity::information, "Skipping configuration '" + cfg + "' since the value of '" + macro + "' is unknown. Use -D if you want to check it. You can use -U to skip it explicitly.", id, false); const ErrorLogger::ErrorMessage errmsg(locationList, mFile0, Severity::information, "Skipping configuration '" + cfg + "' since the value of '" + macro + "' is unknown. Use -D if you want to check it. You can use -U to skip it explicitly.", id, false);
mErrorLogger->reportInfo(errmsg); mErrorLogger->reportInfo(errmsg);
} }

4
lib/preprocessor.h
View File

@ -192,7 +192,7 @@ public:
static void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings); static void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings);
void setFile0(const std::string &f) { void setFile0(const std::string &f) {
file0 = f; mFile0 = f;
} }
/** /**
@ -215,7 +215,7 @@ private:
std::map<std::string, simplecpp::TokenList *> mTokenLists; std::map<std::string, simplecpp::TokenList *> mTokenLists;
/** filename for cpp/c file - useful when reporting errors */ /** filename for cpp/c file - useful when reporting errors */
std::string file0; std::string mFile0;
}; };
/// @} /// @}