remove any unneccessary changes

Author: Nettozx

cli/cppcheckexecutor.cpp

@@ -23,9 +23,7 @@
 #include "cppcheckexecutor.h"
 
 #include "analyzerinfo.h"
-#include "check.h"
 #include "checkersreport.h"
-#include "checkunusedfunctions.h"
 #include "cmdlinelogger.h"
 #include "cmdlineparser.h"
 #include "color.h"
@@ -35,11 +33,9 @@
 #include "errortypes.h"
 #include "filesettings.h"
 #include "json.h"
-#include "preprocessor.h"
 #include "settings.h"
 #include "singleexecutor.h"
 #include "suppressions.h"
-#include "tokenize.h"
 #include "utils.h"
 
 #if defined(HAS_THREADING_MODEL_THREAD)
@@ -59,7 +55,6 @@
 #include <iostream>
 #include <list>
 #include <map>
-#include <regex>
 #include <set>
 #include <sstream>
 #include <unordered_set>

lib/errorlogger.cpp

@@ -39,7 +39,6 @@
 #include <string>
 #include <unordered_map>
 #include <utility>
-#include <regex>
 
 #include "xml.h"
 
@@ -213,7 +212,6 @@ ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
     }
 }
 
-// Convert instance-specific messages to generic ones
 void ErrorMessage::setmsg(const std::string &msg)
 {
     // If a message ends to a '\n' and contains only a one '\n'
@@ -495,9 +493,6 @@ std::string ErrorMessage::toXML() const
         printer.PushAttribute("classification", classification.c_str());
     printer.PushAttribute("msg", fixInvalidChars(mShortMessage).c_str());
     printer.PushAttribute("verbose", fixInvalidChars(mVerboseMessage).c_str());
-    // TODO: Generic message was added for SARIF output format, consider whether to include in XML
-    // if (!mGenericMessage.empty())
-    //     printer.PushAttribute("generic", fixInvalidChars(mGenericMessage).c_str());
     if (cwe.id)
         printer.PushAttribute("cwe", cwe.id);
     if (hash)

test/cli/helloworld_test.py

@@ -377,11 +377,8 @@ def test_sarif():
     assert 'security' in res['runs'][0]['tool']['driver']['rules'][0]['properties']['tags']
     assert re.match(r'[0-9]+(.[0-9]+)+', res['runs'][0]['tool']['driver']['semanticVersion'])
     assert 'level' in res['runs'][0]['tool']['driver']['rules'][0]['defaultConfiguration'] # #13885
-    # Test that rule description is now the generic mapped description, not instance-specific
-    assert res['runs'][0]['tool']['driver']['rules'][0]['shortDescription']['text'] == 'Division by zero'
-    # Test that the result message is still the instance-specific message
+    assert res['runs'][0]['tool']['driver']['rules'][0]['shortDescription']['text'] == ''
     assert res['runs'][0]['results'][0]['message']['text'] == 'Division by zero.'
-    # Test that problem.severity property exists and is correct
     assert res['runs'][0]['tool']['driver']['rules'][0]['properties']['problem.severity'] == 'error'