iptables trivial compile warning cleanup (Phil Oester <kernel@linuxace.com>)

Cleanup a few compile warnings in latest snapshot:

extensions/libipt_dscp_helper.c:69: warning: 'dscp_to_name' defined but not used
extensions/libipt_sctp.c: In function 'print_chunks':
extensions/libipt_sctp.c:465: warning: value computed is not used
extensions/libipt_sctp.c:477: warning: value computed is not used

Resolves bug #457.

diff --git a/extensions/libipt_dscp_helper.c b/extensions/libipt_dscp_helper.c
index 0279670b1f19180bd1649c4258acf7a22b79bdeb..31adb6cd632c8425c41cb1dd619402b6e057b165 100644 (file)
--- a/extensions/libipt_dscp_helper.c
+++ b/extensions/libipt_dscp_helper.c
@@ -63,7 +63,7 @@ class_to_dscp(const char *name)
 }
 
 
-
+#if 0
 static const char *
 dscp_to_name(unsigned int dscp)
 {
@@ -78,5 +78,5 @@ dscp_to_name(unsigned int dscp)
        exit_error(PARAMETER_PROBLEM,
                        "Invalid DSCP value `%d'\n", dscp);
 }
-
+#endif
 

diff --git a/extensions/libipt_sctp.c b/extensions/libipt_sctp.c
index 18fe6adce63406f4151b8280924f85cf593ef0fe..2d060af9586e17bb863bf7facff2188bdad6dd1d 100644 (file)
--- a/extensions/libipt_sctp.c
+++ b/extensions/libipt_sctp.c
@@ -462,7 +462,8 @@ print_chunks(u_int32_t chunk_match_type,
        flag = 0;
        for (i = 0; i < 256; i++) {
                if (SCTP_CHUNKMAP_IS_SET(chunkmap, i)) {
-                       flag && printf(",");
+                       if (flag)
+                               printf(",");
                        flag = 1;
                        print_chunk(i, numeric);
                        for (j = 0; j < flag_count; j++) {
@@ -474,7 +475,8 @@ print_chunks(u_int32_t chunk_match_type,
                }
        }
 
-       flag && printf(" ");
+       if (flag)
+               printf(" ");
 out:
        return;
 }