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/libxt_u32.c | |
| parent | bddcb92d1f0f76d21c4469b1667c8199c9fab126 (diff) | |
libxtables: prefix exit_error to xtables_error
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions/libxt_u32.c')
| -rw-r--r-- | extensions/libxt_u32.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/extensions/libxt_u32.c b/extensions/libxt_u32.c index f0bb61a3..c2aeb271 100644 --- a/extensions/libxt_u32.c +++ b/extensions/libxt_u32.c @@ -92,10 +92,10 @@ static u_int32_t parse_number(char **s, int pos) errno = 0; number = strtoul(*s, &end, 0); if (end == *s) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %d: expected number", pos); if (errno != 0) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %d: error reading number", pos); *s = end; return number; @@ -129,10 +129,10 @@ static int u32_parse(int c, char **argv, int invert, unsigned int *flags, if (*arg == '\0') { /* end of argument found */ if (state == 0) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: abrupt end of input after location specifier"); if (valind == 0) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: test ended with no value specified"); ct->nnums = locind; @@ -140,7 +140,7 @@ static int u32_parse(int c, char **argv, int invert, unsigned int *flags, data->ntests = ++testind; if (testind > XT_U32_MAXSIZE) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: too many \"&&\"s", (unsigned int)(arg - start)); return 1; @@ -153,7 +153,7 @@ static int u32_parse(int c, char **argv, int invert, unsigned int *flags, */ if (*arg == '=') { if (locind == 0) { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: " "location spec missing", (unsigned int)(arg - start)); @@ -168,18 +168,18 @@ static int u32_parse(int c, char **argv, int invert, unsigned int *flags, ct->location[locind].nextop = XT_U32_AND; } else if (*arg == '<') { if (*++arg != '<') - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: a second '<' was expected", (unsigned int)(arg - start)); ct->location[locind].nextop = XT_U32_LEFTSH; } else if (*arg == '>') { if (*++arg != '>') - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: a second '>' was expected", (unsigned int)(arg - start)); ct->location[locind].nextop = XT_U32_RIGHTSH; } else if (*arg == '@') { ct->location[locind].nextop = XT_U32_AT; } else { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: operator expected", (unsigned int)(arg - start)); } ++arg; @@ -188,7 +188,7 @@ static int u32_parse(int c, char **argv, int invert, unsigned int *flags, ct->location[locind].number = parse_number(&arg, arg - start); if (++locind > XT_U32_MAXSIZE) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: too many operators", (unsigned int)(arg - start)); } } else { @@ -199,17 +199,17 @@ static int u32_parse(int c, char **argv, int invert, unsigned int *flags, */ if (*arg == '&') { if (*++arg != '&') - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: a second '&' was expected", (unsigned int)(arg - start)); if (valind == 0) { - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: value spec missing", (unsigned int)(arg - start)); } else { ct->nnums = locind; ct->nvalues = valind; ct = &data->tests[++testind]; if (testind > XT_U32_MAXSIZE) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: too many \"&&\"s", (unsigned int)(arg - start)); ++arg; state = 0; @@ -219,7 +219,7 @@ static int u32_parse(int c, char **argv, int invert, unsigned int *flags, } else { /* read value range */ if (valind > 0) { /* need , before number */ if (*arg != ',') - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: expected \",\" or \"&&\"", (unsigned int)(arg - start)); ++arg; } @@ -239,7 +239,7 @@ static int u32_parse(int c, char **argv, int invert, unsigned int *flags, } if (++valind > XT_U32_MAXSIZE) - exit_error(PARAMETER_PROBLEM, + xtables_error(PARAMETER_PROBLEM, "u32: at char %u: too many \",\"s", (unsigned int)(arg - start)); } } |