From 1e795591bbecf07bc3755fdffb4b9ec8e8c763aa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 5 Apr 2006 15:06:15 +0000 Subject: [PATCH] Make long long printing work if snprintf is not available. (#332841, 2006-04-05 Matthias Clasen * glib/gnulib/vasnprintf.c (vasnprintf): Make long long printing work if snprintf is not available. (#332841, Michael McDonald) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ glib/gnulib/vasnprintf.c | 10 +++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b047a8b84..068e931cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-05 Matthias Clasen + + * glib/gnulib/vasnprintf.c (vasnprintf): Make + long long printing work if snprintf is not + available. (#332841, Michael McDonald) + 2006-04-05 Behdad Esfahbod * tests/option-test.c: Check the return value of g_get_prgname for diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b047a8b84..068e931cc 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2006-04-05 Matthias Clasen + + * glib/gnulib/vasnprintf.c (vasnprintf): Make + long long printing work if snprintf is not + available. (#332841, Michael McDonald) + 2006-04-05 Behdad Esfahbod * tests/option-test.c: Check the return value of g_get_prgname for diff --git a/glib/gnulib/vasnprintf.c b/glib/gnulib/vasnprintf.c index b95e119eb..1b468001d 100644 --- a/glib/gnulib/vasnprintf.c +++ b/glib/gnulib/vasnprintf.c @@ -853,11 +853,19 @@ vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args) } } - count = print_long_long (result + length, maxlen, +#if HAVE_SNPRINTF + count = print_long_long (result + length, maxlen, + width, precision, + dp->flags, + dp->conversion, + arg); +#else + count = print_long_long (tmp, tmp_length, width, precision, dp->flags, dp->conversion, arg); +#endif } break; #else