diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2009-02-21 03:29:44 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2009-02-21 03:29:44 +0100 |
| commit | 1829ed482efbc8b390cc760d012b3a4450494e1a (patch) | |
| tree | cfdd4aa54cee9dc7e8eda8f755f3cf2ab8e1e880 /extensions/libip6t_hbh.c | |
| parent | bddcb92d1f0f76d21c4469b1667c8199c9fab126 (diff) | |
libxtables: prefix exit_error to xtables_error
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions/libip6t_hbh.c')
| -rw-r--r-- | extensions/libip6t_hbh.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c index 3354eae4..e08d84a2 100644 --- a/extensions/libip6t_hbh.c +++ b/extensions/libip6t_hbh.c @@ -40,16 +40,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, "hbh: 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, "hbh: error parsing %s `%s'", typestr, idstr); } return id; @@ -62,7 +62,7 @@ parse_options(const char *optsstr, u_int16_t *opts) unsigned int i; buffer = strdup(optsstr); - if (!buffer) exit_error(OTHER_PROBLEM, "strdup failed"); + if (!buffer) xtables_error(OTHER_PROBLEM, "strdup failed"); for (cp=buffer, i=0; cp && i<IP6T_OPTS_OPTSNR; cp=next,i++) { @@ -71,14 +71,14 @@ parse_options(const char *optsstr, u_int16_t *opts) range = strchr(cp, ':'); if (range) { if (i == IP6T_OPTS_OPTSNR-1) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "too many ports specified"); *range++ = '\0'; } opts[i] = (parse_opts_num(cp, "opt") & 0xFF) << 8; if (range) { if (opts[i] == 0) - exit_error(PARAMETER_PROBLEM, "PAD0 hasn't got length"); + xtables_error(PARAMETER_PROBLEM, "PAD0 has not got length"); opts[i] |= parse_opts_num(range, "length") & 0xFF; } else { opts[i] |= (0x00FF); @@ -89,7 +89,7 @@ parse_options(const char *optsstr, u_int16_t *opts) printf("opts opt: %04X\n", opts[i]); #endif } - if (cp) exit_error(PARAMETER_PROBLEM, "too many addresses specified"); + if (cp) xtables_error(PARAMETER_PROBLEM, "too many addresses specified"); free(buffer); @@ -118,7 +118,7 @@ static int hbh_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 `--hbh-len' allowed"); xtables_check_inverse(optarg, &invert, &optind, 0); optinfo->hdrlen = parse_opts_num(argv[optind-1], "length"); @@ -129,11 +129,11 @@ static int hbh_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 `--hbh-opts' allowed"); xtables_check_inverse(optarg, &invert, &optind, 0); if (invert) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, " '!' not allowed with `--hbh-opts'"); optinfo->optsnr = parse_options(argv[optind-1], optinfo->opts); optinfo->flags |= IP6T_OPTS_OPTS; @@ -141,10 +141,10 @@ static int hbh_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 `--hbh-not-strict' allowed"); if ( !(*flags & IP6T_OPTS_OPTS) ) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "`--hbh-opts ...' required before `--hbh-not-strict'"); optinfo->flags |= IP6T_OPTS_NSTRICT; *flags |= IP6T_OPTS_NSTRICT; |