From c8b43c537ad8efe6f0d8de62bc4114c328185f16 Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Thu, 22 Sep 2011 15:39:20 +0300 Subject: [PATCH] tools: Added helper function to remove table entry in iptables-test --- tools/iptables-test.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/iptables-test.c b/tools/iptables-test.c index 555aa2a..5e7c866 100644 --- a/tools/iptables-test.c +++ b/tools/iptables-test.c @@ -327,6 +327,22 @@ static int connman_add_entry(struct connman_iptables *table, return 0; } +static int remove_table_entry(struct connman_iptables *table, + struct connman_iptables_entry *entry) +{ + int removed = 0; + + table->num_entries--; + table->size -= entry->entry->next_offset; + removed = entry->entry->next_offset; + + g_free(entry->entry); + + table->entries = g_list_remove(table->entries, entry); + + return removed; +} + static int connman_iptables_flush_chain(struct connman_iptables *table, char *name) { @@ -357,11 +373,7 @@ static int connman_iptables_flush_chain(struct connman_iptables *table, entry = list->data; next = g_list_next(list); - table->num_entries--; - table->size -= entry->entry->next_offset; - removed += entry->entry->next_offset; - - table->entries = g_list_remove(table->entries, list->data); + removed += remove_table_entry(table, entry); list = next; } -- 2.7.4