Fix ticket cppcheck-opensource#2040 (some cli messages are missing a return at the end)

kimmov · kimmov · commit 940679e242a1 · 2010-09-10T18:39:36.000+03:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -60,6 +60,11 @@ CmdLineParser::CmdLineParser(Settings *settings)
 {
 }
 
+void CmdLineParser::PrintMessage(const std::string &message)
+{
+    std::cout << message << std::endl;
+}
+
 bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
 {
     for (int i = 1; i < argc; i++)
@@ -100,14 +105,17 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
 
             if (i >= argc)
             {
-                std::cout << "cppcheck: No file specified for the --suppressions option";
+                PrintMessage("cppcheck: No file specified for the --suppressions option");
                 return false;
             }
 
             std::ifstream f(argv[i]);
             if (!f.is_open())
             {
-                std::cout << "cppcheck: Couldn't open the file \"" << std::string(argv[i]) << "\"";
+                std::string message("cppcheck: Couldn't open the file \"");
+                message += std::string(argv[i]);
+                message += "\"";
+                PrintMessage(message);
                 return false;
             }
             const std::string errmsg(_settings->nomsg.parseFile(f));
@@ -172,7 +180,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
             if (!(iss >> _settings->_exitCode))
             {
                 _settings->_exitCode = 0;
-                std::cout << "cppcheck: Argument must be an integer. Try something like '--error-exitcode=1'";
+                PrintMessage("cppcheck: Argument must be an integer. Try something like '--error-exitcode=1'");
                 return false;
             }
         }
@@ -199,7 +207,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
                 ++i;
                 if (i >= argc)
                 {
-                    std::cout << "cppcheck: argument to '-I' is missing";
+                    PrintMessage("cppcheck: argument to '-I' is missing");
                     return false;
                 }
                 path = argv[i];
@@ -239,7 +247,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
             ++i;
             if (i >= argc)
             {
-                std::cout << "cppcheck: argument to '--template' is missing";
+                PrintMessage("cppcheck: argument to '--template' is missing");
                 return false;
             }
 
@@ -262,7 +270,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
                 ++i;
                 if (i >= argc)
                 {
-                    std::cout << "cppcheck: argument to '-j' is missing";
+                    PrintMessage("cppcheck: argument to '-j' is missing");
                     return false;
                 }
 
@@ -279,13 +287,13 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
             std::istringstream iss(numberString);
             if (!(iss >> _settings->_jobs))
             {
-                std::cout << "cppcheck: argument to '-j' is not a number";
+                PrintMessage("cppcheck: argument to '-j' is not a number");
                 return false;
             }
 
             if (_settings->_jobs > 1000)
             {
-                std::cout << "cppcheck: argument for '-j' is allowed to be 1000 at max";
+                PrintMessage("cppcheck: argument for '-j' is allowed to be 1000 at max");
                 return false;
             }
         }
@@ -353,7 +361,10 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
 
         else if (strncmp(argv[i], "-", 1) == 0 || strncmp(argv[i], "--", 2) == 0)
         {
-            std::cout << "cppcheck: error: unrecognized command line option \"" << argv[i] << "\"";
+            std::string message("cppcheck: error: unrecognized command line option \"");
+            message += argv[i];
+            message +=  "\"";
+            PrintMessage(message);
             return false;
         }
 
@@ -363,13 +374,13 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
 
     if (_settings->isEnabled("unusedFunctions") && _settings->_jobs > 1)
     {
-        std::cout << "unusedFunctions check can't be used with -j option, so it was disabled.";
+        PrintMessage("unusedFunctions check can't be used with -j option, so it was disabled.");
     }
 
     // FIXME: Make the _settings.test_2_pass thread safe
     if (_settings->test_2_pass && _settings->_jobs > 1)
     {
-        std::cout << "--test-2-pass doesn't work with -j option yet.";
+        PrintMessage("--test-2-pass doesn't work with -j option yet.");
     }
 
 
@@ -382,7 +393,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
     }
     else if (_pathnames.empty())
     {
-        std::cout << "cppcheck: No C or C++ source files found.";
+        PrintMessage("cppcheck: No C or C++ source files found.");
         return false;
     }
 
diff --git a/cli/cmdlineparser.h b/cli/cmdlineparser.h
@@ -91,6 +91,11 @@ class CmdLineParser
      */
     void PrintHelp();
 
