From 72ba0b4468e38de5c4ea666a95d7d1fbc1d549a1 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 27 Oct 2008 12:15:00 +0000 Subject: [PATCH] =?utf8?q?Bug=20558066=20=E2=80=93=20format=20not=20a=20st?= =?utf8?q?ring=20literal=20and=20no=20format=20arguments?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=3237 --- ChangeLog | 6 ++++++ backend/djvu/djvu-document.c | 20 ++++++++++---------- backend/ps/ev-spectre.c | 2 +- shell/ev-jobs.c | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3efe7132..1c29980c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-10-27 Christian Persch + + * backend/djvu/djvu-document.c + * backend/ps/ev-spectre.c + * shell/ev-jobs.c: Use printf safely. Bug #558066. + 2008-10-24 Nickolay V. Shmyrev * shell/ev-view.c (ev_view_change_page), diff --git a/backend/djvu/djvu-document.c b/backend/djvu/djvu-document.c index 40950c78..a9559c22 100644 --- a/backend/djvu/djvu-document.c +++ b/backend/djvu/djvu-document.c @@ -97,9 +97,9 @@ handle_message (const ddjvu_message_t *msg, GError **error) } if (error) { - g_set_error (error, EV_DJVU_ERROR, 0, error_str); + g_set_error_literal (error, EV_DJVU_ERROR, 0, error_str); } else { - g_warning (error_str); + g_warning ("%s", error_str); } g_free (error_str); @@ -178,10 +178,10 @@ djvu_document_load (EvDocument *document, djvu_wait_for_message (djvu_document, DDJVU_DOCINFO, &djvu_error); if (djvu_error) { - g_set_error (error, - EV_DOCUMENT_ERROR, - EV_DOCUMENT_ERROR_INVALID, - djvu_error->message); + g_set_error_literal (error, + EV_DOCUMENT_ERROR, + EV_DOCUMENT_ERROR_INVALID, + djvu_error->message); g_error_free (djvu_error); g_free (filename); ddjvu_document_release (djvu_document->d_document); @@ -194,10 +194,10 @@ djvu_document_load (EvDocument *document, djvu_handle_events (djvu_document, TRUE, &djvu_error); if (djvu_error) { - g_set_error (error, - EV_DOCUMENT_ERROR, - EV_DOCUMENT_ERROR_INVALID, - djvu_error->message); + g_set_error_literal (error, + EV_DOCUMENT_ERROR, + EV_DOCUMENT_ERROR_INVALID, + djvu_error->message); g_error_free (djvu_error); g_free (filename); ddjvu_document_release (djvu_document->d_document); diff --git a/backend/ps/ev-spectre.c b/backend/ps/ev-spectre.c index 54b59570..a918cb98 100644 --- a/backend/ps/ev-spectre.c +++ b/backend/ps/ev-spectre.c @@ -307,7 +307,7 @@ ps_document_render (EvDocument *document, } if (spectre_page_status (ps_page)) { - g_warning (spectre_status_to_string (spectre_page_status (ps_page))); + g_warning ("%s", spectre_status_to_string (spectre_page_status (ps_page))); g_free (data); return NULL; diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c index 6e1e3f19..dee23b8d 100644 --- a/shell/ev-jobs.c +++ b/shell/ev-jobs.c @@ -239,7 +239,7 @@ ev_job_failed (EvJob *job, message = g_strdup_vprintf (format, args); va_end (args); - job->error = g_error_new (domain, code, message); + job->error = g_error_new_literal (domain, code, message); g_free (message); ev_job_emit_finished (job); -- 2.47.1