Merge pull request #1251 from dforsi/fix/cppcheck

Fix/cppcheck

.gitignore

@@ -8,6 +8,8 @@
 *.lo
 *.la
 *.orig
+*.sh.log
+*.sh.trs
 *.swp
 $depbase.Tpo
 Makefile

cppcheck.sh

@@ -21,13 +21,7 @@ SUPPRESS="\
 --suppress=*:extra/gnuradio/ssb.h \
 --suppress=*:extra/gnuradio/wfm.h \
 --suppress=*:extra/gnuradio/wfm.h \
---suppress=*:extra/gnuradio/HrAGC.h \
---suppress=knownConditionTrueFalse:tests/rotctl.c \
---suppress=knownConditionTrueFalse:tests/rigctl.c \
---suppress=knownConditionTrueFalse:tests/ampctl.c \
---suppress=knownConditionTrueFalse:tests/rotctl_parse.c \
---suppress=knownConditionTrueFalse:tests/rigctl_parse.c \
---suppress=knownConditionTrueFalse:tests/ampctl_parse.c"
+--suppress=*:extra/gnuradio/HrAGC.h
 
 #CHECK="\
 #-D RIG_LEVEL_LINEOUT=1 \
@@ -82,8 +76,9 @@ if test $# -eq 0 ; then
         cppcheck --inline-suppr \
                  -I src \
                  -I include \
-                 --include=include/hamlib/config.h \
-                 --include=include/hamlib/rig.h \
+                 -I include/hamlib/ \
+                 -I lib \
+                 -I security \
                  -q \
                  --force \
                  --enable=all \
@@ -93,17 +88,17 @@ if test $# -eq 0 ; then
                  . \
                  >cppcheck.log 2>&1
 else
-        cppcheck --check-config \
-                 --inline-suppr \
+        cppcheck --inline-suppr \
                  -I src \
                  -I include \
-                 --include=include/config.h \
-                 --include=include/hamlib/rig.h \
+                 -I include/hamlib/ \
+                 -I lib \
+                 -I security \
                  -q \
                  --force \
                  --enable=all \
                  --std=c99 \
                  $SUPPRESS \
                  $CHECK \
-                 $1
+                 "$@"
 fi

tests/rigctld.c

@@ -1230,9 +1230,9 @@ void *handle_socket(void *arg)
 
     mutex_rigctld(0);
 #else
-    mutext_rigctld(1);
+    mutex_rigctld(1);
     retcode = rig_open(my_rig);
-    mutext_rigctld(1);
+    mutex_rigctld(1);
 
     if (RIG_OK == retcode && verbose > RIG_DEBUG_ERR)
     {

tests/rigctltcp.c

@@ -1214,9 +1214,9 @@ void *handle_socket(void *arg)
 
     mutex_rigctld(0);
 #else
-    mutext_rigctld(1);
+    mutex_rigctld(1);
     retcode = rig_open(my_rig);
-    mutext_rigctld(1);
+    mutex_rigctld(1);
 
     if (RIG_OK == retcode && verbose > RIG_DEBUG_ERR)
     {

tests/rigtestlibusb.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include "config.h"
 #if defined(HAVE_LIBUSB_H)
-#include "libusb.h"
+#include <libusb.h>
 #elif defined(HAVE_LIBUSB_1_0_LIBUSB_H)
 #include <libusb-1.0/libusb.h>
 #endif