1
0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-20 10:51:48 +02:00

Adjust to the change to DECIMAL_DIGIT_ACCUMULATE: its last arg is now

a type, not a value.
This commit is contained in:
Paul Eggert
2005-07-05 06:32:54 +00:00
parent 413a45b973
commit 3ca74b36f5
5 changed files with 6 additions and 6 deletions

View File

@@ -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. */

View File

@@ -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);

View File

@@ -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,

View File

@@ -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;
}

View File

@@ -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;