Enable -Wunused-parameter and fix warnings that are almost trivial.

Signed-off-by: Joerg Mayer <[email protected]>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 754f70d013ce55d84d8de1d41346bfe332fa4b9c..7c2444d6bf493649e5602443ec89fccceb6ee654 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1675,6 +1675,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.devel OR EXISTS ${CMAKE_BINARY_DIR}/.devel)
         # Warns about safeguards added in case the enums are extended
         # check_and_add_compiler_option(-Wcovered-switch-default)
         check_and_add_compiler_option(-Wmissing-variable-declarations)
         # Warns about safeguards added in case the enums are extended
         # check_and_add_compiler_option(-Wcovered-switch-default)
         check_and_add_compiler_option(-Wmissing-variable-declarations)

+       check_and_add_compiler_option(-Wunused-parameter)

     endif()
 endif()
 
     endif()
 endif()
 

diff --git a/aclocal.m4 b/aclocal.m4
index d26ce86273c83ab81f5d65c9a323c6fef339a393..0300cf74240b0c41689f80dbbba95b94f6ee6edf 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -854,6 +854,7 @@ AC_DEFUN(AC_LBL_DEVEL,
                    # extended
                    # AC_LBL_CHECK_COMPILER_OPT($1, -Wcovered-switch-default)
                    AC_LBL_CHECK_COMPILER_OPT($1, -Wmissing-variable-declarations)
                    # extended
                    # AC_LBL_CHECK_COMPILER_OPT($1, -Wcovered-switch-default)
                    AC_LBL_CHECK_COMPILER_OPT($1, -Wmissing-variable-declarations)

+                   AC_LBL_CHECK_COMPILER_OPT($1, -Wunused-parameter)

            fi
            AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT()
            #
            fi
            AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT()
            #

diff --git a/configure b/configure
index 3370a31f4bb1d9ebf5449784d4bb3dcd62f8bb82..93999fb174ae67a90d433e53620c15728f27214d 100755 (executable)
--- a/configure
+++ b/configure
@@ -8825,6 +8825,92 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                    # Warns about safeguards added in case the enums are
                    # extended
                    # AC_LBL_CHECK_COMPILER_OPT(V_CCOPT, -Wcovered-switch-default)
                    # Warns about safeguards added in case the enums are
                    # extended
                    # AC_LBL_CHECK_COMPILER_OPT(V_CCOPT, -Wcovered-switch-default)

+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wmissing-variable-declarations option" >&5
+$as_echo_n "checking whether the compiler supports the -Wmissing-variable-declarations option... " >&6; }
+       save_CFLAGS="$CFLAGS"
+       if expr "x-Wmissing-variable-declarations" : "x-W.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wmissing-variable-declarations"
+       elif expr "x-Wmissing-variable-declarations" : "x-f.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS -Werror -Wmissing-variable-declarations"
+       elif expr "x-Wmissing-variable-declarations" : "x-m.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS -Werror -Wmissing-variable-declarations"
+       else
+           CFLAGS="$CFLAGS -Wmissing-variable-declarations"
+       fi
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+               CFLAGS="$save_CFLAGS"
+               V_CCOPT="$V_CCOPT -Wmissing-variable-declarations"
+
+else
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               CFLAGS="$save_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wunused-parameter option" >&5
+$as_echo_n "checking whether the compiler supports the -Wunused-parameter option... " >&6; }
+       save_CFLAGS="$CFLAGS"
+       if expr "x-Wunused-parameter" : "x-W.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wunused-parameter"
+       elif expr "x-Wunused-parameter" : "x-f.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS -Werror -Wunused-parameter"
+       elif expr "x-Wunused-parameter" : "x-m.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS -Werror -Wunused-parameter"
+       else
+           CFLAGS="$CFLAGS -Wunused-parameter"
+       fi
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+               CFLAGS="$save_CFLAGS"
+               V_CCOPT="$V_CCOPT -Wunused-parameter"
+
+else
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               CFLAGS="$save_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+

            fi
 
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports generating dependencies" >&5
            fi
 
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports generating dependencies" >&5

diff --git a/diag-control.h b/diag-control.h
index 761d3cfda96b0f1ed0d7436773bf8c6e391a022b..6abd53e52dd542b384075466e924d3580d753d49 100644 (file)
--- a/diag-control.h
+++ b/diag-control.h
@@ -78,7 +78,8 @@
       PCAP_DO_PRAGMA(clang diagnostic push) \
       PCAP_DO_PRAGMA(clang diagnostic ignored "-Wsign-compare") \
       PCAP_DO_PRAGMA(clang diagnostic ignored "-Wdocumentation") \
       PCAP_DO_PRAGMA(clang diagnostic push) \
       PCAP_DO_PRAGMA(clang diagnostic ignored "-Wsign-compare") \
       PCAP_DO_PRAGMA(clang diagnostic ignored "-Wdocumentation") \

-      PCAP_DO_PRAGMA(clang diagnostic ignored "-Wmissing-noreturn")
+      PCAP_DO_PRAGMA(clang diagnostic ignored "-Wmissing-noreturn") \
+      PCAP_DO_PRAGMA(clang diagnostic ignored "-Wunused-parameter")

     #define DIAG_ON_FLEX \
       PCAP_DO_PRAGMA(clang diagnostic pop)
   #elif PCAP_IS_AT_LEAST_GNUC_VERSION(4,6)
     #define DIAG_ON_FLEX \
       PCAP_DO_PRAGMA(clang diagnostic pop)
   #elif PCAP_IS_AT_LEAST_GNUC_VERSION(4,6)

diff --git a/rpcapd/rpcapd.c b/rpcapd/rpcapd.c
index 21217c8b09aef68a5770cf620e78b758e54e0884..cdd747544f2072af20bd5a707cf7ab4be15d41a0 100755 (executable)
--- a/rpcapd/rpcapd.c
+++ b/rpcapd/rpcapd.c
@@ -44,6 +44,7 @@
 
 #include "fmtutils.h"
 #include "sockutils.h"         // for socket calls
 
 #include "fmtutils.h"
 #include "sockutils.h"         // for socket calls

+#include "varattrs.h"          // for _U_

 #include "portability.h"
 #include "rpcapd.h"
 #include "config_params.h"     // configuration file parameters
 #include "portability.h"
 #include "rpcapd.h"
 #include "config_params.h"     // configuration file parameters


@@ -691,7 +692,7 @@ static BOOL WINAPI main_ctrl_event(DWORD ctrltype)
        return TRUE;
 }
 #else
        return TRUE;
 }
 #else

-static void main_terminate(int sign)
+static void main_terminate(int sign _U_)

 {
        //
        // Note that the server should shut down.
 {
        //
        // Note that the server should shut down.


@@ -701,7 +702,7 @@ static void main_terminate(int sign)
        shutdown_server = 1;
 }
 
        shutdown_server = 1;
 }
 

-static void main_reread_config(int sign)
+static void main_reread_config(int sign _U_)

 {
        //
        // Note that the server should re-read its configuration file.
 {
        //
        // Note that the server should re-read its configuration file.


@@ -711,7 +712,7 @@ static void main_reread_config(int sign)
        reread_config = 1;
 }
 
        reread_config = 1;
 }
 

-static void main_reap_children(int sign)
+static void main_reap_children(int sign _U_)

 {
        pid_t pid;
        int exitstat;
 {
        pid_t pid;
        int exitstat;