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_CONNMARK.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'extensions/libxt_CONNMARK.c') diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c index d5d963d4..f979f282 100644 --- a/extensions/libxt_CONNMARK.c +++ b/extensions/libxt_CONNMARK.c @@ -159,10 +159,10 @@ static int connmark_tg_parse(int c, char **argv, int invert, case '=': /* --set-xmark */ case '-': /* --set-mark */ param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); - if (!strtonum(optarg, &end, &value, 0, UINT32_MAX)) + if (!xtables_strtoui(optarg, &end, &value, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "CONNMARK", "--set-xmark/--set-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, "CONNMARK", "--set-xmark/--set-mark", optarg); if (*end != '\0') param_act(P_BAD_VALUE, "CONNMARK", "--set-xmark/--set-mark", optarg); @@ -176,7 +176,7 @@ static int connmark_tg_parse(int c, char **argv, int invert, case '&': /* --and-mark */ param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); - if (!strtonum(optarg, NULL, &mask, 0, UINT32_MAX)) + if (!xtables_strtoui(optarg, NULL, &mask, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "CONNMARK", "--and-mark", optarg); info->mode = XT_CONNMARK_SET; info->ctmark = 0; @@ -186,7 +186,7 @@ static int connmark_tg_parse(int c, char **argv, int invert, case '|': /* --or-mark */ param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); - if (!strtonum(optarg, NULL, &value, 0, UINT32_MAX)) + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "CONNMARK", "--or-mark", optarg); info->mode = XT_CONNMARK_SET; info->ctmark = value; @@ -196,7 +196,7 @@ static int connmark_tg_parse(int c, char **argv, int invert, case '^': /* --xor-mark */ param_act(P_ONE_ACTION, "CONNMARK", *flags & F_MARK); - if (!strtonum(optarg, NULL, &value, 0, UINT32_MAX)) + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "CONNMARK", "--xor-mark", optarg); info->mode = XT_CONNMARK_SET; info->ctmark = value; @@ -221,7 +221,7 @@ static int connmark_tg_parse(int c, char **argv, int invert, exit_error(PARAMETER_PROBLEM, "CONNMARK: --save-mark " "or --restore-mark is required for " "--nfmask"); - if (!strtonum(optarg, NULL, &value, 0, UINT32_MAX)) + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "CONNMARK", "--nfmask", optarg); info->nfmask = value; return true; @@ -231,7 +231,7 @@ static int connmark_tg_parse(int c, char **argv, int invert, exit_error(PARAMETER_PROBLEM, "CONNMARK: --save-mark " "or --restore-mark is required for " "--ctmask"); - if (!strtonum(optarg, NULL, &value, 0, UINT32_MAX)) + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "CONNMARK", "--ctmask", optarg); info->ctmask = value; return true; @@ -241,7 +241,7 @@ static int connmark_tg_parse(int c, char **argv, int invert, exit_error(PARAMETER_PROBLEM, "CONNMARK: --save-mark " "or --restore-mark is required for " "--mask"); - if (!strtonum(optarg, NULL, &value, 0, UINT32_MAX)) + if (!xtables_strtoui(optarg, NULL, &value, 0, UINT32_MAX)) param_act(P_BAD_VALUE, "CONNMARK", "--mask", optarg); info->nfmask = info->ctmask = value; return true; -- cgit v1.2.3