forbid mixing --xml... and --output-format

Author: ludviggunne

cli/cmdlineparser.cpp

@@ -315,6 +315,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 {
     mSettings.exename = Path::getCurrentExecutablePath(argv[0]);
 
+    bool xmlOptionProvided = false;
+    bool outputFormatOptionProvided = false;
+
     // default to --check-level=normal from CLI for now
     mSettings.setCheckLevel(Settings::CheckLevel::normal);
 
@@ -1001,6 +1004,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.outputFile = Path::simplifyPath(argv[i] + 14);
 
         else if (std::strncmp(argv[i], "--output-format=", 16) == 0) {
+            if (xmlOptionProvided) {
+                outputFormatOptionMixingError();
+                return Result::Fail;
+            }
             const std::string format = argv[i] + 16;
             // plist can not be handled here because it requires additional data
             if (format == "text")
@@ -1014,6 +1021,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 return Result::Fail;
             }
             mSettings.plistOutput = "";
+            outputFormatOptionProvided = true;
         }
 
 
@@ -1486,11 +1494,20 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
         // Write results in results.xml
         else if (std::strcmp(argv[i], "--xml") == 0) {
+            if (outputFormatOptionProvided) {
+                outputFormatOptionMixingError();
+                return Result::Fail;
+            }
             mSettings.outputFormat = Settings::OutputFormat::xml;
+            xmlOptionProvided = true;
         }
 
         // Define the XML file version (and enable XML output)
         else if (std::strncmp(argv[i], "--xml-version=", 14) == 0) {
+            if (outputFormatOptionProvided) {
+                outputFormatOptionMixingError();
+                return Result::Fail;
+            }
             int tmp;
             if (!parseNumberArg(argv[i], 14, tmp))
                 return Result::Fail;
@@ -1503,6 +1520,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.xml_version = tmp;
             // Enable also XML if version is set
             mSettings.outputFormat = Settings::OutputFormat::xml;
+            xmlOptionProvided = true;
         }
 
         else {
@@ -2149,3 +2167,8 @@ std::list<FileWithDetails> CmdLineParser::filterFiles(const std::vector<std::str
     });
     return files;
 }
+
+void CmdLineParser::outputFormatOptionMixingError() const
+{
+    mLogger.printError("'--output-format' and '--xml...' may not be used in conjunction.");
+}

cli/cmdlineparser.h

@@ -179,6 +179,8 @@ class CmdLineParser {
     bool mAnalyzeAllVsConfigsSetOnCmdLine = false;
     /** @brief Name of the language that is enforced. Empty per default. */
     Standards::Language mEnforcedLang{Standards::Language::None};
+
+    void outputFormatOptionMixingError() const;
 };
 
 /// @}