From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 22 Mar 2011 08:15:43 +0000 (-0700)
Subject: * xdisp.c (pint2hrstr): Simplify and tune code slightly.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~513^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7cbbd6f018241962b432c1a608067614d223a6d;p=emacs.git

* xdisp.c (pint2hrstr): Simplify and tune code slightly.

This also avoids a (bogus) GCC warning with gcc -Wstrict-overflow.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a9f3e3a5b70..fd135de123b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,8 @@
 	This is less likely to overflow, and avoids undefined behavior if
 	overflow does occur.  All callers changed.  Use strtoul to scan
 	for the unsigned long integer.
+	(pint2hrstr): Simplify and tune code slightly.
+	This also avoids a (bogus) GCC warning with gcc -Wstrict-overflow.
 
 	* scroll.c (do_scrolling): Work around GCC bug 48228.
 	See <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48228>.
diff --git a/src/xdisp.c b/src/xdisp.c
index 93bc8c9479e..457a5e3e11b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19006,7 +19006,7 @@ pint2str (register char *buf, register int width, register EMACS_INT d)
 
 static const char power_letter[] =
   {
-    0,	 /* not used */
+    0,	 /* no letter */
     'k', /* kilo */
     'M', /* mega */
     'G', /* giga */
@@ -19088,8 +19088,7 @@ pint2hrstr (char *buf, int width, int d)
   p = psuffix = buf + max (width, length);
 
   /* Print EXPONENT. */
-  if (exponent)
-    *psuffix++ = power_letter[exponent];
+  *psuffix++ = power_letter[exponent];
   *psuffix = '\0';
 
   /* Print TENTHS. */