# HG changeset patch
# User Eric Blake <eblake@redhat.com>
# Date 1369871270 21600
# Node ID c2521dab0c429ce24cf893b555cfc13609754907
# Parent  6105f1dfb98ea7bc260913af0dbd33499466d032
vasnprintf: silence mingw compiler warning

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>

diff --git a/ChangeLog b/ChangeLog
--- 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
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -5153,7 +5153,8 @@
                                 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)