Update message

pfultz2 · pfultz2 · commit 3c10a9c659a7 · 2020-06-24T18:09:30.000-05:00
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -2417,7 +2417,7 @@ void CheckStl::globalLockGuardError(const Token* tok)
 {
     reportError(tok, Severity::warning,
                 "globalLockGuard",
-                "The lock guard won't unlock until the end of the program which could lead to a deadlock.", CWE833, false);
+                "Lock guard is defined globally. Lock guards are intended to be local. A global lock guard could lead to a deadlock since it won't unlock until the end of the program.", CWE833, false);
 }
 
 void CheckStl::localMutexError(const Token* tok)
diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -4420,7 +4420,7 @@ class TestStl : public TestFixture {
               "    static std::lock_guard<std::mutex> g(m);\n"
               "}\n",
               true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) The lock guard won't unlock until the end of the program which could lead to a deadlock.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3]: (warning) Lock guard is defined globally. Lock guards are intended to be local. A global lock guard could lead to a deadlock since it won't unlock until the end of the program.\n", errout.str());
 
         check("void f() {\n"
               "    static std::mutex m;\n"
@@ -4484,7 +4484,7 @@ class TestStl : public TestFixture {
               "    }\n"
               "};\n",
               true);
-        ASSERT_EQUALS("[test.cpp:4]: (warning) The lock guard won't unlock until the end of the program which could lead to a deadlock.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (warning) Lock guard is defined globally. Lock guards are intended to be local. A global lock guard could lead to a deadlock since it won't unlock until the end of the program.\n", errout.str());
 
         check("std::mutex& h();\n"
               "void f() {\n"

Original file line number	Diff line number	Diff line change
`@@ -2417,7 +2417,7 @@ void CheckStl::globalLockGuardError(const Token* tok)`
`2417`	`2417`	`{`
`2418`	`2418`	`reportError(tok, Severity::warning,`
`2419`	`2419`	`"globalLockGuard",`
`2420`		`- "The lock guard won't unlock until the end of the program which could lead to a deadlock.", CWE833, false);`
	`2420`	`+ "Lock guard is defined globally. Lock guards are intended to be local. A global lock guard could lead to a deadlock since it won't unlock until the end of the program.", CWE833, false);`
`2421`	`2421`	`}`
`2422`	`2422`
`2423`	`2423`	`void CheckStl::localMutexError(const Token* tok)`