fixed -Wextra-semi-stmt Clang warnings (cppcheck-opensource#2553)

firewave · web-flow · commit 1af959af2cf4 · 2020-04-21T17:27:51.000+02:00
* fixed -Wextra-semi-stmt Clang warnings

* adjusted REDIRECT macro to require a semicolon

* testmathlib.cpp: rolled back accidental change
diff --git a/cmake/compileroptions.cmake b/cmake/compileroptions.cmake
@@ -69,6 +69,8 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wno-multichar")
    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wno-sign-compare")
    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wno-unused-function")
+   # TODO: enable this warning - was added in Clang 8
+   #set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wextra-semi-stmt")
 
    if(ENABLE_COVERAGE OR ENABLE_COVERAGE_XML)
       MESSAGE(FATAL_ERROR "Not use clang for generate code coverage. Use gcc. ")
diff --git a/externals/tinyxml/CMakeLists.txt b/externals/tinyxml/CMakeLists.txt
@@ -2,11 +2,15 @@ file(GLOB hdrs "*.h")
 file(GLOB srcs "*.cpp")
 
 add_library(tinyxml_objs OBJECT ${srcs} ${hdrs})
+# TODO: needs to be fixed upstream
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    # TODO: needs to be fixed upstream
     target_compile_options(tinyxml_objs PRIVATE -Wno-suggest-attribute=format)
+    # TODO: enable this - was added in Clang 8
+    #target_compile_options(tinyxml_objs PRIVATE -Wno-extra-semi-stmt)
 endif()
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_library(tinyxml_objs_sanitized OBJECT EXCLUDE_FROM_ALL ${srcs} ${hdrs})
     target_compile_options(tinyxml_objs_sanitized PRIVATE -fsanitize=address)
+    # TODO: enable this - was added in Clang 8
+    #target_compile_options(tinyxml_objs_sanitized PRIVATE -Wno-extra-semi-stmt)
 endif()
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
@@ -29,6 +29,11 @@ if (BUILD_GUI)
         target_compile_definitions (cppcheck-gui PRIVATE HAVE_QCHART )
         target_link_libraries(cppcheck-gui Qt5::Charts)
     endif()
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        # TODO: enable this - was added in Clang 8
+        # Q_UNUSED() in generated code
+        #target_compile_options(cppcheck-gui PRIVATE -Wno-extra-semi-stmt)
+    endif()
 
     install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
     install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -565,7 +565,7 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
         return minsize.value <= bufferSize;
     case Library::ArgumentChecks::MinSize::Type::NONE:
         break;
-    };
+    }
     return true;
 }
 
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -945,7 +945,7 @@ static inline T getvalue(const int test, const T value1, const T value2)
         return value2;
     case 5:
         return std::numeric_limits<T>::max();
-    };
+    }
     return 0;
 }
 
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -104,7 +104,7 @@ void VarInfo::print()
         default:
             status = "?";
             break;
-        };
+        }
 
         std::cout << "status=" << status << " "
                   << "alloctype='" << it->second.type << "' "
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -287,7 +287,7 @@ static bool isOperatorFunction(const std::string & funcName)
     };
 
 
-    return std::find(additionalOperators.begin(), additionalOperators.end(), funcName.substr(operatorPrefix.length())) != additionalOperators.end();;
+    return std::find(additionalOperators.begin(), additionalOperators.end(), funcName.substr(operatorPrefix.length())) != additionalOperators.end();
 }
 
 
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -1160,7 +1160,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                     case ValueType::Type::LONGDOUBLE:
                         check = true;
                         break;
-                    };
+                    }
                     if (!check)
                         continue;
                 }
@@ -1220,7 +1220,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                         break;
                     case Library::TypeCheck::suppress:
                         continue;
-                    };
+                    }
                 }
             }
 
diff --git a/lib/ctu.cpp b/lib/ctu.cpp
@@ -504,7 +504,7 @@ static bool findPath(const std::string &callId,
                 if (unsafeValue < 0 || unsafeValue >= functionCall->callArgValue)
                     break;
                 continue;
-            };
+            }
             path[index] = functionCall;
             return true;
         }
diff --git a/lib/exprengine.cpp b/lib/exprengine.cpp
@@ -1025,7 +1025,7 @@ static int getIntBitsFromValueType(const ValueType *vt, const cppcheck::Platform
         return platform.long_long_bit;
     default:
         return 0;
-    };
+    }
 }
 
 static ExprEngine::ValuePtr getValueRangeFromValueType(const std::string &name, const ValueType *vt, const cppcheck::Platform &platform)
