From d07e1654a2f19e9fca1a7d2b2b935a7a669a2b39 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Sun, 22 Mar 2020 01:39:29 +0000 Subject: [PATCH] [mod_verto] Fix scan-build warnings in swig and enable scan-build on Drone --- .drone.yml | 3 +-- src/mod/endpoints/mod_verto/mcast/MCAST.i | 10 ++++++++++ src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp | 9 +++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 65b7222787..fd0d063ec3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -88,7 +88,6 @@ steps: - sed -i '/mod_rtmp/s/^/#/g' modules.conf - sed -i '/mod_skinny/s/^/#/g' modules.conf - sed -i '/mod_unimrcp/s/^/#/g' modules.conf - - sed -i '/mod_verto/s/^/#/g' modules.conf - sed -i '/mod_xml_rpc/s/^/#/g' modules.conf - ./configure - mkdir -p scan-build @@ -121,6 +120,6 @@ trigger: --- kind: signature -hmac: affb0747b0f16d9673cbbb327451c99fefc9dee2fd30b34b220bf147ad96a7be +hmac: cddd8905a309e3deb7e5859b11aa1ec3593410d9f32ce2f5de3a3557af88f80f ... diff --git a/src/mod/endpoints/mod_verto/mcast/MCAST.i b/src/mod/endpoints/mod_verto/mcast/MCAST.i index 097a52bc77..f8215233ff 100644 --- a/src/mod/endpoints/mod_verto/mcast/MCAST.i +++ b/src/mod/endpoints/mod_verto/mcast/MCAST.i @@ -1,3 +1,13 @@ +%begin %{ +#ifdef __clang_analyzer__ +#include +static int mystrcmp (const char *a, const char *b) { + return a == b ? 0 : !a ? -1 : !b ? 1 : strcmp(a, b); +} +#define strcmp mystrcmp +#endif +%} + %{ #include "mcast.h" #include "mcast_cpp.h" diff --git a/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp b/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp index a210df4c2b..5473788de7 100644 --- a/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp +++ b/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp @@ -8,6 +8,15 @@ * interface file instead. * ----------------------------------------------------------------------------- */ +#ifdef __clang_analyzer__ +#include +static int mystrcmp (const char *a, const char *b) { + return a == b ? 0 : !a ? -1 : !b ? 1 : strcmp(a, b); +} +#define strcmp mystrcmp +#endif + + #ifndef SWIGPERL #define SWIGPERL