reduced unnecessary usage of emptyString (#7229)

danmar · Jan 22, 2025 · 06e7663 · 06e7663
1 parent 853b0c5
commit 06e7663
Show file tree

Hide file tree

Showing 23 changed files with 100 additions and 109 deletions.
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -465,7 +465,7 @@ int CppCheckExecutor::check_internal(const Settings& settings) const
     }
 
     if (!settings.checkConfiguration) {
-        cppcheck.tooManyConfigsError(emptyString,0U);
+        cppcheck.tooManyConfigsError("",0U);
     }
 
     stdLogger.writeCheckersReport();

diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
@@ -24,7 +24,6 @@
 
 #if !defined(WIN32) && !defined(__MINGW32__)
 
-#include "config.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
 #include "errortypes.h"
@@ -404,7 +403,7 @@ void ProcessExecutor::reportInternalChildErr(const std::string &childname, const
     std::list<ErrorMessage::FileLocation> locations;
     locations.emplace_back(childname, 0, 0);
     const ErrorMessage errmsg(std::move(locations),
-                              emptyString,
+                              "",
                               Severity::error,
                               "Internal error: " + msg,
                               "cppcheckError",

diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -3794,7 +3794,7 @@ void CheckClass::getErrorMessages(ErrorLogger *errorLogger, const Settings *sett
     c.uninitVarError(nullptr, false, Function::eConstructor, "classname", "varname", true, false);
     c.uninitVarError(nullptr, true, Function::eConstructor, "classname", "varnamepriv", true, false);
     c.missingMemberCopyError(nullptr, Function::eConstructor, "classname", "varnamepriv");
-    c.operatorEqVarError(nullptr, "classname", emptyString, false);
+    c.operatorEqVarError(nullptr, "classname", "", false);
     c.unusedPrivateFunctionError(nullptr, "classname", "funcname");
     c.memsetError(nullptr, "memfunc", "classname", "class");
     c.memsetErrorReference(nullptr, "memfunc", "class");

diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -2072,7 +2072,7 @@ void CheckCondition::getErrorMessages(ErrorLogger *errorLogger, const Settings *
 {
     CheckCondition c(nullptr, settings, errorLogger);
 
-    c.assignIfError(nullptr, nullptr, emptyString, false);
+    c.assignIfError(nullptr, nullptr, "", false);
     c.badBitmaskCheckError(nullptr);
     c.comparisonError(nullptr, "&", 6, "==", 1, false);
     c.duplicateConditionError(nullptr, nullptr, ErrorPath{});

diff --git a/lib/checknullpointer.h b/lib/checknullpointer.h
@@ -88,7 +88,7 @@ class CPPCHECKLIB CheckNullPointer : public Check {
     void nullPointerError(const Token *tok) {
         ValueFlow::Value v(0);
         v.setKnown();
-        nullPointerError(tok, emptyString, &v, false);
+        nullPointerError(tok, "", &v, false);
     }
     void nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value* value, bool inconclusive);
 

diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -3376,8 +3376,8 @@ void CheckStl::getErrorMessages(ErrorLogger* errorLogger, const Settings* settin
     c.uselessCallsRemoveError(nullptr, "remove");
     c.dereferenceInvalidIteratorError(nullptr, "i");
     c.eraseIteratorOutOfBoundsError(nullptr, nullptr);
-    c.useStlAlgorithmError(nullptr, emptyString);
-    c.knownEmptyContainerError(nullptr, emptyString);
+    c.useStlAlgorithmError(nullptr, "");
+    c.knownEmptyContainerError(nullptr, "");
     c.globalLockGuardError(nullptr);
     c.localMutexError(nullptr);
 }
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -351,7 +351,7 @@ static void staticFunctionError(ErrorLogger& errorLogger,
         locationList.back().fileIndex = fileIndex;
     }
 
-    const ErrorMessage errmsg(std::move(locationList), emptyString, Severity::style, "$symbol:" + funcname + "\nThe function '$symbol' should have static linkage since it is not used outside of its translation unit.", "staticFunction", Certainty::normal);
+    const ErrorMessage errmsg(std::move(locationList), "", Severity::style, "$symbol:" + funcname + "\nThe function '$symbol' should have static linkage since it is not used outside of its translation unit.", "staticFunction", Certainty::normal);
     errorLogger.reportErr(errmsg);
 }
 
@@ -412,7 +412,7 @@ void CheckUnusedFunctions::unusedFunctionError(ErrorLogger& errorLogger,
         locationList.back().fileIndex = fileIndex;
     }
 
-    const ErrorMessage errmsg(std::move(locationList), emptyString, Severity::style, "$symbol:" + funcname + "\nThe function '$symbol' is never used.", "unusedFunction", CWE561, Certainty::normal);
+    const ErrorMessage errmsg(std::move(locationList), "", Severity::style, "$symbol:" + funcname + "\nThe function '$symbol' is never used.", "unusedFunction", CWE561, Certainty::normal);
     errorLogger.reportErr(errmsg);
 }
 

diff --git a/lib/checkunusedfunctions.h b/lib/checkunusedfunctions.h
@@ -57,7 +57,7 @@ class CPPCHECKLIB CheckUnusedFunctions {
     static void analyseWholeProgram(const Settings &settings, ErrorLogger& errorLogger, const std::string &buildDir);
 
     static void getErrorMessages(ErrorLogger &errorLogger) {
-        unusedFunctionError(errorLogger, emptyString, 0, 0, "funcName");
+        unusedFunctionError(errorLogger, "", 0, 0, "funcName");
     }
 
     // Return true if an error is reported.

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -339,7 +339,7 @@ static std::string getDumpFileName(const Settings& settings, const std::string&
         extension = "." + std::to_string(settings.pid) + ".dump";
 
     if (!settings.dump && !settings.buildDir.empty())
-        return AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, filename, emptyString) + extension;
+        return AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, filename, "") + extension;
     return filename + extension;
 }
 
@@ -658,7 +658,7 @@ unsigned int CppCheck::checkClang(const FileWithDetails &file)
         mErrorLogger.reportOut(std::string("Checking ") + file.spath() + " ...", Color::FgGreen);
 
     // TODO: get language from FileWithDetails object
-    const std::string analyzerInfo = mSettings.buildDir.empty() ? std::string() : AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, file.spath(), emptyString);
+    const std::string analyzerInfo = mSettings.buildDir.empty() ? std::string() : AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, file.spath(), "");
     const std::string clangcmd = analyzerInfo + ".clang-cmd";
     const std::string clangStderr = analyzerInfo + ".clang-stderr";
     const std::string clangAst = analyzerInfo + ".clang-ast";