@@ -2041,7 +2041,7 @@ void ExprEngine::runChecks(ErrorLogger *errorLogger, const Tokenizer *tokenizer,
                 err |= value.isEqual(dataBase, MathLib::toLongNumber(invalidArgValue.op2));
                 bad = "range " + invalidArgValue.op1 + "-" + invalidArgValue.op2;
                 break;
-            };
+            }
 
             if (err) {
                 dataBase->addError(tok->linenr());
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -616,7 +616,7 @@ static bool hasErrors(const simplecpp::OutputList &outputList)
         case simplecpp::Output::MISSING_HEADER:
         case simplecpp::Output::PORTABILITY_BACKSLASH:
             break;
-        };
+        }
     }
     return false;
 }
@@ -638,7 +638,7 @@ void Preprocessor::handleErrors(const simplecpp::OutputList& outputList, bool th
             case simplecpp::Output::MISSING_HEADER:
             case simplecpp::Output::PORTABILITY_BACKSLASH:
                 break;
-            };
+            }
         }
     }
 }
@@ -780,7 +780,7 @@ void Preprocessor::reportOutput(const simplecpp::OutputList &outputList, bool sh
         case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
             error(emptyString, 0, out.msg);
             break;
-        };
+        }
     }
 }
 
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -1511,7 +1511,7 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
                     break;
                 default:
                     break;
-                };
+                }
 
                 if (bits > 0 && bits <= 62) {
                     if (dimension.tok->valueType()->sign == ValueType::Sign::UNSIGNED)
@@ -6213,7 +6213,7 @@ std::string ValueType::dump() const
     case LONGDOUBLE:
         ret << "valueType-type=\"long double\"";
         break;
-    };
+    }
 
     switch (sign) {
     case Sign::UNKNOWN_SIGN:
@@ -6224,7 +6224,7 @@ std::string ValueType::dump() const
     case Sign::UNSIGNED:
         ret << " valueType-sign=\"unsigned\"";
         break;
-    };
+    }
 
     if (bits > 0)
         ret << " valueType-bits=\"" << bits << '\"';
@@ -6275,7 +6275,7 @@ MathLib::bigint ValueType::typeSize(const cppcheck::Platform &platform, bool p)
         return platform.sizeof_long_double;
     default:
         break;
-    };
+    }
 
     // Unknown invalid size
     return 0;
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -2275,7 +2275,7 @@ bool TemplateSimplifier::simplifyNumericCalculations(Token *tok, bool isTemplate
             case '^':
                 tok->str((v1 ^ v2).str());
                 break;
-            };
+            }
         }
 
         // Logical operations
diff --git a/lib/token.h b/lib/token.h
@@ -1038,7 +1038,7 @@ class CPPCHECKLIB Token {
         const auto it = std::find_if(mImpl->mValues->begin(), mImpl->mValues->end(), [=](const ValueFlow::Value& value) {
             return value.isIntValue() && !value.isImpossible() && value.intvalue == val;
         });
-        return it == mImpl->mValues->end() ? nullptr : &*it;;
+        return it == mImpl->mValues->end() ? nullptr : &*it;
     }
 
     const ValueFlow::Value * getMaxValue(bool condition) const {
@@ -1064,7 +1064,7 @@ class CPPCHECKLIB Token {
             return value.isMovedValue() && !value.isImpossible() &&
                    value.moveKind != ValueFlow::Value::MoveKind::NonMovedVariable;
         });
-        return it == mImpl->mValues->end() ? nullptr : &*it;;
+        return it == mImpl->mValues->end() ? nullptr : &*it;
     }
 
     const ValueFlow::Value * getValueLE(const MathLib::bigint val, const Settings *settings) const;
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -3010,7 +3010,7 @@ static bool setVarIdParseDeclaration(const Token **tok, const std::map<std::stri
                 typeCount = 0;
                 singleNameCount = 0;
             } else if (tok2->str() == "const") {
-                ;  // just skip "const"
+                // just skip "const"
             } else if (!hasstruct && variableId.find(tok2->str()) != variableId.end() && tok2->previous()->str() != "::") {
                 ++typeCount;
                 tok2 = tok2->next();
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -5494,7 +5494,7 @@ static bool isContainerSizeChanged(nonneg int varId, const Token *start, const T
             case Library::Container::Action::FIND:
             case Library::Container::Action::CHANGE_CONTENT:
                 break;
-            };
+            }
         }
         if (isContainerSizeChangedByFunction(tok, depth))
             return true;
