From 0b7a140944738d67b9c4e6f09992c8407eefb18a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 24 May 2011 02:30:23 +0200 Subject: libxtables: use uintmax for xtables_strtoul Addendum to 2305d5fb42fc059f38fc1bdf53411dbeecdb310b. I noticed that unsigned long long is not consistently used, for example, min/max are still just unsigned long, and strtoul is being called. Instead of changing it to unsigned long long, just use uintmax functions right away so this does not need size-related changing in the future. Cc: JP Abgrall Signed-off-by: Jan Engelhardt --- xtoptions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xtoptions.c') diff --git a/xtoptions.c b/xtoptions.c index 9884b7df..e9736a44 100644 --- a/xtoptions.c +++ b/xtoptions.c @@ -104,8 +104,8 @@ xtables_options_xfrm(struct option *orig_opts, struct option *oldopts, static void xtopt_parse_int(struct xt_option_call *cb) { const struct xt_option_entry *entry = cb->entry; - unsigned long long lmin = 0, lmax = UINT32_MAX; - unsigned long long value; + uintmax_t lmin = 0, lmax = UINT32_MAX; + uintmax_t value; if (entry->type == XTTYPE_UINT8) lmax = UINT8_MAX; @@ -121,7 +121,7 @@ static void xtopt_parse_int(struct xt_option_call *cb) if (!xtables_strtoul(cb->arg, NULL, &value, lmin, lmax)) xt_params->exit_err(PARAMETER_PROBLEM, "%s: bad value for option \"--%s\", " - "or out of range (%llu-%llu).\n", + "or out of range (%ju-%ju).\n", cb->ext_name, entry->name, lmin, lmax); if (entry->type == XTTYPE_UINT8) { -- cgit v1.2.3