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:
parent
14b224f7ae
commit
d77b0b3b9d
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -165,7 +165,7 @@ jobs:
|
|||||||
CC: gcc
|
CC: gcc
|
||||||
# This is required to use a version of cppcheck other than that
|
# This is required to use a version of cppcheck other than that
|
||||||
# supplied with the operating system
|
# supplied with the operating system
|
||||||
CPPCHECK_VER: "2.10"
|
CPPCHECK_VER: "2.11"
|
||||||
CPPCHECK_REPO: https://github.com/danmar/cppcheck.git
|
CPPCHECK_REPO: https://github.com/danmar/cppcheck.git
|
||||||
steps:
|
steps:
|
||||||
# Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')
|
# Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 30f6ce185c84edc6350bce0d6eae1a16edd2b1a3
|
Subproject commit 25f6128026bddf7d3588f5f5466603c87ac6c0b3
|
@ -45,10 +45,16 @@ if [ -z "$CPPCHECK_FLAGS" ]; then
|
|||||||
CPPCHECK_FLAGS="--quiet --force --std=c11 --std=c++11 --inline-suppr \
|
CPPCHECK_FLAGS="--quiet --force --std=c11 --std=c++11 --inline-suppr \
|
||||||
--enable=warning --error-exitcode=1 -i third_party"
|
--enable=warning --error-exitcode=1 -i third_party"
|
||||||
fi
|
fi
|
||||||
|
CPPCHECK_FLAGS="$CPPCHECK_FLAGS -D__cppcheck__"
|
||||||
|
|
||||||
# Any options/directories specified?
|
# Any options/directories specified?
|
||||||
if [ $# -eq 0 ]; then
|
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
|
fi
|
||||||
|
|
||||||
# Display the cppcheck version and command for debugging
|
# Display the cppcheck version and command for debugging
|
||||||
|
@ -35,6 +35,11 @@
|
|||||||
#include "os_calls.h"
|
#include "os_calls.h"
|
||||||
#include "string_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)
|
#if !defined(PACKAGE_VERSION)
|
||||||
#define PACKAGE_VERSION "???"
|
#define PACKAGE_VERSION "???"
|
||||||
#endif
|
#endif
|
||||||
|
@ -42,6 +42,11 @@
|
|||||||
|
|
||||||
#include "tools_common.h"
|
#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)
|
#if !defined(PACKAGE_VERSION)
|
||||||
#define PACKAGE_VERSION "???"
|
#define PACKAGE_VERSION "???"
|
||||||
#endif
|
#endif
|
||||||
|
@ -32,7 +32,7 @@ class Decoder : public QObject
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
|
||||||
public slots:
|
public slots: // cppcheck-suppress unknownMacro
|
||||||
void onGeometryChanged(QRect *geometry);
|
void onGeometryChanged(QRect *geometry);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ class DlgAbout : public QDialog
|
|||||||
private:
|
private:
|
||||||
Ui::DlgAbout *ui;
|
Ui::DlgAbout *ui;
|
||||||
|
|
||||||
private slots:
|
private slots: // cppcheck-suppress unknownMacro
|
||||||
void onOk();
|
void onOk();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ class PlayAudio : public QObject
|
|||||||
|
|
||||||
void setVcrOp(int op);
|
void setVcrOp(int op);
|
||||||
|
|
||||||
public slots:
|
public slots: // cppcheck-suppress unknownMacro
|
||||||
void play();
|
void play();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -46,7 +46,7 @@ class PlayVideo : public QObject
|
|||||||
//void setVcrOp(int op);
|
//void setVcrOp(int op);
|
||||||
//void onMediaRestarted();
|
//void onMediaRestarted();
|
||||||
|
|
||||||
public slots:
|
public slots: // cppcheck-suppress unknownMacro
|
||||||
void play();
|
void play();
|
||||||
|
|
||||||
//signals:
|
//signals:
|
||||||
|
Loading…
Reference in New Issue
Block a user