Skip to content

fix #11824: Option --max-configs has no effect if -D is used #7424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clock999 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix #11824: Option --max-configs has no effect if -D is used #7424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions cli/cmdlineparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
}
}

bool def = false;
bool maxconfigs = false;
bool debug = false;

ImportProject::Type projectType = ImportProject::Type::NONE;
Expand Down Expand Up @@ -425,8 +423,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
if (!mSettings.userDefines.empty())
mSettings.userDefines += ";";
mSettings.userDefines += define;

def = true;
}

// -E
Expand Down Expand Up @@ -958,8 +954,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
}

mSettings.maxConfigs = tmp;
mSettings.force = false;
maxconfigs = true;
}

// max ctu depth
Expand Down Expand Up @@ -1140,7 +1134,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
return Result::Fail;
}

mSettings.checkAllConfigurations = false; // Can be overridden with --max-configs or --force
std::string projectFile = argv[i]+10;
projectType = project.import(projectFile, &mSettings, &mSuppressions, isCppcheckPremium());
if (projectType == ImportProject::Type::CPPCHECK_GUI) {
Expand Down Expand Up @@ -1557,14 +1550,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
substituteTemplateFormatStatic(mSettings.templateFormat, !mSettings.outputFile.empty());
substituteTemplateLocationStatic(mSettings.templateLocation, !mSettings.outputFile.empty());

if (mSettings.force || maxconfigs)
mSettings.checkAllConfigurations = true;

if (mSettings.force)
mSettings.maxConfigs = INT_MAX;
else if ((def || mSettings.preprocessOnly) && !maxconfigs)
mSettings.maxConfigs = 1U;

if (debug) {
mSettings.debugnormal = true;
mSettings.debugvalueflow = true;
Expand Down
196 changes: 98 additions & 98 deletions gui/cppcheck_de.ts
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading