ProcessExecutor: make transferred back inline suppressions actually inline

Author: firewave

cli/processexecutor.cpp

@@ -240,7 +240,7 @@ 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], parts[1] == "1", parts[2] == "1");
+            const std::string err = mSuppressions.addSuppressionLine(parts[0], true, parts[1] == "1", parts[2] == "1");
             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 checked, bool matched)
+std::string SuppressionList::addSuppressionLine(const std::string &line, bool isInline, bool checked, bool matched)
 {
     std::istringstream lineStream;
     SuppressionList::Suppression suppression;
@@ -248,6 +248,7 @@ std::string SuppressionList::addSuppressionLine(const std::string &line, bool ch
     }
 
     suppression.fileName = Path::simplifyPath(suppression.fileName);
+    suppression.isInline = isInline;
     suppression.checked = checked;
     suppression.matched = matched;
 

lib/suppressions.h

@@ -180,11 +180,12 @@ class CPPCHECKLIB SuppressionList {
     /**
      * @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 checked = false, bool matched = false);
+    std::string addSuppressionLine(const std::string &line, bool isInline = false, bool checked = false, bool matched = false);
 
     /**
      * @brief Don't show this error. File and/or line are optional. In which case