Restore old behaviour of g_string_append_vprintf: g_vasprintf seems to be

2007-06-18  Mathias Hasselmann  <mathias.hasselmann@gmx.de>

	* glib/gstring.c: Restore old behaviour of
	g_string_append_vprintf: g_vasprintf seems to be faster
	than g_printf_string_upper_bound (#57693).

svn path=/trunk/; revision=5581
This commit is contained in:
Mathias Hasselmann 2007-06-18 21:14:49 +00:00 committed by Mathias Hasselmann
parent c03ddad312
commit 90240bf12d
2 changed files with 12 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2007-06-18 Mathias Hasselmann <mathias.hasselmann@gmx.de>
* glib/gstring.c: Restore old behaviour of
g_string_append_vprintf: g_vasprintf seems to be faster
than g_printf_string_upper_bound (#57693).
2007-06-18 Matthias Clasen <mclasen@redhat.com>
* glib/gutils.c (g_get_home_dir): Add some motivation.

View File

@ -1278,19 +1278,15 @@ g_string_append_vprintf (GString *string,
const gchar *fmt,
va_list args)
{
va_list sneak;
gsize length;
gchar *buffer;
gint length;
g_return_if_fail (string != NULL);
g_return_if_fail (fmt != NULL);
G_VA_COPY (sneak, args);
length = g_printf_string_upper_bound (fmt, sneak);
va_end (sneak);
g_string_maybe_expand (string, length);
length = g_vsnprintf (string->str + string->len, length, fmt, args);
string->len += length;
length = g_vasprintf (&buffer, fmt, args);
g_string_append_len (string, buffer, length);
g_free (buffer);
}
/**