/iptables-2.6/913-dead-code.patch
Patch | 112 lines | 101 code | 11 blank | 0 comment | 0 complexity | a6b6a041af18fc179f830f8b0268c02e MD5 | raw file
Possible License(s): GPL-2.0
- From 7d91a2accc92d13bb32bf881831e9c9a8b4d7734
- From: Jan Engelhardt <jengelh@medozas.de>
- Date: Mon, 30 May 2011 01:39:54 +0200
- Subject: [PATCH] build: remove dead code parts
- gcc-4.6 has a new warning, -Wunused-but-set-variable, which flags
- no-op code.
- CC libiptc/libip4tc.lo
- In file included from libiptc/libip4tc.c:118:0:
- libiptc/libiptc.c: In function "iptcc_chain_index_delete_chain":
- libiptc/libiptc.c:611:32: warning: variable "index_ptr2" set but not used
- libiptc/libiptc.c: In function "alloc_handle":
- libiptc/libiptc.c:1282:9: warning: variable "len" set but not used
- CC libiptc/libip6tc.lo
- In file included from libiptc/libip6tc.c:113:0:
- libiptc/libiptc.c: In function "iptcc_chain_index_delete_chain":
- libiptc/libiptc.c:611:32: warning: variable "index_ptr2" set but not used
- libiptc/libiptc.c: In function "alloc_handle":
- libiptc/libiptc.c:1282:9: warning: variable "len" set but not used
- CC xtables_multi-iptables-xml.o
- iptables-xml.c: In function "do_rule_part":
- iptables-xml.c:376:8: warning: variable "thisChain" set but not used
- CC xtables_multi-ip6tables.o
- ip6tables.c: In function "print_firewall":
- ip6tables.c:552:10: warning: variable "flags" set but not used
- Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
- ---
- ip6tables.c | 2 --
- iptables-xml.c | 3 ---
- libiptc/libiptc.c | 7 ++-----
- 3 files changed, 2 insertions(+), 10 deletions(-)
- diff --git a/ip6tables.c b/ip6tables.c
- index a74238c..4df73b8 100644
- --- a/ip6tables.c
- +++ b/ip6tables.c
- @@ -549,7 +549,6 @@ print_firewall(const struct ip6t_entry *fw,
- {
- struct xtables_target *target = NULL;
- const struct ip6t_entry_target *t;
- - u_int8_t flags;
- char buf[BUFSIZ];
-
- if (!ip6tc_is_chain(targname, handle))
- @@ -559,7 +558,6 @@ print_firewall(const struct ip6t_entry *fw,
- XTF_LOAD_MUST_SUCCEED);
-
- t = ip6t_get_target((struct ip6t_entry *)fw);
- - flags = fw->ipv6.flags;
-
- if (format & FMT_LINENUMBERS)
- printf(FMT("%-4u ", "%u "), num);
- diff --git a/iptables-xml.c b/iptables-xml.c
- index dc3cd4f..aa98f75 100644
- --- a/iptables-xml.c
- +++ b/iptables-xml.c
- @@ -373,7 +373,6 @@ do_rule_part(char *leveltag1, char *leveltag2, int part, int argc,
- {
- int arg = 1; // ignore leading -A
- char invert_next = 0;
- - char *thisChain = NULL;
- char *spacer = ""; // space when needed to assemble arguments
- char *level1 = NULL;
- char *level2 = NULL;
- @@ -397,8 +396,6 @@ do_rule_part(char *leveltag1, char *leveltag2, int part, int argc,
- } else printf("%s<%s ", (leveli ## LEVEL), (level ## LEVEL)); \
- } while(0)
-
- - thisChain = argv[arg++];
- -
- if (part == 1) { /* skip */
- /* use argvattr to tell which arguments were quoted
- to avoid comparing quoted arguments, like comments, to -j, */
- diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c
- index d3b1c51..0b6d5e3 100644
- --- a/libiptc/libiptc.c
- +++ b/libiptc/libiptc.c
- @@ -608,7 +608,7 @@ static int iptcc_chain_index_rebuild(struct xtc_handle *h)
- */
- static int iptcc_chain_index_delete_chain(struct chain_head *c, struct xtc_handle *h)
- {
- - struct list_head *index_ptr, *index_ptr2, *next;
- + struct list_head *index_ptr, *next;
- struct chain_head *c2;
- unsigned int idx, idx2;
-
- @@ -628,7 +628,7 @@ static int iptcc_chain_index_delete_chain(struct chain_head *c, struct xtc_handl
- * is located in the same index bucket.
- */
- c2 = list_entry(next, struct chain_head, list);
- - index_ptr2 = iptcc_bsearch_chain_index(c2->name, &idx2, h);
- + iptcc_bsearch_chain_index(c2->name, &idx2, h);
- if (idx != idx2) {
- /* Rebuild needed */
- return iptcc_chain_index_rebuild(h);
- @@ -1279,11 +1279,8 @@ static int iptcc_compile_table(struct xtc_handle *h, STRUCT_REPLACE *repl)
- static struct xtc_handle *
- alloc_handle(const char *tablename, unsigned int size, unsigned int num_rules)
- {
- - size_t len;
- struct xtc_handle *h;
-
- - len = sizeof(STRUCT_TC_HANDLE) + size;
- -
- h = malloc(sizeof(STRUCT_TC_HANDLE));
- if (!h) {
- errno = ENOMEM;
- --
- 1.7.2.5