test/cfg/runtests.sh: extracted cppcheck invocation into function

Author: firewave

test/cfg/runtests.sh

@@ -71,6 +71,10 @@ function cxx_syntax {
     ${CXX} "${CXX_OPT[@]}" "$@"
 }
 
+function cppcheck_run {
+    "${CPPCHECK}" "${CPPCHECK_OPT[@]}" "$@"
+}
+
 # posix.c
 function posix_fn {
     echo "POSIX assumed to be present, checking syntax with ${CC} now."
@@ -480,109 +484,109 @@ function check_file {
     case $f in
         boost.cpp)
             boost_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         bsd.c)
             bsd_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         cairo.c)
             cairo_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         cppunit.cpp)
             cppunit_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         emscripten.cpp)
             emscripten_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         gnu.c)
             gnu_fn
             # TODO: posix needs to specified first or it has a different mmap() config
             # TODO: get rid of posix dependency
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library=posix,"$lib" "${DIR}"gnu.c
+            cppcheck_run --library=posix,"$lib" "${DIR}"gnu.c
             ;;
         googletest.cpp)
             googletest_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         gtk.c)
             gtk_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         kde.cpp)
             # TODO: "kde-4config" is no longer commonly available in recent distros
             #kde_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" --library=qt "${DIR}""$f"
+           cppcheck_run --library="$lib" --library=qt "${DIR}""$f"
             ;;
         libcurl.c)
             libcurl_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         libsigc++.cpp)
             libsigcpp_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         lua.c)
             lua_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         mfc.cpp)
             mfc_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --platform=win64 --library="$lib" "${DIR}""$f"
+            cppcheck_run --platform=win64 --library="$lib" "${DIR}""$f"
             ;;
         opencv2.cpp)
             # TODO: "opencv.pc" is not commonly available in distros
             #opencv2_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         openmp.c)
             openmp_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         openssl.c)
             openssl_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         posix.c)
             posix_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         python.c)
             python_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         qt.cpp)
             qt_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         selinux.c)
             selinux_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         sqlite3.c)
             sqlite3_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         std.c)
             std_c_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" "${DIR}""$f"
+            cppcheck_run "${DIR}""$f"
             ;;
         std.cpp)
             std_cpp_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" "${DIR}""$f"
+            cppcheck_run "${DIR}""$f"
             ;;
         windows.cpp)
             windows_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --platform=win32A --library="$lib" "${DIR}""$f"
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --platform=win32W --library="$lib" "${DIR}""$f"
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --platform=win64  --library="$lib" "${DIR}""$f"
+            cppcheck_run --platform=win32A --library="$lib" "${DIR}""$f"
+            cppcheck_run --platform=win32W --library="$lib" "${DIR}""$f"
+            cppcheck_run --platform=win64  --library="$lib" "${DIR}""$f"
             ;;
         wxwidgets.cpp)
             wxwidgets_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         *)
           echo "Unhandled file $f"