+    /**
+     * Print message (to console?).
+     */
+    void PrintMessage(const std::string &message);
+
 private:
     Settings *_settings;
     bool _showHelp;

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,11 @@ CmdLineParser::CmdLineParser(Settings *settings)`
`60`	`60`	`{`
`61`	`61`	`}`
`62`	`62`
	`63`	`+void CmdLineParser::PrintMessage(const std::string &message)`
	`64`	`+{`
	`65`	`+ std::cout << message << std::endl;`
	`66`	`+}`
	`67`	`+`
`63`	`68`	`bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`64`	`69`	`{`
`65`	`70`	`for (int i = 1; i < argc; i++)`
`@@ -100,14 +105,17 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`100`	`105`
`101`	`106`	`if (i >= argc)`
`102`	`107`	`{`
`103`		`- std::cout << "cppcheck: No file specified for the --suppressions option";`
	`108`	`+ PrintMessage("cppcheck: No file specified for the --suppressions option");`
`104`	`109`	`return false;`
`105`	`110`	`}`
`106`	`111`
`107`	`112`	`std::ifstream f(argv[i]);`
`108`	`113`	`if (!f.is_open())`
`109`	`114`	`{`
`110`		`- std::cout << "cppcheck: Couldn't open the file \"" << std::string(argv[i]) << "\"";`
	`115`	`+ std::string message("cppcheck: Couldn't open the file \"");`
	`116`	`+ message += std::string(argv[i]);`
	`117`	`+ message += "\"";`
	`118`	`+ PrintMessage(message);`
`111`	`119`	`return false;`
`112`	`120`	`}`
`113`	`121`	`const std::string errmsg(_settings->nomsg.parseFile(f));`
`@@ -172,7 +180,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`172`	`180`	`if (!(iss >> _settings->_exitCode))`
`173`	`181`	`{`
`174`	`182`	`_settings->_exitCode = 0;`
`175`		`- std::cout << "cppcheck: Argument must be an integer. Try something like '--error-exitcode=1'";`
	`183`	`+ PrintMessage("cppcheck: Argument must be an integer. Try something like '--error-exitcode=1'");`
`176`	`184`	`return false;`
`177`	`185`	`}`
`178`	`186`	`}`
`@@ -199,7 +207,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`199`	`207`	`++i;`
`200`	`208`	`if (i >= argc)`
`201`	`209`	`{`
`202`		`- std::cout << "cppcheck: argument to '-I' is missing";`
	`210`	`+ PrintMessage("cppcheck: argument to '-I' is missing");`
`203`	`211`	`return false;`
`204`	`212`	`}`
`205`	`213`	`path = argv[i];`
`@@ -239,7 +247,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`239`	`247`	`++i;`
`240`	`248`	`if (i >= argc)`
`241`	`249`	`{`
`242`		`- std::cout << "cppcheck: argument to '--template' is missing";`
	`250`	`+ PrintMessage("cppcheck: argument to '--template' is missing");`
`243`	`251`	`return false;`
`244`	`252`	`}`
`245`	`253`
`@@ -262,7 +270,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`262`	`270`	`++i;`
`263`	`271`	`if (i >= argc)`
`264`	`272`	`{`
`265`		`- std::cout << "cppcheck: argument to '-j' is missing";`
	`273`	`+ PrintMessage("cppcheck: argument to '-j' is missing");`
`266`	`274`	`return false;`
`267`	`275`	`}`
`268`	`276`
`@@ -279,13 +287,13 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`279`	`287`	`std::istringstream iss(numberString);`
`280`	`288`	`if (!(iss >> _settings->_jobs))`
`281`	`289`	`{`
`282`		`- std::cout << "cppcheck: argument to '-j' is not a number";`
	`290`	`+ PrintMessage("cppcheck: argument to '-j' is not a number");`
`283`	`291`	`return false;`
`284`	`292`	`}`
`285`	`293`
`286`	`294`	`if (_settings->_jobs > 1000)`
`287`	`295`	`{`
`288`		`- std::cout << "cppcheck: argument for '-j' is allowed to be 1000 at max";`
	`296`	`+ PrintMessage("cppcheck: argument for '-j' is allowed to be 1000 at max");`
`289`	`297`	`return false;`
`290`	`298`	`}`
`291`	`299`	`}`
`@@ -353,7 +361,10 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`353`	`361`
`354`	`362`	`else if (strncmp(argv[i], "-", 1) == 0 \|\| strncmp(argv[i], "--", 2) == 0)`
`355`	`363`	`{`
`356`		`- std::cout << "cppcheck: error: unrecognized command line option \"" << argv[i] << "\"";`
	`364`	`+ std::string message("cppcheck: error: unrecognized command line option \"");`
	`365`	`+ message += argv[i];`
	`366`	`+ message += "\"";`
	`367`	`+ PrintMessage(message);`
`357`	`368`	`return false;`
`358`	`369`	`}`
`359`	`370`
`@@ -363,13 +374,13 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`363`	`374`
`364`	`375`	`if (_settings->isEnabled("unusedFunctions") && _settings->_jobs > 1)`
`365`	`376`	`{`
`366`		`- std::cout << "unusedFunctions check can't be used with -j option, so it was disabled.";`
	`377`	`+ PrintMessage("unusedFunctions check can't be used with -j option, so it was disabled.");`
`367`	`378`	`}`
`368`	`379`
`369`	`380`	`// FIXME: Make the _settings.test_2_pass thread safe`
`370`	`381`	`if (_settings->test_2_pass && _settings->_jobs > 1)`
`371`	`382`	`{`
`372`		`- std::cout << "--test-2-pass doesn't work with -j option yet.";`
	`383`	`+ PrintMessage("--test-2-pass doesn't work with -j option yet.");`
`373`	`384`	`}`
`374`	`385`
`375`	`386`
`@@ -382,7 +393,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`382`	`393`	`}`
`383`	`394`	`else if (_pathnames.empty())`
`384`	`395`	`{`
`385`		`- std::cout << "cppcheck: No C or C++ source files found.";`
	`396`	`+ PrintMessage("cppcheck: No C or C++ source files found.");`
`386`	`397`	`return false;`
`387`	`398`	`}`
`388`	`399`