From e302472df8a44f1e282de6307f25d796ad8a7415 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 6 Feb 2008 23:58:36 +0100 Subject: [PATCH] Fix bug introduced on 2007-06-10. --- ChangeLog | 6 ++++++ lib/vasnprintf.c | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d64aa077..5fbb4947d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-06 Bruno Haible + + Fix bug introduced on 2007-06-10. + * lib/vasnprintf.c (VASNPRINTF): Perform zero-padding also if + !NEED_PRINTF_FLAG_ZERO. + 2008-02-05 Peter O'Gorman getloadavg: use libperfstat on AIX5 diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 19cc009a3..1a74a44b5 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -4535,15 +4535,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, # endif DCHAR_T *p = rp + count; DCHAR_T *end = p + pad; -# if NEED_PRINTF_FLAG_ZERO DCHAR_T *pad_ptr; -# if !DCHAR_IS_TCHAR +# if !DCHAR_IS_TCHAR if (dp->conversion == 'c' || dp->conversion == 's') /* No zero-padding for string directives. */ pad_ptr = NULL; else -# endif +# endif { pad_ptr = (*rp == '-' ? rp + 1 : rp); /* No zero-padding of "inf" and "nan". */ @@ -4551,7 +4550,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, || (*pad_ptr >= 'a' && *pad_ptr <= 'z')) pad_ptr = NULL; } -# endif /* The generated string now extends from rp to p, with the zero padding insertion point being at pad_ptr. */ @@ -4564,7 +4562,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, for (; pad > 0; pad--) *p++ = ' '; } -# if NEED_PRINTF_FLAG_ZERO else if ((flags & FLAG_ZERO) && pad_ptr != NULL) { /* Pad with zeroes. */ @@ -4575,7 +4572,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, for (; pad > 0; pad--) *p++ = '0'; } -# endif else { /* Pad with spaces on the left. */ -- 2.11.0