From 7d91a2accc92d13bb32bf881831e9c9a8b4d7734 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 30 May 2011 01:39:54 +0200 Subject: 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 --- libiptc/libiptc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libiptc') diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c index d3b1c517..0b6d5e3a 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; -- cgit v1.2.3