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

a type, not a value.

diff --git a/src/cut.c b/src/cut.c
index 454d40d23ec2c90107b8e623c10860ddb952a144..aab1f8e9f46fd504c2ba8eed9b7478a87d574b8e 100644 (file)
--- 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 0ccb908e744a141f0fe49bafb4671ef1ac1f1d76..8428d3216ec6da262bfe96ef911828ec19fbc843 100644 (file)
--- 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 12a1fb67f017804c95ed72166b6192d237b1f0b3..a93fdffed132d2d0a539ec23233a0e35fcccf202 100644 (file)
--- 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 9f06588f2214ff8e3779e0e69f19a3ad8f53660f..e347d654c0714c4d098d30dd534ed9cfe00cebe3 100644 (file)
--- 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 5f0ea74f9ef3c02019c4462e5710118a3e969108..057270145ce516df91899f357ee2f4aa097c2bce 100644 (file)
--- 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;