From e917bca09924435f3fca23c01042543b1826c81e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Jan 2009 18:14:21 +0100 Subject: extensions: use UINT_MAX constants over open-coded numbers (2/2) Use the handy constants for ranges. Signed-off-by: Jan Engelhardt --- extensions/libip6t_mh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/libip6t_mh.c') diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c index e76d7c36..8b58bcdf 100644 --- a/extensions/libip6t_mh.c +++ b/extensions/libip6t_mh.c @@ -93,7 +93,7 @@ static unsigned int name_to_type(const char *name) } else { unsigned int number; - if (string_to_number(name, 0, 255, &number) == -1) + if (string_to_number(name, 0, UINT8_MAX, &number) == -1) exit_error(PARAMETER_PROBLEM, "Invalid MH type `%s'\n", name); return number; -- cgit v1.2.3 From 5f2922cfc0bbfbeb878f5c12e9fb3eb602ae5507 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Jan 2009 18:43:01 +0100 Subject: libxtables: prefix/order - strtoui This commit also throws out the redundant string_to_number_*. Signed-off-by: Jan Engelhardt --- extensions/libip6t_mh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/libip6t_mh.c') diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c index 8b58bcdf..f8c4e247 100644 --- a/extensions/libip6t_mh.c +++ b/extensions/libip6t_mh.c @@ -93,7 +93,7 @@ static unsigned int name_to_type(const char *name) } else { unsigned int number; - if (string_to_number(name, 0, UINT8_MAX, &number) == -1) + if (!xtables_strtoui(name, NULL, &number, 0, UINT8_MAX)) exit_error(PARAMETER_PROBLEM, "Invalid MH type `%s'\n", name); return number; -- cgit v1.2.3 From 0f16c725aadaac7e670d632ecbaea3661ff00827 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 30 Jan 2009 04:55:38 +0100 Subject: libxtables: prefix/order - move check_inverse to xtables.c This also adds a warning that intrapositional negation support is deprecated. Signed-off-by: Jan Engelhardt --- extensions/libip6t_mh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/libip6t_mh.c') diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c index f8c4e247..78fc804a 100644 --- a/extensions/libip6t_mh.c +++ b/extensions/libip6t_mh.c @@ -134,7 +134,7 @@ static int mh_parse(int c, char **argv, int invert, unsigned int *flags, if (*flags & MH_TYPES) exit_error(PARAMETER_PROBLEM, "Only one `--mh-type' allowed"); - check_inverse(optarg, &invert, &optind, 0); + xtables_check_inverse(optarg, &invert, &optind, 0); parse_mh_types(argv[optind-1], mhinfo->types); if (invert) mhinfo->invflags |= IP6T_MH_INV_TYPE; -- cgit v1.2.3