Formatted the code [ci skip]

orbitcowboy · orbitcowboy · commit 14ff646c9254 · 2021-06-02T16:59:34.000+02:00
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -72,7 +72,8 @@ void CheckExceptionSafety::destructors()
     }
 }
 
-void CheckExceptionSafety::destructorsError(const Token * const tok, const std::string &className) {
+void CheckExceptionSafety::destructorsError(const Token * const tok, const std::string &className)
+{
     reportError(tok, Severity::warning, "exceptThrowInDestructor",
                 "Class " + className + " is not safe, destructor throws exception\n"
                 "The class " + className + " is not safe because its destructor "
@@ -142,7 +143,8 @@ void CheckExceptionSafety::deallocThrow()
     }
 }
 
-void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std::string &varname) {
+void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std::string &varname)
+{
     reportError(tok, Severity::warning, "exceptDeallocThrow", "Exception thrown in invalid state, '" +
                 varname + "' points at deallocated memory.", CWE398, Certainty::normal);
 }
@@ -184,7 +186,8 @@ void CheckExceptionSafety::checkRethrowCopy()
     }
 }
 
-void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::string &varname) {
+void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::string &varname)
+{
     reportError(tok, Severity::style, "exceptRethrowCopy",
                 "Throwing a copy of the caught exception instead of rethrowing the original exception.\n"
                 "Rethrowing an exception with 'throw " + varname + ";' creates an unnecessary copy of '" + varname + "'. "
@@ -213,7 +216,8 @@ void CheckExceptionSafety::checkCatchExceptionByValue()
     }
 }
 
-void CheckExceptionSafety::catchExceptionByValueError(const Token *tok) {
+void CheckExceptionSafety::catchExceptionByValueError(const Token *tok)
+{
     reportError(tok, Severity::style,
                 "catchExceptionByValue", "Exception should be caught by reference.\n"
                 "The exception is caught by value. It could be caught "
@@ -298,7 +302,8 @@ void CheckExceptionSafety::nothrowThrows()
     }
 }
 
-void CheckExceptionSafety::noexceptThrowError(const Token * const tok) {
+void CheckExceptionSafety::noexceptThrowError(const Token * const tok)
+{
     reportError(tok, Severity::error, "throwInNoexceptFunction", "Exception thrown in function declared not to throw exceptions.", CWE398, Certainty::normal);
 }
 
@@ -334,7 +339,8 @@ void CheckExceptionSafety::unhandledExceptionSpecification()
     }
 }
 
