From: "Maciej Żenczykowski" <zenczykowski@gmail.com>
To: "Maciej Żenczykowski" <maze@google.com>
Cc: netfilter-devel@vger.kernel.org, "Maciej Żenczykowski" <maze@google.com>
Subject: [PATCH 13/17] v6: rename delete_chain() to delete_chain6()
Date: Thu, 31 Mar 2011 21:27:29 -0700 [thread overview]
Message-ID: <1301632053-3694-13-git-send-email-zenczykowski@gmail.com> (raw)
In-Reply-To: <AANLkTika7Hgg=AUkkoDE0QroXKnJvA8fr23q-trk8Wbv@mail.gmail.com>
From: Maciej Żenczykowski <maze@google.com>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
include/ip6tables.h | 2 +-
ip6tables-restore.c | 2 +-
ip6tables.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/ip6tables.h b/include/ip6tables.h
index 672faed..48633b7 100644
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -12,7 +12,7 @@ extern int do_command6(int argc, char *argv[], char **table,
extern int for_each_chain6(int (*fn)(const ip6t_chainlabel, int, struct ip6tc_handle *), int verbose, int builtinstoo, struct ip6tc_handle *handle);
extern int flush_entries6(const ip6t_chainlabel chain, int verbose, struct ip6tc_handle *handle);
-extern int delete_chain(const ip6t_chainlabel chain, int verbose, struct ip6tc_handle *handle);
+extern int delete_chain6(const ip6t_chainlabel chain, int verbose, struct ip6tc_handle *handle);
void print_rule(const struct ip6t_entry *e, struct ip6tc_handle *h, const char *chain, int counters);
extern struct xtables_globals ip6tables_globals;
diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index 3b50a54..5531d6e 100644
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -231,7 +231,7 @@ int main(int argc, char *argv[])
DEBUGP("Deleting all user-defined chains "
"of table '%s'\n", table);
- for_each_chain6(delete_chain, verbose, 0,
+ for_each_chain6(delete_chain6, verbose, 0,
handle);
}
diff --git a/ip6tables.c b/ip6tables.c
index abcf0ca..a8ea551 100644
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -919,11 +919,11 @@ zero_entries(const ip6t_chainlabel chain, int verbose,
}
int
-delete_chain(const ip6t_chainlabel chain, int verbose,
+delete_chain6(const ip6t_chainlabel chain, int verbose,
struct ip6tc_handle *handle)
{
if (!chain)
- return for_each_chain6(delete_chain, verbose, 0, handle);
+ return for_each_chain6(delete_chain6, verbose, 0, handle);
if (verbose)
fprintf(stdout, "Deleting chain `%s'\n", chain);
@@ -1978,7 +1978,7 @@ int do_command6(int argc, char *argv[], char **table, struct ip6tc_handle **hand
ret = ip6tc_create_chain(chain, *handle);
break;
case CMD_DELETE_CHAIN:
- ret = delete_chain(chain, cs.options&OPT_VERBOSE, *handle);
+ ret = delete_chain6(chain, cs.options&OPT_VERBOSE, *handle);
break;
case CMD_RENAME_CHAIN:
ret = ip6tc_rename_chain(chain, newname, *handle);
--
1.7.3.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2011-04-01 4:28 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-01 4:24 A small series of iptables userspace cleanups Maciej Żenczykowski
2011-04-01 4:27 ` [PATCH 01/17] man pages: allow underscores in match and target names Maciej Żenczykowski
2011-04-04 13:30 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 02/17] mark newly opened fds as FD_CLOEXEC (close on exec) Maciej Żenczykowski
2011-04-01 9:31 ` Jan Engelhardt
2011-04-01 21:34 ` Maciej Żenczykowski
2011-04-04 12:58 ` Patrick McHardy
2011-04-04 13:00 ` Jan Engelhardt
2011-04-04 13:30 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 03/17] xtables_ip6addr_to_numeric: fix typo in comment Maciej Żenczykowski
2011-04-04 13:31 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 04/17] Delay (statically built) match/target initialization Maciej Żenczykowski
2011-04-04 13:32 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 05/17] v4: rename init_extensions() to init_extensions4() Maciej Żenczykowski
2011-04-01 10:15 ` Jan Engelhardt
2011-04-01 21:38 ` Maciej Żenczykowski
2011-04-04 13:33 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 06/17] v6: rename init_extensions() to init_extensions6() Maciej Żenczykowski
2011-04-04 13:33 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 07/17] xtables.h: init_extensions() no longer exists Maciej Żenczykowski
2011-04-04 13:34 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 08/17] v4: rename for_each_chain() to for_each_chain4() Maciej Żenczykowski
2011-04-04 13:34 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 09/17] v6: rename for_each_chain() to for_each_chain6() Maciej Żenczykowski
2011-04-04 13:35 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 10/17] v4: rename flush_entries() to flush_entries4() Maciej Żenczykowski
2011-04-04 13:35 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 11/17] v6: rename flush_entries() to flush_entries6() Maciej Żenczykowski
2011-04-04 13:36 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 12/17] v4: rename delete_chain() to delete_chain4() Maciej Żenczykowski
2011-04-04 13:36 ` Patrick McHardy
2011-04-01 4:27 ` Maciej Żenczykowski [this message]
2011-04-04 13:37 ` [PATCH 13/17] v6: rename delete_chain() to delete_chain6() Patrick McHardy
2011-04-01 4:27 ` [PATCH 14/17] v4: rename print_rule() to print_rule4() Maciej Żenczykowski
2011-04-04 13:37 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 15/17] v6: rename print_rule() to print_rule6() Maciej Żenczykowski
2011-04-04 13:38 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 16/17] v4: rename do_command() to do_command4() Maciej Żenczykowski
2011-04-04 13:38 ` Patrick McHardy
2011-04-01 4:27 ` [PATCH 17/17] v6: rename do_command() to do_command6() Maciej Żenczykowski
2011-04-04 13:40 ` Patrick McHardy
2011-04-04 19:33 ` Maciej Żenczykowski
2011-04-04 19:48 ` Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1301632053-3694-13-git-send-email-zenczykowski@gmail.com \
--to=zenczykowski@gmail.com \
--cc=maze@google.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).