Add -Wcomma and fix the single place it complains about

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05ecb4d58b1c5d9f4b93c05f32fd64ed2a7634e6..ba2244ec9f8a62e06e5cae2ba744da7b5f7c356f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1670,6 +1670,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.devel OR EXISTS ${CMAKE_BINARY_DIR}/.devel)
         check_and_add_compiler_option(-Wdeclaration-after-statement)
         check_and_add_compiler_option(-Wused-but-marked-unused)
         check_and_add_compiler_option(-Wdocumentation)
+        check_and_add_compiler_option(-Wcomma)
     endif()
 endif()
 

diff --git a/aclocal.m4 b/aclocal.m4
index 6e64d2347038a06763f612cda22bedf3653f7e6d..788b20a85bc7fa278f2c2eac0270790025c34fe6 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -848,6 +848,7 @@ AC_DEFUN(AC_LBL_DEVEL,
                    AC_LBL_CHECK_COMPILER_OPT($1, -Wdeclaration-after-statement)
                    AC_LBL_CHECK_COMPILER_OPT($1, -Wused-but-marked-unused)
                    AC_LBL_CHECK_COMPILER_OPT($1, -Wdocumentation)
+                   AC_LBL_CHECK_COMPILER_OPT($1, -Wcomma)
            fi
            AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT()
            #

diff --git a/configure b/configure
index 60cbdacb2cc6197c7336a5c0cf02658f50a0c304..e60d7f5ad556b4b8b06a68b864de06236a58d29e 100755 (executable)
--- a/configure
+++ b/configure
@@ -8733,6 +8733,49 @@ else
 $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 -Wcomma option" >&5
+$as_echo_n "checking whether the compiler supports the -Wcomma option... " >&6; }
+       save_CFLAGS="$CFLAGS"
+       if expr "x-Wcomma" : "x-W.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wcomma"
+       elif expr "x-Wcomma" : "x-f.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS -Werror -Wcomma"
+       elif expr "x-Wcomma" : "x-m.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS -Werror -Wcomma"
+       else
+           CFLAGS="$CFLAGS -Wcomma"
+       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 -Wcomma"
+
+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
 

diff --git a/gencode.c b/gencode.c
index 5d0f95a2eb4bdf0f2138b698fda011ac86cd566c..5846c4f9999722f34be5daa84b096fe9dc2a6e8e 100644 (file)
--- a/gencode.c
+++ b/gencode.c
@@ -574,7 +574,8 @@ newchunk(compiler_state_t *cstate, size_t n)
 
        cp = &cstate->chunks[cstate->cur_chunk];
        if (n > cp->n_left) {
-               ++cp, k = ++cstate->cur_chunk;
+               ++cp;
+               k = ++cstate->cur_chunk;
                if (k >= NCHUNKS)
                        bpf_error(cstate, "out of memory");
                size = CHUNK0SIZE << k;