From fa539a9d3f20f69789877bf9bc8a96d8e87a394f Mon Sep 17 00:00:00 2001 From: Igor Petrov Date: Wed, 12 Nov 2025 16:16:11 +0200 Subject: [PATCH 1/2] remove premium options from open source version --- .../cppcheclipse/core/command/CppcheckCommand.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java b/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java index 3cc3dce..936cd5c 100644 --- a/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java +++ b/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java @@ -39,9 +39,8 @@ public class CppcheckCommand extends AbstractCppcheckCommand { private final static String ERROR_FORMAT = "{file}" + DELIMITER + "{line}" + DELIMITER + "{severity}" + DELIMITER + "{id}" + DELIMITER + "{message}"; - private final static String SAFETY_OFF = "--premium=safety-off"; private final static String[] DEFAULT_ARGUMENTS = { "--template=" - + ERROR_FORMAT, SAFETY_OFF }; + + ERROR_FORMAT }; /** * pattern recognizes "2/2 files checked 100% done" @@ -62,6 +61,13 @@ public class CppcheckCommand extends AbstractCppcheckCommand { private void addPremiumChecks(IPreferenceStore settingsStore) { + + if (!settingsStore.getBoolean(IPreferenceConstants.P_PREMIUM)) { + return; + } + + arguments.add("--premium=safety-off"); + if (settingsStore.getBoolean(IPreferenceConstants.P_PREMIUM_BUG_HUNTING)) { arguments.add("--premium=bughunting"); } From 12d82418171be60eca6a08545faf644e1e3393e1 Mon Sep 17 00:00:00 2001 From: Igor Petrov Date: Thu, 13 Nov 2025 09:46:34 +0200 Subject: [PATCH 2/2] imporve readability --- .../cppcheclipse/core/command/CppcheckCommand.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java b/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java index 936cd5c..0ca866f 100644 --- a/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java +++ b/com.googlecode.cppcheclipse.core/src/com/googlecode/cppcheclipse/core/command/CppcheckCommand.java @@ -62,10 +62,6 @@ public class CppcheckCommand extends AbstractCppcheckCommand { private void addPremiumChecks(IPreferenceStore settingsStore) { - if (!settingsStore.getBoolean(IPreferenceConstants.P_PREMIUM)) { - return; - } - arguments.add("--premium=safety-off"); if (settingsStore.getBoolean(IPreferenceConstants.P_PREMIUM_BUG_HUNTING)) { @@ -97,7 +93,7 @@ private void addPremiumChecks(IPreferenceStore settingsStore) { /** * For testing purposes either use interfaces or simple types as parameters. * No dependency to Eclipse classes allowed. - * + * * @param console * @param settingsStore * either workspace or project settings @@ -169,7 +165,9 @@ public CppcheckCommand(IConsole console, String binaryPath, } if (projectFile.isEmpty() || !projectFile.endsWith(CPPCHECK_PROJ_STRING)) { - addPremiumChecks(settingsStore); + if (settingsStore.getBoolean(IPreferenceConstants.P_PREMIUM)) { + addPremiumChecks(settingsStore); + } } if (settingsStore.getBoolean(IPreferenceConstants.P_CHECK_VERBOSE)) {