@@ -5791,7 +5791,7 @@ static void valueFlowDynamicBufferSize(TokenList *tokenlist, SymbolDatabase *sym
                         sizeValue = Token::getStrLength(value.tokvalue) + 1; // Add one for the null terminator
                 }
                 break;
-            };
+            }
             if (sizeValue < 0)
                 continue;
 
@@ -5841,7 +5841,7 @@ static bool getMinMaxValues(const ValueType *vt, const cppcheck::Platform &platf
         break;
     default:
         return false;
-    };
+    }
 
     if (bits == 1) {
         *minValue = 0;
@@ -6056,7 +6056,7 @@ std::string ValueFlow::Value::infoString() const
         return "size=" + MathLib::toString(intvalue);
     case LIFETIME:
         return "lifetime=" + tokvalue->str();
-    };
+    }
     throw InternalError(nullptr, "Invalid ValueFlow Value type");
 }
 
diff --git a/test/redirect.h b/test/redirect.h
@@ -81,7 +81,7 @@ class RedirectOutputError {
     std::streambuf *_oldCerr;
 };
 
-#define REDIRECT RedirectOutputError redir;
+#define REDIRECT RedirectOutputError redir; do {} while(false)
 #define GET_REDIRECT_OUTPUT redir.getOutput()
 #define CLEAR_REDIRECT_OUTPUT redir.clearOutput()
 #define GET_REDIRECT_ERROUT redir.getErrout()
