Skip to content

Commit 6e8bf04

Browse files
NettozxNettozx
committed
revert formatting changes made by uncrustify. use ss instead of to_string so it doesnst produce trailing 0s
1 parent 717d459 commit 6e8bf04

19 files changed

Lines changed: 86 additions & 97 deletions

‎cli/cppcheckexecutor.cpp‎

Lines changed: 33 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -78,30 +78,25 @@
7878
#endif
7979

8080
namespace {
81-
class SarifReport
82-
{
81+
class SarifReport {
8382
public:
84-
void addFinding(ErrorMessage msg)
85-
{
83+
void addFinding(ErrorMessage msg) {
8684
mFindings.push_back(std::move(msg));
8785
}
8886

89-
picojson::array serializeRules() const
90-
{
87+
picojson::array serializeRules() const {
9188
picojson::array ret;
9289
std::set<std::string> ruleIds;
93-
for (const auto& finding : mFindings)
94-
{
90+
for (const auto& finding : mFindings) {
9591
// github only supports findings with locations
9692
if (finding.callStack.empty())
9793
continue;
98-
if (ruleIds.insert(finding.id).second)
99-
{
94+
if (ruleIds.insert(finding.id).second) {
10095
// setting name and description to empty strings will make github default
10196
// to the instance specific violation message and not rule description,
10297
// this makes it so not all the violations have the same description.
10398
picojson::object rule;
104-
rule["id"] = picojson::value(finding.id);
99+
rule["id"] = picojson::value(finding.id);
105100
// rule.name
106101
rule["name"] = picojson::value("");
107102
// rule.shortDescription.text
@@ -126,35 +121,31 @@ namespace {
126121
if (finding.cwe.id > 0)
127122
{
128123
double securitySeverity = 0;
129-
if (finding.severity == Severity::error && !ErrorLogger::isCriticalErrorId(finding.id))
130-
{
124+
if (finding.severity == Severity::error && !ErrorLogger::isCriticalErrorId(finding.id)) {
131125
securitySeverity = 9.9; // critical = 9.0+
132126
}
133-
else if (finding.severity == Severity::warning)
134-
{
127+
else if (finding.severity == Severity::warning) {
135128
securitySeverity = 8.5; // high = 7.0 to 8.9
136129
}
137130
else if (finding.severity == Severity::performance || finding.severity == Severity::portability ||
138-
finding.severity == Severity::style)
139-
{
131+
finding.severity == Severity::style) {
140132
securitySeverity = 5.5; // medium = 4.0 to 6.9
141133
}
142134
else if (finding.severity == Severity::information || finding.severity == Severity::internal ||
143-
finding.severity == Severity::debug || finding.severity == Severity::none)
144-
{
135+
finding.severity == Severity::debug || finding.severity == Severity::none) {
145136
securitySeverity = 2.0; // low = 0.1 to 3.9
146137
}
147-
if (securitySeverity > 0.0)
148-
{
149-
properties["security-severity"] = picojson::value(std::to_string(securitySeverity));
138+
if (securitySeverity > 0.0) {
139+
std::ostringstream ss;
140+
ss << securitySeverity;
141+
properties["security-severity"] = picojson::value(ss.str());
150142
tags.emplace_back(picojson::value("external/cwe/cwe-" + std::to_string(finding.cwe.id)));
151143
tags.emplace_back(picojson::value("security"));
152144
}
153145
}
154146

155147
// Add tags array if it has any content
156-
if (!tags.empty())
157-
{
148+
if (!tags.empty()) {
158149
properties["tags"] = picojson::value(tags);
159150
}
160151

@@ -173,14 +164,12 @@ namespace {
173164
return ret;
174165
}
175166

176-
static picojson::array serializeLocations(const ErrorMessage& finding)
177-
{
167+
static picojson::array serializeLocations(const ErrorMessage& finding) {
178168
picojson::array ret;
179-
for (const auto& location : finding.callStack)
180-
{
169+
for (const auto& location : finding.callStack) {
181170
picojson::object physicalLocation;
182171
picojson::object artifactLocation;
183-
artifactLocation["uri"] = picojson::value(location.getfile(false));
172+
artifactLocation["uri"] = picojson::value(location.getfile(false));
184173
physicalLocation["artifactLocation"] = picojson::value(artifactLocation);
185174
picojson::object region;
186175

@@ -197,21 +186,19 @@ namespace {
197186
return ret;
198187
}
199188

200-
picojson::array serializeResults() const
201-
{
189+
picojson::array serializeResults() const {
202190
picojson::array results;
203-
for (const auto& finding : mFindings)
204-
{
191+
for (const auto& finding : mFindings) {
205192
// github only supports findings with locations
206193
if (finding.callStack.empty())
207194
continue;
208195
picojson::object res;
209-
res["level"] = picojson::value(sarifSeverity(finding));
196+
res["level"] = picojson::value(sarifSeverity(finding));
210197
res["locations"] = picojson::value(serializeLocations(finding));
211198
picojson::object message;
212199
message["text"] = picojson::value(finding.shortMessage());
213-
res["message"] = picojson::value(message);
214-
res["ruleId"] = picojson::value(finding.id);
200+
res["message"] = picojson::value(message);
201+
res["ruleId"] = picojson::value(finding.id);
215202
results.emplace_back(res);
216203
}
217204
return results;
@@ -220,39 +207,36 @@ namespace {
220207
picojson::value serializeRuns(const std::string& productName, const std::string& version) const
221208
{
222209
picojson::object driver;
223-
driver["name"] = picojson::value(productName);
210+
driver["name"] = picojson::value(productName);
224211
driver["semanticVersion"] = picojson::value(version);
225-
driver["informationUri"] = picojson::value("https://cppcheck.sourceforge.io");
226-
driver["rules"] = picojson::value(serializeRules());
212+
driver["informationUri"] = picojson::value("https://cppcheck.sourceforge.io");
213+
driver["rules"] = picojson::value(serializeRules());
227214
picojson::object tool;
228215
tool["driver"] = picojson::value(driver);
229216
picojson::object run;
230-
run["tool"] = picojson::value(tool);
217+
run["tool"] = picojson::value(tool);
231218
run["results"] = picojson::value(serializeResults());
232219
picojson::array runs{picojson::value(run)};
233220
return picojson::value(runs);
234221
}
235222

236-
std::string serialize(std::string productName) const
237-
{
223+
std::string serialize(std::string productName) const {
238224
const auto nameAndVersion = Settings::getNameAndVersion(productName);
239-
productName = nameAndVersion.first.empty() ? "Cppcheck" : nameAndVersion.first;
240-
std::string version = nameAndVersion.first.empty() ? CppCheck::version() : nameAndVersion.second;
225+
productName = nameAndVersion.first.empty() ? "Cppcheck" : nameAndVersion.first;
226+
std::string version = nameAndVersion.first.empty() ? CppCheck::version() : nameAndVersion.second;
241227
if (version.find(' ') != std::string::npos)
242228
version.erase(version.find(' '), std::string::npos);
243229

244230
picojson::object doc;
245231
doc["version"] = picojson::value("2.1.0");
246-
doc["$schema"] = picojson::value(
247-
"https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/schemas/sarif-schema-2.1.0.json");
232+
doc["$schema"] = picojson::value("https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/schemas/sarif-schema-2.1.0.json");
248233
doc["runs"] = serializeRuns(productName, version);
249234

250235
return picojson::value(doc).serialize(true);
251236
}
252237

253238
private:
254-
static std::string sarifSeverity(const ErrorMessage& errmsg)
255-
{
239+
static std::string sarifSeverity(const ErrorMessage& errmsg) {
256240
if (ErrorLogger::isCriticalErrorId(errmsg.id))
257241
return "error";
258242
switch (errmsg.severity)
@@ -273,8 +257,7 @@ namespace {
273257
return "note";
274258
}
275259

276-
static std::string sarifPrecision(const ErrorMessage& errmsg)
277-
{
260+
static std::string sarifPrecision(const ErrorMessage& errmsg) {
278261
if (errmsg.certainty == Certainty::inconclusive)
279262
return "medium";
280263
return "high";

‎lib/checkersreport.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
193193
const bool cppcheckPremium = isCppcheckPremium(mSettings);
194194

195195
auto reportSection = [&fout, cppcheckPremium]
196-
(const std::string& title,
197-
const Settings& settings,
198-
const std::set<std::string>& activeCheckers,
199-
const std::map<std::string, std::string>& premiumCheckers,
200-
const std::string& substring) {
196+
(const std::string& title,
197+
const Settings& settings,
198+
const std::set<std::string>& activeCheckers,
199+
const std::map<std::string, std::string>& premiumCheckers,
200+
const std::string& substring) {
201201
fout << std::endl << std::endl;
202202
fout << title << std::endl;
203203
fout << std::string(title.size(), '-') << std::endl;

‎lib/clangimport.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,12 +1499,12 @@ void clangimport::AstNode::createTokensForCXXRecord(TokenList &tokenList)
14991499
std::vector<AstNodePtr> children2;
15001500
std::copy_if(children.cbegin(), children.cend(), std::back_inserter(children2), [](const AstNodePtr& child) {
15011501
return child->nodeType == CXXConstructorDecl ||
1502-
child->nodeType == CXXDestructorDecl ||
1503-
child->nodeType == CXXMethodDecl ||
1504-
child->nodeType == FieldDecl ||
1505-
child->nodeType == VarDecl ||
1506-
child->nodeType == AccessSpecDecl ||
1507-
child->nodeType == TypedefDecl;
1502+
child->nodeType == CXXDestructorDecl ||
1503+
child->nodeType == CXXMethodDecl ||
1504+
child->nodeType == FieldDecl ||
1505+
child->nodeType == VarDecl ||
1506+
child->nodeType == AccessSpecDecl ||
1507+
child->nodeType == TypedefDecl;
15081508
});
15091509
Scope *scope = createScope(tokenList, isStruct ? ScopeType::eStruct : ScopeType::eClass, children2, classToken);
15101510
const std::string addr = mExtTokens[0];

‎lib/symboldatabase.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5767,11 +5767,11 @@ static bool hasMatchingConstructor(const Scope* classScope, const ValueType* arg
57675767
return false;
57685768
const ValueType* vt = f.getArgumentVar(0)->valueType();
57695769
return vt &&
5770-
vt->type == argType->type &&
5771-
(argType->sign == ValueType::Sign::UNKNOWN_SIGN || vt->sign == argType->sign) &&
5772-
vt->pointer == argType->pointer &&
5773-
(vt->constness & 1) >= (argType->constness & 1) &&
5774-
(vt->volatileness & 1) >= (argType->volatileness & 1);
5770+
vt->type == argType->type &&
5771+
(argType->sign == ValueType::Sign::UNKNOWN_SIGN || vt->sign == argType->sign) &&
5772+
vt->pointer == argType->pointer &&
5773+
(vt->constness & 1) >= (argType->constness & 1) &&
5774+
(vt->volatileness & 1) >= (argType->volatileness & 1);
57755775
});
57765776
}
57775777

‎lib/token.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,7 +2541,7 @@ bool Token::hasKnownSymbolicValue(const Token* tok) const
25412541
return mImpl->mValues &&
25422542
std::any_of(mImpl->mValues->begin(), mImpl->mValues->end(), [&](const ValueFlow::Value& value) {
25432543
return value.isKnown() && value.isSymbolicValue() && value.tokvalue &&
2544-
value.tokvalue->exprId() == tok->exprId();
2544+
value.tokvalue->exprId() == tok->exprId();
25452545
});
25462546
}
25472547

@@ -2614,7 +2614,7 @@ const ValueFlow::Value* Token::getMovedValue() const
26142614
return nullptr;
26152615
const auto it = std::find_if(mImpl->mValues->begin(), mImpl->mValues->end(), [](const ValueFlow::Value& value) {
26162616
return value.isMovedValue() && !value.isImpossible() &&
2617-
value.moveKind != ValueFlow::Value::MoveKind::NonMovedVariable;
2617+
value.moveKind != ValueFlow::Value::MoveKind::NonMovedVariable;
26182618
});
26192619
return it == mImpl->mValues->end() ? nullptr : &*it;
26202620
}

‎lib/tokenize.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10947,10 +10947,10 @@ bool Tokenizer::hasIfdef(const Token *start, const Token *end) const
1094710947
const auto& directives = mDirectives;
1094810948
return std::any_of(directives.cbegin(), directives.cend(), [&](const Directive& d) {
1094910949
return startsWith(d.str, "#if") &&
10950-
d.linenr >= start->linenr() &&
10951-
d.linenr <= end->linenr() &&
10952-
start->fileIndex() < list.getFiles().size() &&
10953-
d.file == list.getFiles()[start->fileIndex()];
10950+
d.linenr >= start->linenr() &&
10951+
d.linenr <= end->linenr() &&
10952+
start->fileIndex() < list.getFiles().size() &&
10953+
d.file == list.getFiles()[start->fileIndex()];
1095410954
});
1095510955
}
1095610956

‎lib/valueflow.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2771,7 +2771,7 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
27712771
const Token* varTok = args[iArg - 1];
27722772
if (varTok->variable() && varTok->variable()->isLocal())
27732773
LifetimeStore{ varTok, "Passed to '" + tok->str() + "'.", ValueFlow::Value::LifetimeKind::Address }.byRef(
2774-
tok->next(), tokenlist, errorLogger, settings);
2774+
tok->next(), tokenlist, errorLogger, settings);
27752775
}
27762776
}
27772777
}

‎lib/vf_settokenvalue.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ namespace ValueFlow
528528
args2.begin(),
529529
[&](const Token* atok, const Token* btok) {
530530
return atok->getKnownIntValue() ==
531-
btok->getKnownIntValue();
531+
btok->getKnownIntValue();
532532
});
533533
} else {
534534
equal = false;

‎samples/passedByValue_1/bad.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ class C
22
{
33
public:
44
explicit C(std::string s)
5-
: _s(s)
6-
{}
5+
: _s(s)
6+
{
7+
}
78
void foo();
89
private:
910
std::string _s;

‎samples/passedByValue_1/good.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ class C
22
{
33
public:
44
explicit C(std::string s)
5-
: _s(std::move(s))
6-
{}
5+
: _s(std::move(s))
6+
{
7+
}
78
void foo();
89
private:
910
std::string _s;

0 commit comments

Comments
 (0)