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

This also avoids a (bogus) GCC warning with gcc -Wstrict-overflow.
This commit is contained in:
Paul Eggert 2011-03-22 01:15:43 -07:00
parent 19ab8a188a
commit b7cbbd6f01
2 changed files with 4 additions and 3 deletions

View file

@ -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>.

View file

@ -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. */