diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-07-05 06:32:54 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-07-05 06:32:54 +0000 |
| commit | 3ca74b36f558ce3373234d951571b831595e60e7 (patch) | |
| tree | a573d234f29e8fabfc558d87f394f896d2f828df | |
| parent | 413a45b973fd56f4e3a551bb6754199e18894d8d (diff) | |
| download | coreutils-3ca74b36f558ce3373234d951571b831595e60e7.tar.xz | |
Adjust to the change to DECIMAL_DIGIT_ACCUMULATE: its last arg is now
a type, not a value.
| -rw-r--r-- | src/cut.c | 2 | ||||
| -rw-r--r-- | src/expand.c | 2 | ||||
| -rw-r--r-- | src/split.c | 2 | ||||
| -rw-r--r-- | src/unexpand.c | 4 | ||||
| -rw-r--r-- | src/uniq.c | 2 |
5 files changed, 6 insertions, 6 deletions
@@ -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 0ccb908e7..8428d3216 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 12a1fb67f..a93fdffed 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 9f06588f2..e347d654c 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 5f0ea74f9..057270145 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; |