update state of inline suppressions if they already exist

Author: firewave

Diff for: cli/processexecutor.cpp

@@ -244,11 +244,13 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
             suppr.isInline = true;
             suppr.checked = parts[1] == "1";
             suppr.matched = parts[2] == "1";
-            const std::string err = mSuppressions.addSuppression(std::move(suppr));
+            const std::string err = mSuppressions.addSuppression(suppr);
             if (!err.empty()) {
+                // TODO: only update state if it doesn't exist - otherwise propagate error
+                mSuppressions.updateSuppressionState(suppr); // TODO: check result
                 // TODO: make this non-fatal
-                std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of inline suppression failed - " << err << std::endl;
-                std::exit(EXIT_FAILURE);
+                //std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of inline suppression failed - " << err << std::endl;
+                //std::exit(EXIT_FAILURE);
             }
         }
     } else if (type == PipeWriter::CHILD_END) {

Diff for: cli/threadexecutor.cpp

@@ -130,7 +130,11 @@ class ThreadData
         for (const auto& suppr : fileChecker.settings().supprs.nomsg.getSuppressions()) {
             // need to transfer all inline suppressions because these are used later on
             if (suppr.isInline) {
-                mSuppressions.addSuppression(suppr); // TODO: check result
+                const std::string err = mSuppressions.addSuppression(suppr);
+                if (!err.empty()) {
+                    // TODO: only update state if it doesn't exist - otherwise propagate error
+                    mSuppressions.updateSuppressionState(suppr); // TODO: check result
+                }
                 continue;
             }
 

Diff for: lib/cppcheck.cpp

@@ -812,7 +812,11 @@ unsigned int CppCheck::check(const FileSettings &fs)
     {
         if (suppr.isInline) {
             // need to transfer all inline suppressions because these are used later on
-            mSettings.supprs.nomsg.addSuppression(suppr); // TODO: check result
+            const std::string err = mSettings.supprs.nomsg.addSuppression(suppr);
+            if (!err.empty()) {
+                // TODO: only update state if it doesn't exist - otherwise propagate error
+                mSettings.supprs.nomsg.updateSuppressionState(suppr); // TODO: check result
+            }
             continue;
         }