Skip to content

Commit 9b559d8

Browse files
authored
Release: Updated mapping of Cppcheck/Premium warnings (#6745)
1 parent 555546e commit 9b559d8

4 files changed

Lines changed: 6 additions & 10 deletions

File tree

lib/checkcondition.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ bool CheckCondition::isAliased(const std::set<int> &vars) const
8888

8989
void CheckCondition::assignIf()
9090
{
91-
if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignIf"))
91+
if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignIfError"))
9292
return;
9393

9494
logChecker("CheckCondition::assignIf"); // style
@@ -1920,7 +1920,7 @@ void CheckCondition::assignmentInCondition(const Token *eq)
19201920

19211921
void CheckCondition::checkCompareValueOutOfTypeRange()
19221922
{
1923-
if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("compareValueOutOfTypeRange"))
1923+
if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("compareValueOutOfTypeRangeError"))
19241924
return;
19251925

19261926
if (mSettings->platform.type == Platform::Type::Native ||

lib/checkexceptionsafety.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std:
168168
//---------------------------------------------------------------------------
169169
void CheckExceptionSafety::checkRethrowCopy()
170170
{
171-
if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("rethrowcopy"))
171+
if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("exceptRethrowCopy"))
172172
return;
173173

174174
logChecker("CheckExceptionSafety::checkRethrowCopy"); // style
@@ -212,7 +212,7 @@ void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::
212212
//---------------------------------------------------------------------------
213213
void CheckExceptionSafety::checkCatchExceptionByValue()
214214
{
215-
if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("catchexceptionbyvalue"))
215+
if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("catchExceptionByValue"))
216216
return;
217217

218218
logChecker("CheckExceptionSafety::checkCatchExceptionByValue"); // style
@@ -328,7 +328,7 @@ void CheckExceptionSafety::noexceptThrowError(const Token * const tok)
328328
void CheckExceptionSafety::unhandledExceptionSpecification()
329329
{
330330
if ((!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive)) &&
331-
!mSettings->isPremiumEnabled("unhandledexceptionspecification"))
331+
!mSettings->isPremiumEnabled("unhandledExceptionSpecification"))
332332
return;
333333

334334
logChecker("CheckExceptionSafety::unhandledExceptionSpecification"); // style,inconclusive

lib/checkother.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@ void CheckOther::checkConstPointer()
16111611
!mSettings->isPremiumEnabled("constParameter") &&
16121612
!mSettings->isPremiumEnabled("constParameterPointer") &&
16131613
!mSettings->isPremiumEnabled("constParameterReference") &&
1614-
!mSettings->isPremiumEnabled("constPointer"))
1614+
!mSettings->isPremiumEnabled("constVariablePointer"))
16151615
return;
16161616

16171617
logChecker("CheckOther::checkConstPointer"); // style

lib/settings.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,6 @@ static const std::set<std::string> certCppCheckers{
448448
};
449449

450450
static const std::set<std::string> misrac2012Checkers{
451-
"alwaysFalse",
452-
"alwaysTrue",
453451
"argumentSize",
454452
"autovarInvalidDeallocation",
455453
"bufferAccessOutOfBounds",
@@ -492,8 +490,6 @@ static const std::set<std::string> misrac2012Checkers{
492490
};
493491

494492
static const std::set<std::string> misrac2023Checkers{
495-
"alwaysFalse",
496-
"alwaysTrue",
497493
"argumentSize",
498494
"autovarInvalidDeallocation",
499495
"bufferAccessOutOfBounds",

0 commit comments

Comments
 (0)