-void CheckExceptionSafety::unhandledExceptionSpecificationError(const Token * const tok1, const Token * const tok2, const std::string & funcname) {
+void CheckExceptionSafety::unhandledExceptionSpecificationError(const Token * const tok1, const Token * const tok2, const std::string & funcname)
+{
     const std::string str1(tok1 ? tok1->str() : "foo");
     const std::list<const Token*> locationList = { tok1, tok2 };
     reportError(locationList, Severity::style, "unhandledExceptionSpecification",
@@ -357,11 +363,11 @@ void CheckExceptionSafety::rethrowNoCurrentException()
         // Rethrow can be used in 'exception dispatcher' idiom which is FP in such case
         // https://isocpp.org/wiki/faq/exceptions#throw-without-an-object
         // We check the beggining of the function with idiom pattern
-        if (Token::simpleMatch(function->functionScope->bodyStart->next(), "try { throw ; } catch (" ))
+        if (Token::simpleMatch(function->functionScope->bodyStart->next(), "try { throw ; } catch ("))
             continue;
 
         for (const Token *tok = function->functionScope->bodyStart->next();
-            tok != function->functionScope->bodyEnd; tok = tok->next()) {
+             tok != function->functionScope->bodyEnd; tok = tok->next()) {
             if (Token::simpleMatch(tok, "catch (")) {
                 tok = tok->linkAt(1);       // skip catch argument
                 if (Token::simpleMatch(tok, ") {"))
@@ -376,7 +382,8 @@ void CheckExceptionSafety::rethrowNoCurrentException()
     }
 }
 
-void CheckExceptionSafety::rethrowNoCurrentExceptionError(const Token *tok) {
+void CheckExceptionSafety::rethrowNoCurrentExceptionError(const Token *tok)
+{
     reportError(tok, Severity::error, "rethrowNoCurrentException",
                 "Rethrowing current exception with 'throw;', it seems there is no current exception to rethrow."
                 " If there is no current exception this calls std::terminate()."

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ void CheckExceptionSafety::destructors()`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`-void CheckExceptionSafety::destructorsError(const Token * const tok, const std::string &className) {`
	`75`	`+void CheckExceptionSafety::destructorsError(const Token * const tok, const std::string &className)`
	`76`	`+{`
`76`	`77`	`reportError(tok, Severity::warning, "exceptThrowInDestructor",`
`77`	`78`	`"Class " + className + " is not safe, destructor throws exception\n"`
`78`	`79`	`"The class " + className + " is not safe because its destructor "`
`@@ -142,7 +143,8 @@ void CheckExceptionSafety::deallocThrow()`
`142`	`143`	`}`
`143`	`144`	`}`
`144`	`145`
`145`		`-void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std::string &varname) {`
	`146`	`+void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std::string &varname)`
	`147`	`+{`
`146`	`148`	`reportError(tok, Severity::warning, "exceptDeallocThrow", "Exception thrown in invalid state, '" +`
`147`	`149`	`varname + "' points at deallocated memory.", CWE398, Certainty::normal);`
`148`	`150`	`}`
`@@ -184,7 +186,8 @@ void CheckExceptionSafety::checkRethrowCopy()`
`184`	`186`	`}`
`185`	`187`	`}`
`186`	`188`
`187`		`-void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::string &varname) {`
	`189`	`+void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::string &varname)`
	`190`	`+{`
`188`	`191`	`reportError(tok, Severity::style, "exceptRethrowCopy",`
`189`	`192`	`"Throwing a copy of the caught exception instead of rethrowing the original exception.\n"`
`190`	`193`	`"Rethrowing an exception with 'throw " + varname + ";' creates an unnecessary copy of '" + varname + "'. "`
`@@ -213,7 +216,8 @@ void CheckExceptionSafety::checkCatchExceptionByValue()`
`213`	`216`	`}`
`214`	`217`	`}`
`215`	`218`
`216`		`-void CheckExceptionSafety::catchExceptionByValueError(const Token *tok) {`
	`219`	`+void CheckExceptionSafety::catchExceptionByValueError(const Token *tok)`
	`220`	`+{`
`217`	`221`	`reportError(tok, Severity::style,`
`218`	`222`	`"catchExceptionByValue", "Exception should be caught by reference.\n"`
`219`	`223`	`"The exception is caught by value. It could be caught "`
`@@ -298,7 +302,8 @@ void CheckExceptionSafety::nothrowThrows()`
`298`	`302`	`}`
`299`	`303`	`}`
`300`	`304`
`301`		`-void CheckExceptionSafety::noexceptThrowError(const Token * const tok) {`
	`305`	`+void CheckExceptionSafety::noexceptThrowError(const Token * const tok)`
	`306`	`+{`
`302`	`307`	`reportError(tok, Severity::error, "throwInNoexceptFunction", "Exception thrown in function declared not to throw exceptions.", CWE398, Certainty::normal);`
`303`	`308`	`}`
`304`	`309`
`@@ -334,7 +339,8 @@ void CheckExceptionSafety::unhandledExceptionSpecification()`
`334`	`339`	`}`
`335`	`340`	`}`
`336`	`341`
`337`		`-void CheckExceptionSafety::unhandledExceptionSpecificationError(const Token * const tok1, const Token * const tok2, const std::string & funcname) {`
	`342`	`+void CheckExceptionSafety::unhandledExceptionSpecificationError(const Token * const tok1, const Token * const tok2, const std::string & funcname)`
	`343`	`+{`
`338`	`344`	`const std::string str1(tok1 ? tok1->str() : "foo");`
`339`	`345`	`const std::list<const Token*> locationList = { tok1, tok2 };`
`340`	`346`	`reportError(locationList, Severity::style, "unhandledExceptionSpecification",`
`@@ -357,11 +363,11 @@ void CheckExceptionSafety::rethrowNoCurrentException()`
`357`	`363`	`// Rethrow can be used in 'exception dispatcher' idiom which is FP in such case`
`358`	`364`	`// https://isocpp.org/wiki/faq/exceptions#throw-without-an-object`
`359`	`365`	`// We check the beggining of the function with idiom pattern`
`360`		`- if (Token::simpleMatch(function->functionScope->bodyStart->next(), "try { throw ; } catch (" ))`
	`366`	`+ if (Token::simpleMatch(function->functionScope->bodyStart->next(), "try { throw ; } catch ("))`
`361`	`367`	`continue;`
`362`	`368`
`363`	`369`	`for (const Token *tok = function->functionScope->bodyStart->next();`
`364`		`- tok != function->functionScope->bodyEnd; tok = tok->next()) {`
	`370`	`+ tok != function->functionScope->bodyEnd; tok = tok->next()) {`
`365`	`371`	`if (Token::simpleMatch(tok, "catch (")) {`
`366`	`372`	`tok = tok->linkAt(1); // skip catch argument`
`367`	`373`	`if (Token::simpleMatch(tok, ") {"))`
`@@ -376,7 +382,8 @@ void CheckExceptionSafety::rethrowNoCurrentException()`
`376`	`382`	`}`
`377`	`383`	`}`
`378`	`384`
`379`		`-void CheckExceptionSafety::rethrowNoCurrentExceptionError(const Token *tok) {`
	`385`	`+void CheckExceptionSafety::rethrowNoCurrentExceptionError(const Token *tok)`
	`386`	`+{`
`380`	`387`	`reportError(tok, Severity::error, "rethrowNoCurrentException",`
`381`	`388`	`"Rethrowing current exception with 'throw;', it seems there is no current exception to rethrow."`
`382`	`389`	`" If there is no current exception this calls std::terminate()."`