From 96bdcc1469061864d4ebcb541849e81b6b8c9da3 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 29 May 2013 17:47:50 -0600 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ lib/vasnprintf.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6cfb46b33..d7202e025 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-05-30 Eric Blake + + vasnprintf: silence mingw compiler warning + * lib/vasnprintf.c (VASNPRINTF): Avoid unused variable warning. + 2013-05-29 Paul Eggert c-ctype, regex, verify: port to gcc -std=c90 -pedantic diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 4e64591c4..21f916943 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -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) -- 2.11.0