Made 'unhandled exception' inconclusive and style message. danmar#5751

IOBYTE · danmar · commit 7d762ca9f70c · 2014-05-02T06:57:23.000+02:00
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -261,7 +261,7 @@ void CheckExceptionSafety::nothrowThrows()
 //--------------------------------------------------------------------------
 void CheckExceptionSafety::unhandledExceptionSpecification()
 {
-    if (!_settings->isEnabled("warning"))
+    if (!_settings->isEnabled("style") || !_settings->inconclusive)
         return;
 
     const SymbolDatabase* const symbolDatabase = _tokenizer->getSymbolDatabase();
diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
@@ -129,10 +129,10 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
         std::list<const Token*> locationList;
         locationList.push_back(tok1);
         locationList.push_back(tok2);
-        reportError(locationList, Severity::warning, "unhandledExceptionSpecification",
+        reportError(locationList, Severity::style, "unhandledExceptionSpecification",
                     "Unhandled exception specification when calling function " + str1 + "().\n"
                     "Unhandled exception specification when calling function " + str1 + "(). "
-                    "Either use a try/catch around the function call, or add a exception specification for " + funcname + "() also.");
+                    "Either use a try/catch around the function call, or add a exception specification for " + funcname + "() also.", true);
     }
 
     /** Generate all possible errors (for --errorlist) */
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -356,16 +356,16 @@ class TestExceptionSafety : public TestFixture {
               "  try {\n"
               "    myThrowingFoo();\n"
               "  } catch(MyException &) {}\n"
-              "}\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:1]: (warning) Unhandled exception specification when calling function myThrowingFoo().\n", errout.str());
+              "}\n", true);
+        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:1]: (style, inconclusive) Unhandled exception specification when calling function myThrowingFoo().\n", errout.str());
     }
 
     void unhandledExceptionSpecification2() {
         check("void f() const throw (std::runtime_error);\n"
               "int main()\n"
               "{\n"
               "    f();\n"
-              "}\n");
+              "}\n", true);
         ASSERT_EQUALS("", errout.str());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ void CheckExceptionSafety::nothrowThrows()`
`261`	`261`	`//--------------------------------------------------------------------------`
`262`	`262`	`void CheckExceptionSafety::unhandledExceptionSpecification()`
`263`	`263`	`{`
`264`		`- if (!_settings->isEnabled("warning"))`
	`264`	`+ if (!_settings->isEnabled("style") \|\| !_settings->inconclusive)`
`265`	`265`	`return;`
`266`	`266`
`267`	`267`	`const SymbolDatabase* const symbolDatabase = _tokenizer->getSymbolDatabase();`