From 1829ed482efbc8b390cc760d012b3a4450494e1a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 21 Feb 2009 03:29:44 +0100 Subject: libxtables: prefix exit_error to xtables_error Signed-off-by: Jan Engelhardt --- iptables-restore.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'iptables-restore.c') diff --git a/iptables-restore.c b/iptables-restore.c index c8eb2e30..f1c5e3ea 100644 --- a/iptables-restore.c +++ b/iptables-restore.c @@ -71,7 +71,7 @@ static struct iptc_handle *create_handle(const char *tablename) } if (!handle) { - exit_error(PARAMETER_PROBLEM, "%s: unable to initialize " + xtables_error(PARAMETER_PROBLEM, "%s: unable to initialize " "table '%s'\n", prog_name, tablename); exit(1); } @@ -217,7 +217,7 @@ main(int argc, char *argv[]) table = strtok(buffer+1, " \t\n"); DEBUGP("line %u, table '%s'\n", line, table); if (!table) { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "%s: line %u table name invalid\n", prog_name, line); exit(1); @@ -253,7 +253,7 @@ main(int argc, char *argv[]) chain = strtok(buffer+1, " \t\n"); DEBUGP("line %u, chain '%s'\n", line, chain); if (!chain) { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "%s: line %u chain name invalid\n", prog_name, line); exit(1); @@ -263,14 +263,14 @@ main(int argc, char *argv[]) if (noflush && iptc_is_chain(chain, handle)) { DEBUGP("Flushing existing user defined chain '%s'\n", chain); if (!iptc_flush_entries(chain, handle)) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "error flushing chain " "'%s':%s\n", chain, strerror(errno)); } else { DEBUGP("Creating new chain '%s'\n", chain); if (!iptc_create_chain(chain, handle)) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "error creating chain " "'%s':%s\n", chain, strerror(errno)); @@ -280,7 +280,7 @@ main(int argc, char *argv[]) policy = strtok(NULL, " \t\n"); DEBUGP("line %u, policy '%s'\n", line, policy); if (!policy) { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "%s: line %u policy invalid\n", prog_name, line); exit(1); @@ -294,7 +294,7 @@ main(int argc, char *argv[]) ctrs = strtok(NULL, " \t\n"); if (!ctrs || !parse_counters(ctrs, &count)) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "invalid policy counters " "for chain '%s'\n", chain); @@ -308,7 +308,7 @@ main(int argc, char *argv[]) if (!iptc_set_policy(chain, policy, &count, handle)) - exit_error(OTHER_PROBLEM, + xtables_error(OTHER_PROBLEM, "Can't set policy `%s'" " on `%s' line %u: %s\n", chain, policy, line, @@ -336,19 +336,19 @@ main(int argc, char *argv[]) /* we have counters in our input */ ptr = strchr(buffer, ']'); if (!ptr) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "Bad line %u: need ]\n", line); pcnt = strtok(buffer+1, ":"); if (!pcnt) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "Bad line %u: need :\n", line); bcnt = strtok(NULL, "]"); if (!bcnt) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "Bad line %u: need ]\n", line); @@ -415,7 +415,7 @@ main(int argc, char *argv[]) /* check if table name specified */ if (!strncmp(param_buffer, "-t", 2) || !strncmp(param_buffer, "--table", 8)) { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "Line %u seems to have a " "-t table option.\n", line); exit(1); @@ -428,7 +428,7 @@ main(int argc, char *argv[]) param_buffer[param_len++] = *curchar; if (param_len >= sizeof(param_buffer)) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "Parameter too long!"); } } -- cgit v1.2.3