From a80975497968e69b23f56bf15d346c65bec381f2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Jan 2009 17:39:01 +0100 Subject: extensions: use UINT_MAX constants over open-coded bits (1/2) ~0 depends on the sizeof(int), so it is better to use UINT32_MAX. Signed-off-by: Jan Engelhardt --- extensions/libxt_mark.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extensions/libxt_mark.c') diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index 811cc77e..5a95d519 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -29,16 +29,16 @@ static int mark_mt_parse(int c, char **argv, int invert, unsigned int *flags, const void *entry, struct xt_entry_match **match) { struct xt_mark_mtinfo1 *info = (void *)(*match)->data; - unsigned int mark, mask = ~0U; + unsigned int mark, mask = UINT32_MAX; char *end; switch (c) { case '1': /* --mark */ param_act(P_ONLY_ONCE, "mark", "--mark", *flags & F_MARK); - if (!strtonum(optarg, &end, &mark, 0, ~0U)) + if (!strtonum(optarg, &end, &mark, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "mark", "--mark", optarg); if (*end == '/') - if (!strtonum(end + 1, &end, &mask, 0, ~0U)) + if (!strtonum(end + 1, &end, &mask, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "mark", "--mark", optarg); if (*end != '\0') param_act(P_BAD_VALUE, "mark", "--mark", optarg); -- 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/libxt_mark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extensions/libxt_mark.c') diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index 5a95d519..31957e7d 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -35,10 +35,10 @@ static int mark_mt_parse(int c, char **argv, int invert, unsigned int *flags, switch (c) { case '1': /* --mark */ param_act(P_ONLY_ONCE, "mark", "--mark", *flags & F_MARK); - if (!strtonum(optarg, &end, &mark, 0, UINT32_MAX)) + if (!xtables_strtoui(optarg, &end, &mark, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "mark", "--mark", optarg); if (*end == '/') - if (!strtonum(end + 1, &end, &mask, 0, UINT32_MAX)) + if (!xtables_strtoui(end + 1, &end, &mask, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "mark", "--mark", optarg); if (*end != '\0') param_act(P_BAD_VALUE, "mark", "--mark", optarg); -- cgit v1.2.3 From a41545ca7cde43e0ba53260ba74bd9bf74025a68 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Jan 2009 21:27:19 +0100 Subject: libxtables: prefix/order - param_act Changes: exittype -> xtables_exittype P_* -> XTF_* flags Signed-off-by: Jan Engelhardt --- extensions/libxt_mark.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'extensions/libxt_mark.c') diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index 31957e7d..08bc9d95 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -34,14 +34,14 @@ static int mark_mt_parse(int c, char **argv, int invert, unsigned int *flags, switch (c) { case '1': /* --mark */ - param_act(P_ONLY_ONCE, "mark", "--mark", *flags & F_MARK); + xtables_param_act(XTF_ONLY_ONCE, "mark", "--mark", *flags & F_MARK); if (!xtables_strtoui(optarg, &end, &mark, 0, UINT32_MAX)) - param_act(P_BAD_VALUE, "mark", "--mark", optarg); + xtables_param_act(XTF_BAD_VALUE, "mark", "--mark", optarg); if (*end == '/') if (!xtables_strtoui(end + 1, &end, &mask, 0, UINT32_MAX)) - param_act(P_BAD_VALUE, "mark", "--mark", optarg); + xtables_param_act(XTF_BAD_VALUE, "mark", "--mark", optarg); if (*end != '\0') - param_act(P_BAD_VALUE, "mark", "--mark", optarg); + xtables_param_act(XTF_BAD_VALUE, "mark", "--mark", optarg); if (invert) info->invert = true; -- 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/libxt_mark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/libxt_mark.c') diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index 08bc9d95..1143ba98 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -62,7 +62,7 @@ mark_parse(int c, char **argv, int invert, unsigned int *flags, switch (c) { char *end; case '1': - check_inverse(optarg, &invert, &optind, 0); + xtables_check_inverse(optarg, &invert, &optind, 0); markinfo->mark = strtoul(optarg, &end, 0); if (*end == '/') { markinfo->mask = strtoul(end+1, &end, 0); -- cgit v1.2.3