Merge pull request #2738 from matt335672/v0_9_bump_cppcheck_to_2_11

[V0.9] bump cppcheck to 2 11
neutrinolabs · Jun 23, 2023 · 0110096 · 0110096
2 parents 27ea401 + 946f86f
commit 0110096
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -127,7 +127,7 @@ jobs:
       CC: gcc
       # This is required to use a version of cppcheck other than that
       # supplied with the operating system
-      CPPCHECK_VER: "2.10"
+      CPPCHECK_VER: "2.11"
       CPPCHECK_REPO: https://github.com/danmar/cppcheck.git
     steps:
       # Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')

diff --git a/librfxcodec b/librfxcodec
diff --git a/scripts/install_cppcheck.sh b/scripts/install_cppcheck.sh
@@ -140,6 +140,14 @@ fi
             fi
     esac
 
+    # Use all available CPUs
+    if [ -f /proc/cpuinfo ]; then
+        cpus=`grep ^processor /proc/cpuinfo | wc -l`
+        if [ -n "$cpus" ]; then
+            make_args="$make_args -j $cpus"
+        fi
+    fi
+
     echo "Making cppcheck..."
     # CFGDIR is needed for cppcheck before 1.86
     call_make $make_args

diff --git a/scripts/run_cppcheck.sh b/scripts/run_cppcheck.sh
@@ -45,10 +45,16 @@ if [ -z "$CPPCHECK_FLAGS" ]; then
     CPPCHECK_FLAGS="--quiet --force --std=c11 --std=c++11 --inline-suppr \
                     --enable=warning --error-exitcode=1"
 fi
+CPPCHECK_FLAGS="$CPPCHECK_FLAGS -D__cppcheck__"
 
 # Any options/directories specified?
 if [ $# -eq 0 ]; then
-    set -- -j 2 .
+    if [ -f /proc/cpuinfo ]; then
+        cpus=$(grep '^processor' /proc/cpuinfo | wc -l)
+    else
+        cpus=2
+    fi
+    set -- -j $cpus .
 fi
 
 # Display the cppcheck version and command for debugging

diff --git a/sesman/tools/sesrun.c b/sesman/tools/sesrun.c
@@ -42,6 +42,11 @@
 
 #include "libscp_connection.h"
 
+// cppcheck doesn't always set this macro to something in double-quotes
+#if defined(__cppcheck__)
+#undef PACKAGE_VERSION
+#endif
+
 #if !defined(PACKAGE_VERSION)
 #define PACKAGE_VERSION "???"
 #endif

diff --git a/sesman/verify_user_pam_userpass.c b/sesman/verify_user_pam_userpass.c
@@ -42,7 +42,7 @@ int
 auth_userpass(const char *user, const char *pass, int *errorcode)
 {
     pam_handle_t *pamh;
-    pam_userpass_t userpass;
+    pam_userpass_t userpass = NULL;
     struct pam_conv conv = {pam_userpass_conv, &userpass};
     const void *template1;
     int status;

diff --git a/vrplayer/decoder.h b/vrplayer/decoder.h
@@ -32,7 +32,7 @@ class Decoder : public QObject
 
     signals:
 
-    public slots:
+    public slots: // cppcheck-suppress unknownMacro
         void onGeometryChanged(QRect *geometry);
 };
 

diff --git a/vrplayer/dlgabout.h b/vrplayer/dlgabout.h
@@ -19,7 +19,7 @@ class DlgAbout : public QDialog
     private:
         Ui::DlgAbout *ui;
 
-    private slots:
+    private slots: // cppcheck-suppress unknownMacro
         void onOk();
 };
 

diff --git a/vrplayer/playaudio.h b/vrplayer/playaudio.h
@@ -42,7 +42,7 @@ class PlayAudio : public QObject
 
         void setVcrOp(int op);
 
-    public slots:
+    public slots: // cppcheck-suppress unknownMacro
         void play();
 
     private:

diff --git a/vrplayer/playvideo.h b/vrplayer/playvideo.h
@@ -46,7 +46,7 @@ class PlayVideo : public QObject
         //void setVcrOp(int op);
         //void onMediaRestarted();
 
-    public slots:
+    public slots: // cppcheck-suppress unknownMacro
         void play();
 
         //signals: