Commit 09d83640 authored by John Ralls's avatar John Ralls Committed by Colin Walters

More -Werror=format-nonliteral fixes

This fixes the build with CLang.

https://bugzilla.gnome.org/show_bug.cgi?id=702516
parent 38d1658b
......@@ -423,7 +423,9 @@ g_content_type_get_icon_internal (const gchar *type,
G_LOCK (gio_xdgmime);
xdg_icon = xdg_mime_get_icon (type);
G_UNLOCK (gio_xdgmime);
if (xdg_icon != NULL)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
if (xdg_icon != NULL)
xdg_mimetype_icon = g_strdup_printf (file_template, xdg_icon);
if (xdg_mimetype_icon)
......@@ -438,6 +440,7 @@ g_content_type_get_icon_internal (const gchar *type,
xdg_mimetype_generic_icon = g_content_type_get_generic_icon_name (type);
if (xdg_mimetype_generic_icon)
generic_mimetype_icon = g_strdup_printf (file_template, xdg_mimetype_generic_icon);
#pragma GCC diagnostic pop
if (generic_mimetype_icon)
icon_names[n++] = generic_mimetype_icon;
......
......@@ -543,7 +543,10 @@ g_resolver_records_from_res_query (const gchar *rrname,
format = _("Error resolving '%s'");
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
g_set_error (error, G_RESOLVER_ERROR, errnum, format, rrname);
#pragma GCC diagnostic pop
return NULL;
}
......
......@@ -2428,8 +2428,11 @@ g_markup_vprintf_escaped (const gchar *format,
/* Use them to format the arguments
*/
G_VA_COPY (args2, args);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
output1 = g_strdup_vprintf (format1->str, args);
if (!output1)
{
va_end (args2);
......@@ -2440,7 +2443,7 @@ g_markup_vprintf_escaped (const gchar *format,
va_end (args2);
if (!output2)
goto cleanup;
#pragma GCC diagnostic pop
result = g_string_new (NULL);
/* Iterate through the original format string again,
......
......@@ -909,7 +909,10 @@ g_ascii_formatd (gchar *buffer,
locale_t old_locale;
old_locale = uselocale (get_C_locale ());
_g_snprintf (buffer, buf_len, format, d);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
_g_snprintf (buffer, buf_len, format, d);
#pragma GCC diagnostic pop
uselocale (old_locale);
return buffer;
......
......@@ -2273,7 +2273,10 @@ g_format_size_full (guint64 size,
#endif
g_string_append (string, " (");
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
g_string_append_printf (string, translated_format, formatted_number);
#pragma GCC diagnostic pop
g_free (formatted_number);
g_string_append (string, ")");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment