From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 1 Mar 2017 17:24:57 +0000 (-0800)
Subject: expand: avoid an extraneous warning on 32 bit
X-Git-Tag: v8.27~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3be3da3becfd3eb51e4992aec93b6945bb052f02;p=thirdparty%2Fcoreutils.git

expand: avoid an extraneous warning on 32 bit

* src/expand-common (parse-tab-stops): Exit earlier upon overflow
so another warning isn't issued (on 32 bit) in add_tab_stop().
Flagged in https://hydra.nixos.org/build/49499970
---

diff --git a/src/expand-common.c b/src/expand-common.c
index 9b6cdb9dc5..0728e70d0d 100644
--- a/src/expand-common.c
+++ b/src/expand-common.c
@@ -126,7 +126,6 @@ parse_tab_stops (char const *stops)
                 {
                   if (! set_extend_size (tabval))
                     {
-                      extend_tabval = false;
                       ok = false;
                       break;
                     }
@@ -175,7 +174,7 @@ parse_tab_stops (char const *stops)
         }
     }
 
-  if (have_tabval)
+  if (ok && have_tabval)
     {
       if (extend_tabval)
         ok &= set_extend_size (tabval);
@@ -183,7 +182,7 @@ parse_tab_stops (char const *stops)
         add_tab_stop (tabval);
     }
 
-  if (!ok)
+  if (! ok)
     exit (EXIT_FAILURE);
 }