Use set instead of list

Dmitry-Me · Dmitry-Me · commit 7fdbd8f0caf2 · 2015-12-25T16:19:27.000+03:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -1052,11 +1052,11 @@ void CheckClass::checkMemset()
                     type = typeTok->type()->classScope;
 
                 if (type) {
-                    std::list<const Scope *> parsedTypes;
+                    std::set<const Scope *> 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;
+                std::set<const Scope *> parsedTypes;
                 checkMemsetType(scope, tok->tokAt(2), tok->variable()->typeScope(), true, parsedTypes);
 
                 if (tok->variable()->typeScope()->numConstructors > 0 && printWarnings)
@@ -1066,12 +1066,12 @@ void CheckClass::checkMemset()
     }
 }
 
-void CheckClass::checkMemsetType(const Scope *start, const Token *tok, const Scope *type, bool allocation, std::list<const Scope *> parsedTypes)
+void CheckClass::checkMemsetType(const Scope *start, const Token *tok, const Scope *type, bool allocation, std::set<const Scope *> parsedTypes)
 {
     // If type has been checked there is no need to check it again
-    if (std::find(parsedTypes.begin(), parsedTypes.end(), type) != parsedTypes.end())
+    if (parsedTypes.find(type) != parsedTypes.end())
         return;
-    parsedTypes.push_back(type);
+    parsedTypes.insert(type);
 
     const bool printPortability = _settings->isEnabled("portability");
 
diff --git a/lib/checkclass.h b/lib/checkclass.h
@@ -99,7 +99,7 @@ class CPPCHECKLIB CheckClass : public Check {
      * Important: The checking doesn't work on simplified tokens list.
      */
     void checkMemset();
-    void checkMemsetType(const Scope *start, const Token *tok, const Scope *type, bool allocation, std::list<const Scope *> parsedTypes);
+    void checkMemsetType(const Scope *start, const Token *tok, const Scope *type, bool allocation, std::set<const Scope *> parsedTypes);
 
     /** @brief 'operator=' should return something and it should not be const. */
     void operatorEq();

Original file line number	Diff line number	Diff line change
`@@ -1052,11 +1052,11 @@ void CheckClass::checkMemset()`
`1052`	`1052`	`type = typeTok->type()->classScope;`
`1053`	`1053`
`1054`	`1054`	`if (type) {`
`1055`		`- std::list<const Scope *> parsedTypes;`
	`1055`	`+ std::set<const Scope *> parsedTypes;`
`1056`	`1056`	`checkMemsetType(scope, tok, type, false, parsedTypes);`
`1057`	`1057`	`}`
`1058`	`1058`	`} else if (tok->variable() && tok->variable()->typeScope() && Token::Match(tok, "%var% = calloc\|malloc\|realloc\|g_malloc\|g_try_malloc\|g_realloc\|g_try_realloc (")) {`
`1059`		`- std::list<const Scope *> parsedTypes;`
	`1059`	`+ std::set<const Scope *> parsedTypes;`
`1060`	`1060`	`checkMemsetType(scope, tok->tokAt(2), tok->variable()->typeScope(), true, parsedTypes);`
`1061`	`1061`
`1062`	`1062`	`if (tok->variable()->typeScope()->numConstructors > 0 && printWarnings)`
`@@ -1066,12 +1066,12 @@ void CheckClass::checkMemset()`
`1066`	`1066`	`}`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`		`-void CheckClass::checkMemsetType(const Scope start, const Token tok, const Scope type, bool allocation, std::list<const Scope > parsedTypes)`
	`1069`	`+void CheckClass::checkMemsetType(const Scope start, const Token tok, const Scope type, bool allocation, std::set<const Scope > parsedTypes)`
`1070`	`1070`	`{`
`1071`	`1071`	`// If type has been checked there is no need to check it again`
`1072`		`- if (std::find(parsedTypes.begin(), parsedTypes.end(), type) != parsedTypes.end())`
	`1072`	`+ if (parsedTypes.find(type) != parsedTypes.end())`
`1073`	`1073`	`return;`
`1074`		`- parsedTypes.push_back(type);`
	`1074`	`+ parsedTypes.insert(type);`
`1075`	`1075`
`1076`	`1076`	`const bool printPortability = _settings->isEnabled("portability");`
`1077`	`1077`