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

Fixed remaining VS warnings (hopefully all of them, this time)

This commit is contained in:
PKEuS 2014-06-04 22:27:51 +02:00
parent 0a0f1072c0
commit f7f639465a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cli/cmdlineparser.cpp
View File

@ -507,24 +507,24 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
Library::Error err = _settings->library.load(argv[0], argv[i]+10); Library::Error err = _settings->library.load(argv[0], argv[i]+10);
std::string errmsg; std::string errmsg;
switch (err.errorcode) { switch (err.errorcode) {
case Library::ErrorCode::OK: case Library::OK:
break; break;
case Library::ErrorCode::FILE_NOT_FOUND: case Library::FILE_NOT_FOUND:
errmsg = "File not found"; errmsg = "File not found";
break; break;
case Library::ErrorCode::BAD_XML: case Library::BAD_XML:
errmsg = "Bad XML"; errmsg = "Bad XML";
break; break;
case Library::ErrorCode::BAD_ELEMENT: case Library::BAD_ELEMENT:
errmsg = "Unexpected element"; errmsg = "Unexpected element";
break; break;
case Library::ErrorCode::MISSING_ATTRIBUTE: case Library::MISSING_ATTRIBUTE:
errmsg = "Missing attribute"; errmsg = "Missing attribute";
break; break;
case Library::ErrorCode::BAD_ATTRIBUTE: case Library::BAD_ATTRIBUTE:
errmsg = "Bad attribute"; errmsg = "Bad attribute";
break; break;
case Library::ErrorCode::BAD_ATTRIBUTE_VALUE: case Library::BAD_ATTRIBUTE_VALUE:
errmsg = "Bad attribute value"; errmsg = "Bad attribute value";
break; break;
} }

4
cli/cppcheckexecutor.cpp
View File

@ -483,10 +483,10 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck, int /*argc*/, const cha
{ {
Settings& settings = cppcheck.settings(); Settings& settings = cppcheck.settings();
_settings = &settings; _settings = &settings;
bool std = (settings.library.load(argv[0], "std.cfg").errorcode == Library::ErrorCode::OK); bool std = (settings.library.load(argv[0], "std.cfg").errorcode == Library::OK);
bool posix = true; bool posix = true;
if (settings.standards.posix) if (settings.standards.posix)
posix = (settings.library.load(argv[0], "posix.cfg").errorcode == Library::ErrorCode::OK); posix = (settings.library.load(argv[0], "posix.cfg").errorcode == Library::OK);
if (!std || !posix) { if (!std || !posix) {
const std::list<ErrorLogger::ErrorMessage::FileLocation> callstack; const std::list<ErrorLogger::ErrorMessage::FileLocation> callstack;