@@ -773,13 +773,13 @@ unsigned int CppCheck::check(const FileWithDetails &file)
     if (mSettings.clang)
         return checkClang(file);
 
-    return checkFile(file, emptyString);
+    return checkFile(file, "");
 }
 
 unsigned int CppCheck::check(const FileWithDetails &file, const std::string &content)
 {
     std::istringstream iss(content);
-    return checkFile(file, emptyString, &iss);
+    return checkFile(file, "", &iss);
 }
 
 unsigned int CppCheck::check(const FileSettings &fs)
@@ -1298,7 +1298,7 @@ void CppCheck::internalError(const std::string &filename, const std::string &msg
     ErrorMessage::FileLocation loc1(filename, 0, 0);
 
     ErrorMessage errmsg({std::move(loc1)},
-                        emptyString,
+                        "",
                         Severity::error,
                         fullmsg,
                         "internalError",
@@ -1333,7 +1333,7 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
                 if (mSettings.debugwarnings) {
                     ErrorMessage::FileLocation loc(tokenizer.list.getFiles()[0], 0, 0);
                     ErrorMessage errmsg({std::move(loc)},
-                                        emptyString,
+                                        "",
                                         Severity::debug,
                                         "Checks maximum time exceeded",
                                         "checksMaxTime",
@@ -1564,7 +1564,7 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
             if (pcreCompileErrorStr) {
                 const std::string msg = "pcre_compile failed: " + std::string(pcreCompileErrorStr);
                 const ErrorMessage errmsg(std::list<ErrorMessage::FileLocation>(),
-                                          emptyString,
+                                          "",
                                           Severity::error,
                                           msg,
                                           "pcre_compile",
@@ -1585,7 +1585,7 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
         if (pcreStudyErrorStr) {
             const std::string msg = "pcre_study failed: " + std::string(pcreStudyErrorStr);
             const ErrorMessage errmsg(std::list<ErrorMessage::FileLocation>(),
-                                      emptyString,
+                                      "",
                                       Severity::error,
                                       msg,
                                       "pcre_study",
@@ -1608,7 +1608,7 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
                 const std::string errorMessage = pcreErrorCodeToString(pcreExecRet);
                 if (!errorMessage.empty()) {
                     const ErrorMessage errmsg(std::list<ErrorMessage::FileLocation>(),
-                                              emptyString,
+                                              "",
                                               Severity::error,
                                               std::string("pcre_exec failed: ") + errorMessage,
                                               "pcre_exec",
@@ -1843,7 +1843,7 @@ void CppCheck::tooManyConfigsError(const std::string &file, const int numberOfCo
 
 
     ErrorMessage errmsg(std::move(loclist),
-                        emptyString,
+                        "",
                         Severity::information,
                         msg.str(),
                         "toomanyconfigs", CWE398,
@@ -1865,7 +1865,7 @@ void CppCheck::purgedConfigurationMessage(const std::string &file, const std::st
     }
 
     ErrorMessage errmsg(std::move(loclist),
-                        emptyString,
+                        "",
                         Severity::information,
                         "The configuration '" + configuration + "' was not checked because its code equals another one.",
                         "purgedConfiguration",
@@ -1882,9 +1882,9 @@ void CppCheck::getErrorMessages(ErrorLogger &errorlogger)
     s.addEnabled("all");
 
     CppCheck cppcheck(errorlogger, true, nullptr);
-    cppcheck.purgedConfigurationMessage(emptyString,emptyString);
+    cppcheck.purgedConfigurationMessage("","");
     cppcheck.mTooManyConfigs = true;
-    cppcheck.tooManyConfigsError(emptyString,0U);
+    cppcheck.tooManyConfigsError("",0U);
     // TODO: add functions to get remaining error messages
 
     // call all "getErrorMessages" in all registered Check classes
@@ -1913,7 +1913,7 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
 
     const std::string args = "-quiet -checks=*,-clang-analyzer-*,-llvm* \"" + fileSettings.filename() + "\" -- " + allIncludes + allDefines;
     std::string output;
-    if (const int exitcode = mExecuteCommand(exe, split(args), emptyString, output)) {
+    if (const int exitcode = mExecuteCommand(exe, split(args), "", output)) {
         std::cerr << "Failed to execute '" << exe << "' (exitcode: " << std::to_string(exitcode) << ")" << std::endl;
         return;
     }
@@ -1923,7 +1923,7 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
     std::string line;
 
     if (!mSettings.buildDir.empty()) {
-        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.filename(), emptyString);
+        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.filename(), "");
         std::ofstream fcmd(analyzerInfoFile + ".clang-tidy-cmd");
         fcmd << istr.str();
     }

diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -204,7 +204,7 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
     } else if (endsWith(filename, ".vcxproj")) {
         std::map<std::string, std::string, cppcheck::stricmp> variables;
         std::vector<SharedItemsProject> sharedItemsProjects;
-        if (importVcxproj(filename, variables, emptyString, fileFilters, sharedItemsProjects)) {
+        if (importVcxproj(filename, variables, "", fileFilters, sharedItemsProjects)) {
             setRelativePaths(filename);
             return ImportProject::Type::VS_VCXPROJ;
         }
@@ -462,7 +462,7 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
         if (!Path::isAbsolute(vcxproj))
             vcxproj = path + vcxproj;
         vcxproj = Path::fromNativeSeparators(std::move(vcxproj));
-        if (!importVcxproj(vcxproj, variables, emptyString, fileFilters, sharedItemsProjects)) {
+        if (!importVcxproj(vcxproj, variables, "", fileFilters, sharedItemsProjects)) {
             printError("failed to load '" + vcxproj + "' from Visual Studio solution");
             return false;
         }
@@ -1311,21 +1311,21 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *setti
                 suppressions.push_back(std::move(s));
             }
         } else if (strcmp(name, CppcheckXml::VSConfigurationElementName) == 0)
-            guiProject.checkVsConfigs = readXmlStringList(node, emptyString, CppcheckXml::VSConfigurationName, nullptr);
+            guiProject.checkVsConfigs = readXmlStringList(node, "", CppcheckXml::VSConfigurationName, nullptr);
         else if (strcmp(name, CppcheckXml::PlatformElementName) == 0)
             guiProject.platform = empty_if_null(node->GetText());
         else if (strcmp(name, CppcheckXml::AnalyzeAllVsConfigsElementName) == 0)
             guiProject.analyzeAllVsConfigs = empty_if_null(node->GetText());
         else if (strcmp(name, CppcheckXml::Parser) == 0)
             temp.clang = true;
         else if (strcmp(name, CppcheckXml::AddonsElementName) == 0) {
-            const auto& addons = readXmlStringList(node, emptyString, CppcheckXml::AddonElementName, nullptr);
+            const auto& addons = readXmlStringList(node, "", CppcheckXml::AddonElementName, nullptr);
             temp.addons.insert(addons.cbegin(), addons.cend());
         }
         else if (strcmp(name, CppcheckXml::TagsElementName) == 0)
             node->Attribute(CppcheckXml::TagElementName); // FIXME: Write some warning
         else if (strcmp(name, CppcheckXml::ToolsElementName) == 0) {
-            const std::list<std::string> toolList = readXmlStringList(node, emptyString, CppcheckXml::ToolElementName, nullptr);
+            const std::list<std::string> toolList = readXmlStringList(node, "", CppcheckXml::ToolElementName, nullptr);
             for (const std::string &toolName : toolList) {
                 if (toolName == CppcheckXml::ClangTidy)
                     temp.clangTidy = true;

diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -340,7 +340,7 @@ std::list<Directive> Preprocessor::createDirectives(const simplecpp::TokenList &
                 continue;
             if (tok->next && tok->next->str() == "endfile")
                 continue;
-            Directive directive(tok->location, emptyString);
+            Directive directive(tok->location, "");
             for (const simplecpp::Token *tok2 = tok; tok2 && tok2->location.line == directive.linenr; tok2 = tok2->next) {
                 if (tok2->comment)
                     continue;
@@ -691,7 +691,7 @@ static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cf
 
     splitcfg(mSettings.userDefines, dui.defines, "1");
     if (!cfg.empty())
-        splitcfg(cfg, dui.defines, emptyString);
+        splitcfg(cfg, dui.defines, "");
 
     for (const std::string &def : mSettings.library.defines()) {
         const std::string::size_type pos = def.find_first_of(" (");
@@ -769,7 +769,7 @@ void Preprocessor::handleErrors(const simplecpp::OutputList& outputList, bool th
 
 bool Preprocessor::loadFiles(const simplecpp::TokenList &rawtokens, std::vector<std::string> &files)
 {
-    const simplecpp::DUI dui = createDUI(mSettings, emptyString, files[0]);
+    const simplecpp::DUI dui = createDUI(mSettings, "", files[0]);
 
     simplecpp::OutputList outputList;
     mTokenLists = simplecpp::load(rawtokens, files, dui, &outputList);
@@ -924,9 +924,9 @@ void Preprocessor::missingInclude(const std::string &filename, unsigned int line
 void Preprocessor::getErrorMessages(ErrorLogger &errorLogger, const Settings &settings)
 {
     Preprocessor preprocessor(settings, errorLogger);
-    preprocessor.missingInclude(emptyString, 1, emptyString, UserHeader);
-    preprocessor.missingInclude(emptyString, 1, emptyString, SystemHeader);
-    preprocessor.error(emptyString, 1, "#error message");   // #error ..
+    preprocessor.missingInclude("", 1, "", UserHeader);
+    preprocessor.missingInclude("", 1, "", SystemHeader);
+    preprocessor.error("", 1, "#error message");   // #error ..
 }
 
 void Preprocessor::dump(std::ostream &out) const

diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
@@ -592,7 +592,7 @@ bool SuppressionList::reportUnmatchedSuppressions(const std::list<SuppressionLis
         std::list<::ErrorMessage::FileLocation> callStack;
         if (!s.fileName.empty())
             callStack.emplace_back(s.fileName, s.lineNumber, 0);
-        errorLogger.reportErr(::ErrorMessage(std::move(callStack), emptyString, Severity::information, "Unmatched suppression: " + s.errorId, "unmatchedSuppression", Certainty::normal));
+        errorLogger.reportErr(::ErrorMessage(std::move(callStack), "", Severity::information, "Unmatched suppression: " + s.errorId, "unmatchedSuppression", Certainty::normal));
         err = true;
     }
     return err;

diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -3175,7 +3175,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
             if (mSettings.debugwarnings) {
                 ErrorMessage::FileLocation loc(mTokenList.getFiles()[0], 0, 0);
                 ErrorMessage errmsg({std::move(loc)},
-                                    emptyString,
+                                    "",
                                     Severity::debug,
                                     "Template instantiation maximum time exceeded",
                                     "templateMaxTime",
@@ -3251,7 +3251,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
             if (mSettings.debugwarnings) {
                 ErrorMessage::FileLocation loc(mTokenList.getFiles()[0], 0, 0);
                 ErrorMessage errmsg({std::move(loc)},
-                                    emptyString,
+                                    "",
                                     Severity::debug,
                                     "Template instantiation maximum time exceeded",
                                     "templateMaxTime",

diff --git a/lib/templatesimplifier.h b/lib/templatesimplifier.h
@@ -490,7 +490,7 @@ class CPPCHECKLIB TemplateSimplifier {
     void printOut(
         const TokenAndName &tokenAndName,
         const std::string &indent = "    ") const;
-    void printOut(const std::string &text = emptyString) const;
+    void printOut(const std::string &text = "") const;
 
     Tokenizer &mTokenizer;
     TokenList &mTokenList;

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1225,7 +1225,7 @@ void Tokenizer::simplifyTypedefCpp()
             if (mSettings.debugwarnings) {
                 ErrorMessage::FileLocation loc(list.getFiles()[0], 0, 0);
                 ErrorMessage errmsg({std::move(loc)},
-                                    emptyString,
+                                    "",
                                     Severity::debug,
                                     "Typedef simplification instantiation maximum time exceeded",
                                     "typedefMaxTime",
@@ -10945,7 +10945,7 @@ void Tokenizer::getErrorMessages(ErrorLogger& errorLogger, const Settings& setti
     Tokenizer tokenizer(settings, errorLogger);
     tokenizer.invalidConstFunctionTypeError(nullptr);
     // checkLibraryNoReturn
-    tokenizer.unhandled_macro_class_x_y(nullptr, emptyString, emptyString, emptyString, emptyString);
-    tokenizer.macroWithSemicolonError(nullptr, emptyString);
-    tokenizer.unhandledCharLiteral(nullptr, emptyString);
+    tokenizer.unhandled_macro_class_x_y(nullptr, "", "", "", "");
+    tokenizer.macroWithSemicolonError(nullptr, "");
+    tokenizer.unhandledCharLiteral(nullptr, "");
 }