Fixed cppcheck-opensource#2302 (Duplicate id 'unusedVariable')

Daniel Marjam&auml;ki · Daniel Marjam&auml;ki · commit e6a1efa13b88 · 2011-01-16T18:45:05.000+01:00
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -1875,7 +1875,7 @@ void CheckOther::unusedVariableError(const Token *tok, const std::string &varnam
 
 void CheckOther::allocatedButUnusedVariableError(const Token *tok, const std::string &varname)
 {
-    reportError(tok, Severity::style, "unusedVariable", "Variable '" + varname + "' is allocated memory that is never used");
+    reportError(tok, Severity::style, "unusedAllocatedMemory", "Variable '" + varname + "' is allocated memory that is never used");
 }
 
 void CheckOther::unreadVariableError(const Token *tok, const std::string &varname)
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
@@ -77,6 +77,18 @@ class TestCppcheck : public TestFixture
         ASSERT(!errorLogger.id.empty());
 
         // TODO: check if there are duplicate error ids in errorLogger.id
+        std::string duplicate;
+        for (std::list<std::string>::iterator it = errorLogger.id.begin();
+             it != errorLogger.id.end();
+             ++it)
+        {
+            if (std::find(errorLogger.id.begin(), it, *it) != it)
+            {
+                duplicate = "Duplicate ID: " + *it;
+                break;
+            }
+        }
+        ASSERT_EQUALS("", duplicate);
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1875,7 +1875,7 @@ void CheckOther::unusedVariableError(const Token *tok, const std::string &varnam`
`1875`	`1875`
`1876`	`1876`	`void CheckOther::allocatedButUnusedVariableError(const Token *tok, const std::string &varname)`
`1877`	`1877`	`{`
`1878`		`- reportError(tok, Severity::style, "unusedVariable", "Variable '" + varname + "' is allocated memory that is never used");`
	`1878`	`+ reportError(tok, Severity::style, "unusedAllocatedMemory", "Variable '" + varname + "' is allocated memory that is never used");`
`1879`	`1879`	`}`
`1880`	`1880`
`1881`	`1881`	`void CheckOther::unreadVariableError(const Token *tok, const std::string &varname)`