From: Jim Meyering <jim@meyering.net>
Date: Thu, 17 Mar 2005 15:33:50 +0000 (+0000)
Subject: (main): Use DECIMAL_DIGIT_ACCUMULATE macro in place of nearly-equivalent code.
X-Git-Tag: CPPI-1_12~1287
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e1e48f018692c1cf285405d0221256cf0789000;p=thirdparty%2Fcoreutils.git

(main): Use DECIMAL_DIGIT_ACCUMULATE macro in place of nearly-equivalent code.
---

diff --git a/src/uniq.c b/src/uniq.c
index a21a5a41c8..621b953093 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -487,12 +487,10 @@ main (int argc, char **argv)
 	case '8':
 	case '9':
 	  {
-	    size_t s = skip_fields;
 	    if (skip_field_option_type == SFO_NEW)
-	      s = 0;
+	      skip_fields = 0;
 
-	    skip_fields = s * 10 + optc - '0';
-	    if (SIZE_MAX / 10 < s || skip_fields < s)
+	    if (DECIMAL_DIGIT_ACCUMULATE (skip_fields, optc - '0', SIZE_MAX))
 	      error (EXIT_FAILURE, 0, "%s",
 		     _("invalid number of fields to skip"));
 	    skip_field_option_type = SFO_OBSOLETE;