cleaned up SuppressionList changes

Author: firewave

cli/processexecutor.cpp

@@ -240,7 +240,11 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
                 std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of inline suppression failed - insufficient data" << std::endl;
                 std::exit(EXIT_FAILURE);
             }
-            const std::string err = mSuppressions.addSuppressionLine(parts[0], true, parts[1] == "1", parts[2] == "1");
+            auto suppr = SuppressionList::parseLine(parts[0]);
+            suppr.isInline = true;
+            suppr.checked = parts[1] == "1";
+            suppr.matched = parts[2] == "1";
+            const std::string err = mSuppressions.addSuppression(std::move(suppr));
             if (!err.empty()) {
                 // TODO: make this non-fatal
                 std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of inline suppression failed - " << err << std::endl;

lib/suppressions.cpp

@@ -204,7 +204,7 @@ std::vector<SuppressionList::Suppression> SuppressionList::parseMultiSuppressCom
     return suppressions;
 }
 
-std::string SuppressionList::addSuppressionLine(const std::string &line, bool isInline, bool checked, bool matched)
+SuppressionList::Suppression SuppressionList::parseLine(const std::string &line)
 {
     std::istringstream lineStream;
     SuppressionList::Suppression suppression;
@@ -248,11 +248,13 @@ std::string SuppressionList::addSuppressionLine(const std::string &line, bool is
     }
 
     suppression.fileName = Path::simplifyPath(suppression.fileName);
-    suppression.isInline = isInline;
-    suppression.checked = checked;
-    suppression.matched = matched;
 
-    return addSuppression(std::move(suppression));
+    return suppression;
+}
+
+std::string SuppressionList::addSuppressionLine(const std::string &line)
+{
+    return addSuppression(parseLine(line));
 }
 
 std::string SuppressionList::addSuppression(SuppressionList::Suppression suppression)

lib/suppressions.h

@@ -177,15 +177,19 @@ class CPPCHECKLIB SuppressionList {
      */
     static std::vector<Suppression> parseMultiSuppressComment(const std::string &comment, std::string *errorMessage);
 
+    /**
+     * Create a Suppression object from a suppression line
+     * @param line The line to parse.
+     * @return a suppression object
+     */
+    static Suppression parseLine(const std::string &line);
+
     /**
      * @brief Don't show the given error.
      * @param line Description of error to suppress (in id:file:line format).
-     * @param isInline Indicates if it is an inline suppression.
-     * @param checked The initial checked state.
-     * @param matched The initial matched state.
      * @return error message. empty upon success
      */
-    std::string addSuppressionLine(const std::string &line, bool isInline = false, bool checked = false, bool matched = false);
+    std::string addSuppressionLine(const std::string &line);
 
     /**
      * @brief Don't show this error. File and/or line are optional. In which case