From 3ca74b36f558ce3373234d951571b831595e60e7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 5 Jul 2005 06:32:54 +0000 Subject: [PATCH] Adjust to the change to DECIMAL_DIGIT_ACCUMULATE: its last arg is now a type, not a value. --- src/cut.c | 2 +- src/expand.c | 2 +- src/split.c | 2 +- src/unexpand.c | 4 ++-- src/uniq.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cut.c b/src/cut.c index 454d40d23e..aab1f8e9f4 100644 --- a/src/cut.c +++ b/src/cut.c @@ -455,7 +455,7 @@ set_fields (const char *fieldstr) in_digits = true; /* Detect overflow. */ - if (!DECIMAL_DIGIT_ACCUMULATE (value, *fieldstr - '0', SIZE_MAX)) + if (!DECIMAL_DIGIT_ACCUMULATE (value, *fieldstr - '0', size_t)) { /* In case the user specified -c4294967296,22, complain only about the first number. */ diff --git a/src/expand.c b/src/expand.c index 0ccb908e74..8428d3216e 100644 --- a/src/expand.c +++ b/src/expand.c @@ -172,7 +172,7 @@ parse_tab_stops (char const *stops) num_start = stops; } - if (!DECIMAL_DIGIT_ACCUMULATE (tabval, *stops - '0', UINTMAX_MAX)) + if (!DECIMAL_DIGIT_ACCUMULATE (tabval, *stops - '0', uintmax_t)) { size_t len = strspn (num_start, "0123456789"); char *bad_num = xstrndup (num_start, len); diff --git a/src/split.c b/src/split.c index 12a1fb67f0..a93fdffed1 100644 --- a/src/split.c +++ b/src/split.c @@ -481,7 +481,7 @@ main (int argc, char **argv) if (digits_optind != 0 && digits_optind != this_optind) n_units = 0; /* More than one number given; ignore other. */ digits_optind = this_optind; - if (!DECIMAL_DIGIT_ACCUMULATE (n_units, c - '0', UINTMAX_MAX)) + if (!DECIMAL_DIGIT_ACCUMULATE (n_units, c - '0', uintmax_t)) { char buffer[INT_BUFSIZE_BOUND (uintmax_t)]; error (EXIT_FAILURE, 0, diff --git a/src/unexpand.c b/src/unexpand.c index 9f06588f22..e347d654c0 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -192,7 +192,7 @@ parse_tab_stops (char const *stops) } { /* Detect overflow. */ - if (!DECIMAL_DIGIT_ACCUMULATE (tabval, *stops - '0', UINTMAX_MAX)) + if (!DECIMAL_DIGIT_ACCUMULATE (tabval, *stops - '0', uintmax_t)) { size_t len = strspn (num_start, "0123456789"); char *bad_num = xstrndup (num_start, len); @@ -512,7 +512,7 @@ main (int argc, char **argv) tabval = 0; have_tabval = true; } - if (!DECIMAL_DIGIT_ACCUMULATE (tabval, c - '0', UINTMAX_MAX)) + if (!DECIMAL_DIGIT_ACCUMULATE (tabval, c - '0', uintmax_t)) error (EXIT_FAILURE, 0, _("tab stop value is too large")); break; } diff --git a/src/uniq.c b/src/uniq.c index 5f0ea74f9e..057270145c 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -471,7 +471,7 @@ main (int argc, char **argv) if (skip_field_option_type == SFO_NEW) skip_fields = 0; - if (!DECIMAL_DIGIT_ACCUMULATE (skip_fields, optc - '0', SIZE_MAX)) + if (!DECIMAL_DIGIT_ACCUMULATE (skip_fields, optc - '0', size_t)) error (EXIT_FAILURE, 0, "%s", _("invalid number of fields to skip")); skip_field_option_type = SFO_OBSOLETE; -- 2.47.3