Clean up redundant pointer operations

thomasjfox · thomasjfox · commit fd01cafb1b2c · 2015-01-17T16:29:50.000+01:00
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -1220,12 +1220,12 @@ void CheckBufferOverrun::checkStructVariable()
                     // If struct is declared in a function then check
                     // if scope_func matches
                     if (scope->nestedIn->type == Scope::eFunction &&
-                        scope->nestedIn != &*func_scope) {
+                        scope->nestedIn != func_scope) {
                         continue;
                     }
 
                     // check for member variables
-                    if (func_scope->functionOf == &*scope) {
+                    if (func_scope->functionOf == scope) {
                         // only check non-empty function
                         if (func_scope->classStart->next() != func_scope->classEnd) {
                             // start checking after the {
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -128,7 +128,7 @@ void CheckClass::constructors()
             clearAllVar(usage);
 
             std::list<const Function *> callstack;
-            initializeVarList(*func, callstack, &(*scope), usage);
+            initializeVarList(*func, callstack, scope, usage);
 
             // Check if any variables are uninitialized
             std::list<Variable>::const_iterator var;
@@ -233,14 +233,14 @@ void CheckClass::copyconstructors()
                 for (const Token* const end = func->functionScope->classStart; tok != end; tok = tok->next()) {
                     if (Token::Match(tok, "%var% ( new|malloc|g_malloc|g_try_malloc|realloc|g_realloc|g_try_realloc")) {
                         const Variable* var = tok->variable();
-                        if (var && var->isPointer() && var->scope() == &*scope)
+                        if (var && var->isPointer() && var->scope() == scope)
                             allocatedVars[tok->varId()] = tok;
                     }
                 }
                 for (const Token* const end = func->functionScope->classEnd; tok != end; tok = tok->next()) {
                     if (Token::Match(tok, "%var% = new|malloc|g_malloc|g_try_malloc|realloc|g_realloc|g_try_realloc")) {
                         const Variable* var = tok->variable();
-                        if (var && var->isPointer() && var->scope() == &*scope)
+                        if (var && var->isPointer() && var->scope() == scope)
                             allocatedVars[tok->varId()] = tok;
                     }
                 }
@@ -882,7 +882,7 @@ void CheckClass::privateFunctions()
         while (!privateFuncs.empty()) {
             const std::string& funcName = privateFuncs.front()->tokenDef->str();
             // Check that all private functions are used
-            bool used = checkFunctionUsage(funcName, &*scope); // Usage in this class
+            bool used = checkFunctionUsage(funcName, scope); // Usage in this class
             // Check in friend classes
             const std::list<Type::FriendInfo>& friendList = scope->definedType->friendList;
             for (std::list<Type::FriendInfo>::const_iterator it = friendList.begin(); !used && it != friendList.end(); ++it) {
@@ -981,18 +981,18 @@ void CheckClass::checkMemset()
                     typeTok = typeTok->next();
 
                 if (!type) {
-                    const Type* t = symbolDatabase->findVariableType(&(*scope), typeTok);
+                    const Type* t = symbolDatabase->findVariableType(scope, typeTok);
                     if (t)
                         type = t->classScope;
                 }
 
                 if (type) {
                     std::list<const Scope *> parsedTypes;
-                    checkMemsetType(&(*scope), tok, type, false, parsedTypes);
+                    checkMemsetType(scope, tok, type, false, parsedTypes);
                 }
             } else if (tok->variable() && tok->variable()->typeScope() && Token::Match(tok, "%var% = calloc|malloc|realloc|g_malloc|g_try_malloc|g_realloc|g_try_realloc (")) {
                 std::list<const Scope *> parsedTypes;
-                checkMemsetType(&(*scope), tok->tokAt(2), tok->variable()->typeScope(), true, parsedTypes);
+                checkMemsetType(scope, tok->tokAt(2), tok->variable()->typeScope(), true, parsedTypes);
 
                 if (tok->variable()->typeScope()->numConstructors > 0 && _settings->isEnabled("warning"))
                     mallocOnClassWarning(tok, tok->strAt(2), tok->variable()->typeScope()->classDef);
@@ -1163,7 +1163,7 @@ void CheckClass::operatorEqRetRefThis()
             if (func->type == Function::eOperatorEqual && func->hasBody()) {
                 // make sure return signature is correct
                 if (Token::Match(func->retDef, "%type% &") && func->retDef->str() == scope->className) {
-                    checkReturnPtrThis(&(*scope), &(*func), func->functionScope->classStart, func->functionScope->classEnd);
+                    checkReturnPtrThis(scope, &(*func), func->functionScope->classStart, func->functionScope->classEnd);
                 }
             }
         }
@@ -1281,7 +1281,7 @@ void CheckClass::operatorEqToSelf()
                     const Token *rhs = func->argumentList.begin()->nameToken();
 
                     if (!hasAssignSelf(&(*func), rhs)) {
-                        if (hasAllocation(&(*func), &*scope))
+                        if (hasAllocation(&(*func), scope))
                             operatorEqToSelfError(func->token);
                     }
                 }
@@ -1605,7 +1605,7 @@ void CheckClass::checkConst()
 
                 bool memberAccessed = false;
                 // if nothing non-const was found. write error..
-                if (checkConstFunc(&(*scope), &*func, memberAccessed)) {
+                if (checkConstFunc(scope, &*func, memberAccessed)) {
                     std::string classname = scope->className;
                     const Scope *nest = scope->nestedIn;
                     while (nest && nest->type != Scope::eGlobal) {
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -2278,19 +2278,19 @@ void CheckMemoryLeakInClass::check()
                 const Token *tok = var->typeStartToken();
                 if (tok->isStandardType()) {
                     if (var->isPrivate())
-                        checkPublicFunctions(&(*scope), var->nameToken());
+                        checkPublicFunctions(scope, var->nameToken());
 
-                    variable(&(*scope), var->nameToken());
+                    variable(scope, var->nameToken());
                 }
 
                 // known class?
                 else if (var->type()) {
                     // not derived?
                     if (var->type()->derivedFrom.empty()) {
                         if (var->isPrivate())
-                            checkPublicFunctions(&(*scope), var->nameToken());
+                            checkPublicFunctions(scope, var->nameToken());
 
-                        variable(&(*scope), var->nameToken());
+                        variable(scope, var->nameToken());
                     }
                 }
             }
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -1087,7 +1087,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
         // varId, usage {read, write, modified}
         Variables variables;
 
-        checkFunctionVariableUsage_iterateScopes(&*scope, variables, false);
+        checkFunctionVariableUsage_iterateScopes(scope, variables, false);
 
 
         // Check usage of all variables in the current scope..
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -1680,7 +1680,7 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
                             addNewFunction(scope, tok);
                             if (*scope) {
                                 (*scope)->functionOf = func->nestedIn;
-                                (*scope)->function = &*func;
+                                (*scope)->function = func;
                                 (*scope)->function->functionScope = *scope;
                             }
                             return;
@@ -1751,7 +1751,7 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
                             addNewFunction(scope, tok);
                             if (*scope) {
                                 (*scope)->functionOf = scope1;
-                                (*scope)->function = &*func;
+                                (*scope)->function = func;
                                 (*scope)->function->functionScope = *scope;
                             }
                             return;

Original file line number	Diff line number	Diff line change
`@@ -2278,19 +2278,19 @@ void CheckMemoryLeakInClass::check()`
`2278`	`2278`	`const Token *tok = var->typeStartToken();`
`2279`	`2279`	`if (tok->isStandardType()) {`
`2280`	`2280`	`if (var->isPrivate())`
`2281`		`- checkPublicFunctions(&(*scope), var->nameToken());`
	`2281`	`+ checkPublicFunctions(scope, var->nameToken());`
`2282`	`2282`
`2283`		`- variable(&(*scope), var->nameToken());`
	`2283`	`+ variable(scope, var->nameToken());`
`2284`	`2284`	`}`
`2285`	`2285`
`2286`	`2286`	`// known class?`
`2287`	`2287`	`else if (var->type()) {`
`2288`	`2288`	`// not derived?`
`2289`	`2289`	`if (var->type()->derivedFrom.empty()) {`
`2290`	`2290`	`if (var->isPrivate())`
`2291`		`- checkPublicFunctions(&(*scope), var->nameToken());`
	`2291`	`+ checkPublicFunctions(scope, var->nameToken());`
`2292`	`2292`
`2293`		`- variable(&(*scope), var->nameToken());`
	`2293`	`+ variable(scope, var->nameToken());`
`2294`	`2294`	`}`
`2295`	`2295`	`}`
`2296`	`2296`	`}`