Skip to content

Commit e2a8521

Browse files
committed
move unique error check above output format check
1 parent 4de30a0 commit e2a8521

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

cli/cppcheckexecutor.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -561,20 +561,20 @@ void StdLogger::reportErr(const ErrorMessage &msg)
561561
mGuidelineMapping, msgCopy.severity);
562562
msgCopy.classification = getClassification(msgCopy.guideline, mSettings.reportType);
563563

564+
// TODO: there should be no need for verbose and default messages here
565+
const std::string msgStr =
566+
msgCopy.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);
567+
568+
// Alert only about unique errors
569+
if (!mSettings.emitDuplicates && !mShownErrors.insert(msgStr).second)
570+
return;
571+
564572
if (mSettings.outputFormat == Settings::OutputFormat::sarif) {
565573
mSarifReport.addFinding(std::move(msgCopy));
574+
} else if (mSettings.outputFormat == Settings::OutputFormat::xml) {
575+
reportErr(msgCopy.toXML());
566576
} else {
567-
// TODO: there should be no need for verbose and default messages here
568-
const std::string msgStr = msgCopy.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);
569-
570-
// Alert only about unique errors
571-
if (!mSettings.emitDuplicates && !mShownErrors.insert(msgStr).second)
572-
return;
573-
574-
if (mSettings.outputFormat == Settings::OutputFormat::xml)
575-
reportErr(msgCopy.toXML());
576-
else
577-
reportErr(msgStr);
577+
reportErr(msgStr);
578578
}
579579
}
580580

0 commit comments

Comments
 (0)