diff --git a/test/testboost.cpp b/test/testboost.cpp
@@ -35,7 +35,7 @@ class TestBoost : public TestFixture {
         settings.addEnabled("style");
         settings.addEnabled("performance");
 
-        TEST_CASE(BoostForeachContainerModification)
+        TEST_CASE(BoostForeachContainerModification);
     }
 
     void check(const char code[]) {
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -899,7 +899,8 @@ class TestClangImport: public TestFixture {
     std::istringstream istr(clang); \
     clangimport::parseClangAstDump(&tokenizer, istr); \
     const SymbolDatabase *db = tokenizer.getSymbolDatabase(); \
-    ASSERT(db);
+    ASSERT(db); \
+    do {} while(false)
 
     void symbolDatabaseEnum1() {
         const char clang[] = "|-NamespaceDecl 0x29ad5f8 <1.cpp:1:1, line:3:1> line:1:11 ns\n"
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -339,7 +339,7 @@ class TestCmdlineParser : public TestFixture {
     void defines2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D_WIN32", "-DNODEBUG", "file.cpp"};
-        settings.userDefines.clear();;
+        settings.userDefines.clear();
         ASSERT(defParser.parseFromArgs(4, argv));
         ASSERT_EQUALS("_WIN32=1;NODEBUG=1", settings.userDefines);
     }
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
@@ -34,13 +34,13 @@ class TestInternal : public TestFixture {
     void run() OVERRIDE {
         settings.addEnabled("internal");
 
-        TEST_CASE(simplePatternInTokenMatch)
-        TEST_CASE(complexPatternInTokenSimpleMatch)
-        TEST_CASE(simplePatternSquareBrackets)
-        TEST_CASE(simplePatternAlternatives)
-        TEST_CASE(missingPercentCharacter)
-        TEST_CASE(unknownPattern)
-        TEST_CASE(redundantNextPrevious)
+        TEST_CASE(simplePatternInTokenMatch);
+        TEST_CASE(complexPatternInTokenSimpleMatch);
+        TEST_CASE(simplePatternSquareBrackets);
+        TEST_CASE(simplePatternAlternatives);
+        TEST_CASE(missingPercentCharacter);
+        TEST_CASE(unknownPattern);
+        TEST_CASE(redundantNextPrevious);
         TEST_CASE(internalError);
         TEST_CASE(orInComplexPattern);
         TEST_CASE(extraWhitespace);
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
@@ -42,12 +42,12 @@ class TestMathLib : public TestFixture {
         TEST_CASE(ispositive);
         TEST_CASE(isFloat);
         TEST_CASE(isDecimalFloat);
-        TEST_CASE(isGreater)
-        TEST_CASE(isGreaterEqual)
-        TEST_CASE(isEqual)
-        TEST_CASE(isNotEqual)
-        TEST_CASE(isLess)
-        TEST_CASE(isLessEqual)
+        TEST_CASE(isGreater);
+        TEST_CASE(isGreaterEqual);
+        TEST_CASE(isEqual);
+        TEST_CASE(isNotEqual);
+        TEST_CASE(isLess);
+        TEST_CASE(isLessEqual);
         TEST_CASE(calculate);
         TEST_CASE(calculate1);
         TEST_CASE(typesuffix);
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -179,13 +179,13 @@ class TestSimplifyTokens : public TestFixture {
         TEST_CASE(strcat1);
         TEST_CASE(strcat2);
 
-        TEST_CASE(simplifyAtol)
+        TEST_CASE(simplifyAtol);
 
         TEST_CASE(simplifyOperator1);
         TEST_CASE(simplifyOperator2);
 
-        TEST_CASE(simplifyArrayAccessSyntax)
-        TEST_CASE(simplify_numeric_condition)
+        TEST_CASE(simplifyArrayAccessSyntax);
+        TEST_CASE(simplify_numeric_condition);
         TEST_CASE(simplify_condition);
 
         TEST_CASE(pointeralias1);
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -42,12 +42,12 @@ class TestSimplifyTypedef : public TestFixture {
         settings0.addEnabled("style");
         settings2.addEnabled("style");
 
-        TEST_CASE(simplifyTypedef1)
-        TEST_CASE(simplifyTypedef2)
-        TEST_CASE(simplifyTypedef3)
-        TEST_CASE(simplifyTypedef4)
-        TEST_CASE(simplifyTypedef5)
-        TEST_CASE(simplifyTypedef6)
+        TEST_CASE(simplifyTypedef1);
+        TEST_CASE(simplifyTypedef2);
+        TEST_CASE(simplifyTypedef3);
+        TEST_CASE(simplifyTypedef4);
+        TEST_CASE(simplifyTypedef5);
+        TEST_CASE(simplifyTypedef6);
         TEST_CASE(simplifyTypedef7);
         TEST_CASE(simplifyTypedef8);
         TEST_CASE(simplifyTypedef9);
diff --git a/test/testsuite.h b/test/testsuite.h
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
diff --git a/tools/triage/CMakeLists.txt b/tools/triage/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi`
`565`	`565`	`return minsize.value <= bufferSize;`
`566`	`566`	`case Library::ArgumentChecks::MinSize::Type::NONE:`
`567`	`567`	`break;`
`568`		`- };`
	`568`	`+ }`
`569`	`569`	`return true;`
`570`	`570`	`}`
`571`	`571`
Original file line number	Diff line number	Diff line change
`@@ -945,7 +945,7 @@ static inline T getvalue(const int test, const T value1, const T value2)`
`945`	`945`	`return value2;`
`946`	`946`	`case 5:`
`947`	`947`	`return std::numeric_limits<T>::max();`
`948`		`- };`
	`948`	`+ }`
`949`	`949`	`return 0;`
`950`	`950`	`}`
`951`	`951`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ static bool isOperatorFunction(const std::string & funcName)`
`287`	`287`	`};`
`288`	`288`
`289`	`289`
`290`		`- return std::find(additionalOperators.begin(), additionalOperators.end(), funcName.substr(operatorPrefix.length())) != additionalOperators.end();;`
	`290`	`+ return std::find(additionalOperators.begin(), additionalOperators.end(), funcName.substr(operatorPrefix.length())) != additionalOperators.end();`
`291`	`291`	`}`
`292`	`292`
`293`	`293`
Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()`
`1160`	`1160`	`case ValueType::Type::LONGDOUBLE:`
`1161`	`1161`	`check = true;`
`1162`	`1162`	`break;`
`1163`		`- };`
	`1163`	`+ }`
`1164`	`1164`	`if (!check)`
`1165`	`1165`	`continue;`
`1166`	`1166`	`}`
`@@ -1220,7 +1220,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()`
`1220`	`1220`	`break;`
`1221`	`1221`	`case Library::TypeCheck::suppress:`
`1222`	`1222`	`continue;`
`1223`		`- };`
	`1223`	`+ }`
`1224`	`1224`	`}`
`1225`	`1225`	`}`
`1226`	`1226`
Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ static bool findPath(const std::string &callId,`
`504`	`504`	`if (unsafeValue < 0 \|\| unsafeValue >= functionCall->callArgValue)`
`505`	`505`	`break;`
`506`	`506`	`continue;`
`507`		`- };`
	`507`	`+ }`
`508`	`508`	`path[index] = functionCall;`
`509`	`509`	`return true;`
`510`	`510`	`}`