Bump cppcheck to v2.11

This fixes the following errors:-

sesman/tools/authtest.c:64:14: error: syntax error [syntaxError]
    g_printf("xrdp auth module tester v" PACKAGE_VERSION "\n");
             ^
sesman/tools/sesrun.c:165:14: error: syntax error [syntaxError]
    g_printf("xrdp session starter v" PACKAGE_VERSION "\n");
             ^
vrplayer/decoder.h:35:12: error: There is an unknown macro here somewhere. Configuration is required. If slots is a macro then please configure it. [unknownMacro]
    public slots:
           ^
vrplayer/playaudio.h:45:12: error: There is an unknown macro here somewhere. Configuration is required. If slots is a macro then please configure it. [unknownMacro]
    public slots:
           ^
vrplayer/dlgabout.h:22:13: error: There is an unknown macro here somewhere. Configuration is required. If slots is a macro then please configure it. [unknownMacro]
    private slots:
            ^
vrplayer/playvideo.h:49:12: error: There is an unknown macro here somewhere. Configuration is required. If slots is a macro then please configure it. [unknownMacro]
    public slots:
           ^
Additionally, cppcheck now makes use of all available CPUs
This commit is contained in:
matt335672 2023-06-23 14:56:41 +01:00
parent 14b224f7ae
commit d77b0b3b9d
9 changed files with 23 additions and 7 deletions

View File

@ -165,7 +165,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')

@ -1 +1 @@
Subproject commit 30f6ce185c84edc6350bce0d6eae1a16edd2b1a3
Subproject commit 25f6128026bddf7d3588f5f5466603c87ac6c0b3

View File

@ -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 -i third_party"
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

View File

@ -35,6 +35,11 @@
#include "os_calls.h"
#include "string_calls.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

View File

@ -42,6 +42,11 @@
#include "tools_common.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

View File

@ -32,7 +32,7 @@ class Decoder : public QObject
signals:
public slots:
public slots: // cppcheck-suppress unknownMacro
void onGeometryChanged(QRect *geometry);
};

View File

@ -19,7 +19,7 @@ class DlgAbout : public QDialog
private:
Ui::DlgAbout *ui;
private slots:
private slots: // cppcheck-suppress unknownMacro
void onOk();
};

View File

@ -42,7 +42,7 @@ class PlayAudio : public QObject
void setVcrOp(int op);
public slots:
public slots: // cppcheck-suppress unknownMacro
void play();
private:

View File

@ -46,7 +46,7 @@ class PlayVideo : public QObject
//void setVcrOp(int op);
//void onMediaRestarted();
public slots:
public slots: // cppcheck-suppress unknownMacro
void play();
//signals: