Format

Author: pfultz2

lib/symboldatabase.cpp

@@ -5861,7 +5861,10 @@ bool Scope::hasInlineOrLambdaFunction(const Token** tokStart, bool onlyInline) c
     });
 }
 
-void Scope::findFunctionInBase(const std::string& name, const Token* tok, size_t args, std::vector<const Function *> & matches) const
+void Scope::findFunctionInBase(const std::string& name,
+                               const Token* tok,
+                               size_t args,
+                               std::vector<const Function*>& matches) const
 {
     if (isClassOrStruct() && definedType && !definedType->derivedFrom.empty()) {
         const std::vector<Type::BaseInfo> &derivedFrom = definedType->derivedFrom;
@@ -6021,9 +6024,9 @@ static bool hasMatchingConstructor(const Scope* classScope, const ValueType* arg
     });
 }
 
-const Function* Scope::findFunction(const Token *tok, bool requireConst, Reference ref, const std::string &funcName) const
+const Function* Scope::findFunction(const Token* tok, bool requireConst, Reference ref, const std::string& funcName) const
 {
-    const std::string &name = funcName.empty() ? tok->str() : funcName;
+    const std::string& name = funcName.empty() ? tok->str() : funcName;
 
     const bool isCall = Token::Match(tok->next(), "(|{");
 
@@ -6034,7 +6037,7 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
     // find all the possible functions that could match
     const std::size_t args = arguments.size();
 
-    auto addMatchingFunctions = [&](const Scope *scope) {
+    auto addMatchingFunctions = [&](const Scope* scope) {
         auto range = scope->functionMap.equal_range(name);
         for (auto it = range.first; it != range.second; ++it) {
             const Function *func = it->second;
@@ -7796,7 +7799,8 @@ static const Function* getFunction(const Token* tok) {
             return lambda;
         // calling an object of a class that overloads operator()
         if (tok != lvar->nameToken() && !lvar->isPointer() && !lvar->isArray() && lvar->typeScope()) {
-            const Function* callOp = lvar->typeScope()->findFunction(tok, lvar->isConst(), Reference::LValue, "operator()");
+            const Function* callOp =
+                lvar->typeScope()->findFunction(tok, lvar->isConst(), Reference::LValue, "operator()");
             if (callOp && callOp->retDef)
                 return callOp;
         }

lib/symboldatabase.h

@@ -1148,7 +1148,10 @@ class CPPCHECKLIB Scope {
      * @param funcName name to look up instead of tok->str(), e.g. "operator()" when tok is a variable that is called
      * @return pointer to function if found or NULL if not found
      */
-    const Function *findFunction(const Token *tok, bool requireConst=false, Reference ref=Reference::None, const std::string &funcName = "") const;
+    const Function* findFunction(const Token* tok,
+                                 bool requireConst = false,
+                                 Reference ref = Reference::None,
+                                 const std::string& funcName = "") const;
 
     const Scope *findRecordInNestedList(const std::string & name, bool isC = false) const;
     Scope *findRecordInNestedList(const std::string & name, bool isC = false);
@@ -1212,7 +1215,10 @@ class CPPCHECKLIB Scope {
      */
     bool isVariableDeclaration(const Token* tok, const Token*& vartok, const Token*& typetok) const;
 
-    void findFunctionInBase(const std::string& name, const Token* tok, size_t args, std::vector<const Function *> & matches) const;
+    void findFunctionInBase(const std::string& name,
+                            const Token* tok,
+                            size_t args,
+                            std::vector<const Function*>& matches) const;
 
     /** @brief initialize varlist */
     void getVariableList(const Token *start, const Token *end);

test/testnullpointer.cpp

@@ -3129,7 +3129,8 @@ class TestNullPointer : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    void nullpointer110() { // #14937 - noreturn member function called on operator() result
+    void nullpointer110()
+    { // #14937 - noreturn member function called on operator() result
         check("struct A {\n"
               "    [[noreturn]] void g(int);\n"
               "};\n"
@@ -3141,7 +3142,8 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        thunk().g(0);\n"
               "    *p = 1;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}",
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 

test/testsymboldatabase.cpp

@@ -8877,7 +8877,8 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(2, functionCall->function()->token->linenr());
     }
 
-    void findFunction63() { // #14937
+    void findFunction63()
+    { // #14937
         GET_SYMBOL_DB("struct A {\n"
                       "    void g(int);\n"
                       "};\n"
@@ -8899,7 +8900,8 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(static_cast<int>(Reference::LValue), static_cast<int>(call->valueType()->reference));
     }
 
-    void findFunction64() { // overloaded operator()
+    void findFunction64()
+    {                                                    // overloaded operator()
         {
             GET_SYMBOL_DB("struct A { void g(int); };\n" // overloads distinguished by argument count
                           "struct B { void h(int); };\n"