From aadcba2dc50bba4b007502e6d50fc1cdff6bc2f3 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 13 Oct 2008 12:54:45 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20555386=20=E2=80=93=20format=20not=20a=20s?= =?UTF-8?q?tring=20literal=20and=20no=20format=20arguments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=21642 --- ChangeLog | 12 ++++++++++++ gtk/gtkiconfactory.c | 2 +- gtk/gtkprintbackend.c | 4 ++-- gtk/gtkprintoperation.c | 8 ++++---- gtk/gtkthemes.c | 4 ++-- gtk/tests/builder.c | 2 +- modules/other/gail/gailtextview.c | 6 +++--- tests/testmerge.c | 2 +- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index e18d38fc12..e6c54662e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-10-13 Christian Persch + + Bug 555386 – format not a string literal and no format arguments + + * gtk/gtkiconfactory.c + * gtk/gtkprintbackend.c + * gtk/gtkprintoperation.c + * gtk/gtkthemes.c + * gtk/tests/builder.c + * modules/other/gail/gailtextview.c + * tests/testmerge.c: Use printf safely. + 2008-10-13 Christian Persch Bug 555724 – gtkcellrendereraccel not initialised correctly diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index d7818398d6..ba90ddd09e 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -2863,7 +2863,7 @@ icon_source_start_element (GMarkupParseContext *context, error_domain, tmp); #else - g_warning (tmp); + g_warning ("%s", tmp); #endif g_free (tmp); g_free (stock_id); diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c index 1f21aaf8e1..2889b94fba 100644 --- a/gtk/gtkprintbackend.c +++ b/gtk/gtkprintbackend.c @@ -119,7 +119,7 @@ gtk_print_backend_module_load (GTypeModule *module) pb_module->library = g_module_open (pb_module->path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); if (!pb_module->library) { - g_warning (g_module_error()); + g_warning ("%s", g_module_error()); return FALSE; } @@ -131,7 +131,7 @@ gtk_print_backend_module_load (GTypeModule *module) !g_module_symbol (pb_module->library, "pb_module_create", &createp)) { - g_warning (g_module_error()); + g_warning ("%s", g_module_error()); g_module_close (pb_module->library); return FALSE; diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 321240d82e..fad74d3452 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -1848,10 +1848,10 @@ run_pdf (GtkPrintOperation *op, width, height); if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS) { - g_set_error (&priv->error, - GTK_PRINT_ERROR, - GTK_PRINT_ERROR_GENERAL, - cairo_status_to_string (cairo_surface_status (surface))); + g_set_error_literal (&priv->error, + GTK_PRINT_ERROR, + GTK_PRINT_ERROR_GENERAL, + cairo_status_to_string (cairo_surface_status (surface))); *do_print = FALSE; return GTK_PRINT_OPERATION_RESULT_ERROR; } diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c index 919562a56b..d6d9f7940f 100644 --- a/gtk/gtkthemes.c +++ b/gtk/gtkthemes.c @@ -81,7 +81,7 @@ gtk_theme_engine_load (GTypeModule *module) g_free(engine_path); if (!engine->library) { - g_warning (g_module_error()); + g_warning ("%s", g_module_error()); return FALSE; } @@ -93,7 +93,7 @@ gtk_theme_engine_load (GTypeModule *module) !g_module_symbol (engine->library, "theme_create_rc_style", (gpointer *)&engine->create_rc_style)) { - g_warning (g_module_error()); + g_warning ("%s", g_module_error()); g_module_close (engine->library); return FALSE; diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c index 35764df34b..8415666ebc 100644 --- a/gtk/tests/builder.c +++ b/gtk/tests/builder.c @@ -2293,7 +2293,7 @@ test_file (const gchar *filename) if (!gtk_builder_add_from_file (builder, filename, &error)) { - g_error (error->message); + g_error ("%s", error->message); g_error_free (error); return; } diff --git a/modules/other/gail/gailtextview.c b/modules/other/gail/gailtextview.c index 4e46f7eaae..499406dfcf 100644 --- a/modules/other/gail/gailtextview.c +++ b/modules/other/gail/gailtextview.c @@ -1733,11 +1733,11 @@ static GIOChannel* gail_streamable_content_get_stream (AtkStreamable gio = g_io_channel_unix_new (fd); g_io_channel_set_encoding (gio, NULL, &err); if (!err) g_io_channel_write_chars (gio, (const char *) cbuf, (gssize) len, &written, &err); - else g_message (err->message); + else g_message ("%s", err->message); if (!err) g_io_channel_seek_position (gio, 0, G_SEEK_SET, &err); - else g_message (err->message); + else g_message ("%s", err->message); if (!err) g_io_channel_flush (gio, &err); - else g_message (err->message); + else g_message ("%s", err->message); if (err) { g_message ("", tname); g_error_free (err); diff --git a/tests/testmerge.c b/tests/testmerge.c index 957f5e2fad..125fba5257 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -43,7 +43,7 @@ dump_tree (GtkWidget *button, gchar *dump; dump = gtk_ui_manager_get_ui (merge); - g_message (dump); + g_message ("%s", dump); g_free (dump); }