Skip to content

Commit af763fd

Browse files
committed
pass ErrorLogger by reference into CheckImpl
1 parent 169286e commit af763fd

60 files changed

Lines changed: 130 additions & 138 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

lib/check64bit.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@ void Check64BitPortabilityImpl::returnIntegerError(const Token *tok)
185185

186186
void Check64BitPortability::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
187187
{
188-
Check64BitPortabilityImpl check64BitPortability(&tokenizer, tokenizer.getSettings(), errorLogger);
188+
Check64BitPortabilityImpl check64BitPortability(&tokenizer, tokenizer.getSettings(), *errorLogger);
189189
check64BitPortability.pointerassignment();
190190
}
191191

192192
void Check64BitPortability::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
193193
{
194-
Check64BitPortabilityImpl c(nullptr, settings, &errorLogger);
194+
Check64BitPortabilityImpl c(nullptr, settings, errorLogger);
195195
c.assignmentAddressToIntegerError(nullptr);
196196
c.assignmentIntegerToAddressError(nullptr);
197197
c.returnIntegerError(nullptr);

lib/check64bit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class CPPCHECKLIB Check64BitPortability : public Check {
6363
class CPPCHECKLIB Check64BitPortabilityImpl : public CheckImpl {
6464
public:
6565
/** This constructor is used when running checks. */
66-
Check64BitPortabilityImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger *errorLogger)
66+
Check64BitPortabilityImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
6767
: CheckImpl(tokenizer, settings, errorLogger) {}
6868

6969
/** Check for pointer assignment */

lib/checkassert.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,13 @@ bool CheckAssertImpl::inSameScope(const Token* returnTok, const Token* assignTok
180180

181181
void CheckAssert::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
182182
{
183-
CheckAssertImpl checkAssert(&tokenizer, tokenizer.getSettings(), errorLogger);
183+
CheckAssertImpl checkAssert(&tokenizer, tokenizer.getSettings(), *errorLogger);
184184
checkAssert.assertWithSideEffects();
185185
}
186186

187187
void CheckAssert::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
188188
{
189-
CheckAssertImpl c(nullptr, settings, &errorLogger);
189+
CheckAssertImpl c(nullptr, settings, errorLogger);
190190
c.sideEffectInAssertError(nullptr, "function");
191191
c.assignmentInAssertError(nullptr, "var");
192192
}

lib/checkassert.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class CPPCHECKLIB CheckAssert : public Check {
5757

5858
class CPPCHECKLIB CheckAssertImpl : public CheckImpl {
5959
public:
60-
CheckAssertImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger *errorLogger)
60+
CheckAssertImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
6161
: CheckImpl(tokenizer, settings, errorLogger) {}
6262

6363
void assertWithSideEffects();

lib/checkautovariables.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -819,15 +819,15 @@ void CheckAutoVariablesImpl::errorInvalidDeallocation(const Token *tok, const Va
819819

820820
void CheckAutoVariables::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
821821
{
822-
CheckAutoVariablesImpl checkAutoVariables(&tokenizer, tokenizer.getSettings(), errorLogger);
822+
CheckAutoVariablesImpl checkAutoVariables(&tokenizer, tokenizer.getSettings(), *errorLogger);
823823
checkAutoVariables.assignFunctionArg();
824824
checkAutoVariables.autoVariables();
825825
checkAutoVariables.checkVarLifetime();
826826
}
827827

828828
void CheckAutoVariables::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
829829
{
830-
CheckAutoVariablesImpl c(nullptr,settings,&errorLogger);
830+
CheckAutoVariablesImpl c(nullptr,settings,errorLogger);
831831
c.errorAutoVariableAssignment(nullptr, false);
832832
c.errorReturnReference(nullptr, ErrorPath{}, false);
833833
c.errorDanglingReference(nullptr, nullptr, ErrorPath{});

lib/checkautovariables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class CPPCHECKLIB CheckAutoVariablesImpl : public CheckImpl
7272
{
7373
public:
7474
/** This constructor is used when running checks. */
75-
CheckAutoVariablesImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger *errorLogger)
75+
CheckAutoVariablesImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
7676
: CheckImpl(tokenizer, settings, errorLogger) {}
7777

7878
/** assign function argument */

lib/checkbool.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ void CheckBoolImpl::returnValueBoolError(const Token *tok)
514514

515515
void CheckBool::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
516516
{
517-
CheckBoolImpl checkBool(&tokenizer, tokenizer.getSettings(), errorLogger);
517+
CheckBoolImpl checkBool(&tokenizer, tokenizer.getSettings(), *errorLogger);
518518

519519
// Checks
520520
checkBool.checkComparisonOfBoolExpressionWithInt();
@@ -531,7 +531,7 @@ void CheckBool::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
531531

532532
void CheckBool::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
533533
{
534-
CheckBoolImpl c(nullptr, settings, &errorLogger);
534+
CheckBoolImpl c(nullptr, settings, errorLogger);
535535
c.assignBoolToPointerError(nullptr);
536536
c.assignBoolToFloatError(nullptr);
537537
c.comparisonOfFuncReturningBoolError(nullptr, "func_name");

lib/checkbool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class CPPCHECKLIB CheckBoolImpl : public CheckImpl
6767
{
6868
public:
6969
/** @brief This constructor is used when running checks. */
70-
CheckBoolImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger *errorLogger)
70+
CheckBoolImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
7171
: CheckImpl(tokenizer, settings, errorLogger) {}
7272

7373
/** @brief %Check for comparison of function returning bool*/

lib/checkbufferoverrun.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ Check::FileInfo * CheckBufferOverrun::loadFileInfoFromXml(const tinyxml2::XMLEle
990990
/** @brief Analyse all file infos for all TU */
991991
bool CheckBufferOverrun::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
992992
{
993-
CheckBufferOverrunImpl dummy(nullptr, settings, &errorLogger);
993+
CheckBufferOverrunImpl dummy(nullptr, settings, errorLogger);
994994
dummy.
995995
logChecker("CheckBufferOverrun::analyseWholeProgram");
996996

@@ -1216,7 +1216,7 @@ void CheckBufferOverrunImpl::negativeMemoryAllocationSizeError(const Token* tok,
12161216

12171217
void CheckBufferOverrun::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
12181218
{
1219-
CheckBufferOverrunImpl checkBufferOverrun(&tokenizer, tokenizer.getSettings(), errorLogger);
1219+
CheckBufferOverrunImpl checkBufferOverrun(&tokenizer, tokenizer.getSettings(), *errorLogger);
12201220
checkBufferOverrun.arrayIndex();
12211221
checkBufferOverrun.pointerArithmetic();
12221222
checkBufferOverrun.bufferOverflow();
@@ -1229,7 +1229,7 @@ void CheckBufferOverrun::runChecks(const Tokenizer &tokenizer, ErrorLogger *erro
12291229

12301230
void CheckBufferOverrun::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
12311231
{
1232-
CheckBufferOverrunImpl c(nullptr, settings, &errorLogger);
1232+
CheckBufferOverrunImpl c(nullptr, settings, errorLogger);
12331233
c.arrayIndexError(nullptr, std::vector<Dimension>(), std::vector<ValueFlow::Value>());
12341234
c.pointerArithmeticError(nullptr, nullptr, nullptr);
12351235
c.negativeIndexError(nullptr, std::vector<Dimension>(), std::vector<ValueFlow::Value>());

lib/checkbufferoverrun.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class CPPCHECKLIB CheckBufferOverrunImpl : public CheckImpl
9696
{
9797
public:
9898
/** This constructor is used when running checks. */
99-
CheckBufferOverrunImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger *errorLogger)
99+
CheckBufferOverrunImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
100100
: CheckImpl(tokenizer, settings, errorLogger) {}
101101

102102
void arrayIndex();

0 commit comments

Comments
 (0)