Loading cppcheck.cfg after --project to extend settings provided by project

danmar · danmar · commit b2f1a0aaa9e6 · 2021-11-05T18:57:26.000+01:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -121,8 +121,6 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
 
     mSettings->exename = argv[0];
 
-    mSettings->loadCppcheckCfg(Path::getPathFromFilename(argv[0]) + "cppcheck.cfg");
-
     for (int i = 1; i < argc; i++) {
         if (argv[i][0] == '-') {
             // User define
@@ -919,6 +917,8 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
         }
     }
 
+    mSettings->loadCppcheckCfg(Path::getPathFromFilename(argv[0]) + "cppcheck.cfg");
+
     // Default template format..
     if (mSettings->templateFormat.empty()) {
         mSettings->templateFormat = "{bold}{file}:{line}:{column}: {red}{inconclusive:{magenta}}{severity}:{inconclusive: inconclusive:}{default} {message} [{id}]{reset}\\n{code}";

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,6 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`121`	`121`
`122`	`122`	`mSettings->exename = argv[0];`
`123`	`123`
`124`		`- mSettings->loadCppcheckCfg(Path::getPathFromFilename(argv[0]) + "cppcheck.cfg");`
`125`		`-`
`126`	`124`	`for (int i = 1; i < argc; i++) {`
`127`	`125`	`if (argv[i][0] == '-') {`
`128`	`126`	`// User define`
`@@ -919,6 +917,8 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])`
`919`	`917`	`}`
`920`	`918`	`}`
`921`	`919`
	`920`	`+ mSettings->loadCppcheckCfg(Path::getPathFromFilename(argv[0]) + "cppcheck.cfg");`
	`921`	`+`
`922`	`922`	`// Default template format..`
`923`	`923`	`if (mSettings->templateFormat.empty()) {`
`924`	`924`	`mSettings->templateFormat = "{bold}{file}:{line}:{column}: {red}{inconclusive:{magenta}}{severity}:{inconclusive: inconclusive:}{default} {message} [{id}]{reset}\\n{code}";`