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 --- extensions/libip6t_dst.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'extensions/libip6t_dst.c') diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c index e19abc4b..a47e3a35 100644 --- a/extensions/libip6t_dst.c +++ b/extensions/libip6t_dst.c @@ -37,16 +37,16 @@ parse_opts_num(const char *idstr, const char *typestr) id = strtoul(idstr, &ep, 0); if ( idstr == ep ) { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "dst: no valid digits in %s `%s'", typestr, idstr); } if ( id == ULONG_MAX && errno == ERANGE ) { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "%s `%s' specified too big: would overflow", typestr, idstr); } if ( *idstr != '\0' && *ep != '\0' ) { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "dst: error parsing %s `%s'", typestr, idstr); } return id; @@ -60,7 +60,7 @@ parse_options(const char *optsstr, u_int16_t *opts) buffer = strdup(optsstr); if (!buffer) - exit_error(OTHER_PROBLEM, "strdup failed"); + xtables_error(OTHER_PROBLEM, "strdup failed"); for (cp = buffer, i = 0; cp && i < IP6T_OPTS_OPTSNR; cp = next, i++) { @@ -73,7 +73,7 @@ parse_options(const char *optsstr, u_int16_t *opts) if (range) { if (i == IP6T_OPTS_OPTSNR-1) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "too many ports specified"); *range++ = '\0'; } @@ -81,7 +81,7 @@ parse_options(const char *optsstr, u_int16_t *opts) opts[i] = (parse_opts_num(cp, "opt") & 0xFF) << 8; if (range) { if (opts[i] == 0) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "PAD0 hasn't got length"); opts[i] |= parse_opts_num(range, "length") & 0xFF; } else @@ -94,7 +94,7 @@ parse_options(const char *optsstr, u_int16_t *opts) } if (cp) - exit_error(PARAMETER_PROBLEM, "too many addresses specified"); + xtables_error(PARAMETER_PROBLEM, "too many addresses specified"); free(buffer); @@ -123,7 +123,7 @@ static int dst_parse(int c, char **argv, int invert, unsigned int *flags, switch (c) { case '1': if (*flags & IP6T_OPTS_LEN) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "Only one `--dst-len' allowed"); xtables_check_inverse(optarg, &invert, &optind, 0); optinfo->hdrlen = parse_opts_num(argv[optind-1], "length"); @@ -134,11 +134,11 @@ static int dst_parse(int c, char **argv, int invert, unsigned int *flags, break; case '2': if (*flags & IP6T_OPTS_OPTS) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "Only one `--dst-opts' allowed"); xtables_check_inverse(optarg, &invert, &optind, 0); if (invert) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, " '!' not allowed with `--dst-opts'"); optinfo->optsnr = parse_options(argv[optind-1], optinfo->opts); optinfo->flags |= IP6T_OPTS_OPTS; @@ -146,10 +146,10 @@ static int dst_parse(int c, char **argv, int invert, unsigned int *flags, break; case '3': if (*flags & IP6T_OPTS_NSTRICT) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "Only one `--dst-not-strict' allowed"); if ( !(*flags & IP6T_OPTS_OPTS) ) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "`--dst-opts ...' required before " "`--dst-not-strict'"); optinfo->flags |= IP6T_OPTS_NSTRICT; -- cgit v1.2.3