luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-16 07:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the -Werror=format-nonliteral fixes for older GCCs

Browse Source 
They don't allow that pragma inside functions.
This commit is contained in:
John Ralls
2013-09-29 11:33:30 -07:00
parent 09d83640a8
commit ab5aa2aa3a
6 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gfileutils.c
View File

@ -1008,6 +1008,9 @@ static char *
format_error_message (const gchar *filename,
const gchar *format_string) G_GNUC_FORMAT(2);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
static char *
format_error_message (const gchar *filename,
const gchar *format_string)
@ -1016,18 +1019,15 @@ format_error_message (const gchar *filename,
gchar *display_name;
gchar *msg;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
display_name = g_filename_display_name (filename);
msg = g_strdup_printf (format_string, display_name, g_strerror (saved_errno));
g_free (display_name);
#pragma GCC diagnostic pop
return msg;
}
#pragma GCC diagnostic pop
/* format string must have two '%s':
*
* - the place for the filename