vasnprintf: silence mingw compiler warning
authorEric Blake <eblake@redhat.com>
Wed, 29 May 2013 23:47:50 +0000 (17:47 -0600)
committerEric Blake <eblake@redhat.com>
Thu, 30 May 2013 17:39:06 +0000 (11:39 -0600)
On mingw, vasnprintf is able to use snprintf, but not its return
value; this led to a situation where gcc warns:

vasnprintf.c: In function 'vasnprintf':
vasnprintf.c:4609:21: error: variable 'has_width' set but not used [-Werror=unused-but-set-variable]

Rather than hacking through a bunch of #ifdefs, where some used both
variables and others only used one, I changed the lone use of just
'width' to also use 'has_width'.

* lib/vasnprintf.c (VASNPRINTF): Avoid unused variable warning.

Signed-off-by: Eric Blake <eblake@redhat.com>
ChangeLog
lib/vasnprintf.c

index 6cfb46b..d7202e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Eric Blake  <eblake@redhat.com>
+
+       vasnprintf: silence mingw compiler warning
+       * lib/vasnprintf.c (VASNPRINTF): Avoid unused variable warning.
+
 2013-05-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        c-ctype, regex, verify: port to gcc -std=c90 -pedantic
index 4e64591..21f9169 100644 (file)
@@ -5153,7 +5153,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                 size_t tmp_length =
                                   MAX_ROOM_NEEDED (&a, dp->arg_index,
                                                    dp->conversion, type, flags,
-                                                   width, has_precision,
+                                                   has_width ? width : 0,
+                                                   has_precision,
                                                    precision, pad_ourselves);
 
                                 if (maxlen < tmp_length)