From: Jim Meyering <meyering@redhat.com>
Date: Sat, 28 May 2011 14:00:20 +0000 (+0200)
Subject: trim: avoid a warning from -O2 -Wstrict-overflow
X-Git-Tag: stable/20110609~49
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=cfd76ac9d8626361147a0044a1fe5c4740ec5ee3;hp=586b707390e87b1fcc69ab7c9207036d2d10165b;p=gnulib.git

trim: avoid a warning from -O2 -Wstrict-overflow

* lib/trim.c (trim2): Declare local to be "unsigned int", not "int".
(cherry picked from commit 244906802a300a1744de8881857a3a2897b3db8b)
---

diff --git a/ChangeLog b/ChangeLog
index 8d2057305..3f5235a1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-28  Jim Meyering  <meyering@redhat.com>
+
+	trim: avoid a warning from -O2 -Wstrict-overflow
+	* lib/trim.c (trim2): Declare local to be "unsigned int", not "int".
+
 2011-05-28  Bruno Haible  <bruno@clisp.org>
 
 	getloadavg: Remove an unreliable safety check.
diff --git a/lib/trim.c b/lib/trim.c
index 1f4d0c131..6515cfaff 100644
--- a/lib/trim.c
+++ b/lib/trim.c
@@ -65,7 +65,7 @@ trim2 (const char *s, int how)
       /* Trim trailing whitespaces. */
       if (how != TRIM_LEADING)
         {
-          int state = 0;
+          unsigned int state = 0;
           char *r IF_LINT (= NULL); /* used only while state = 2 */
 
           mbi_init (i, d, strlen (d));
@@ -130,4 +130,3 @@ trim2 (const char *s, int how)
 
   return d;
 }
-