46 lines
2.2 KiB
Diff
46 lines
2.2 KiB
Diff
diff -Nru glib-1.2.10.old/gstrfuncs.c glib-1.2.10/gstrfuncs.c
|
|
--- glib-1.2.10.old/gstrfuncs.c 2005-03-30 23:55:42.000000000 +0200
|
|
+++ glib-1.2.10/gstrfuncs.c 2005-03-31 00:07:44.000000000 +0200
|
|
@@ -867,8 +867,7 @@
|
|
/* beware of positional parameters
|
|
*/
|
|
case '$':
|
|
- g_warning (G_GNUC_PRETTY_FUNCTION
|
|
- "(): unable to handle positional parameters (%%n$)");
|
|
+ g_warning ( "%s(): unable to handle positional parameters (%%n$)", G_GNUC_PRETTY_FUNCTION);
|
|
len += 1024; /* try adding some safety padding */
|
|
break;
|
|
|
|
@@ -1034,8 +1033,7 @@
|
|
/* n . dddddddddddddddddddddddd E +- eeee */
|
|
conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
|
|
if (spec.mod_extra_long)
|
|
- g_warning (G_GNUC_PRETTY_FUNCTION
|
|
- "(): unable to handle long double, collecting double only");
|
|
+ g_warning ( "%s(): unable to handle long double, collecting double only", G_GNUC_PRETTY_FUNCTION);
|
|
#ifdef HAVE_LONG_DOUBLE
|
|
#error need to implement special handling for long double
|
|
#endif
|
|
@@ -1077,8 +1075,7 @@
|
|
conv_done = TRUE;
|
|
if (spec.mod_long)
|
|
{
|
|
- g_warning (G_GNUC_PRETTY_FUNCTION
|
|
- "(): unable to handle wide char strings");
|
|
+ g_warning ( "%s(): unable to handle wide char strings", G_GNUC_PRETTY_FUNCTION);
|
|
len += 1024; /* try adding some safety padding */
|
|
}
|
|
break;
|
|
@@ -1108,9 +1105,8 @@
|
|
conv_len += format - spec_start;
|
|
break;
|
|
default:
|
|
- g_warning (G_GNUC_PRETTY_FUNCTION
|
|
- "(): unable to handle `%c' while parsing format",
|
|
- c);
|
|
+ g_warning ( "%s(): unable to handle \"%c\" while parsing format",
|
|
+ G_GNUC_PRETTY_FUNCTION, c);
|
|
break;
|
|
}
|
|
conv_done |= conv_len > 0;
|