| 1 |
colin |
16565 |
From db26e1f82293782edb0a6da852edd4be0ab9897b Mon Sep 17 00:00:00 2001 |
| 2 |
|
|
From: Colin Guthrie <cguthrie@mandriva.org> |
| 3 |
|
|
Date: Sun, 8 Feb 2009 13:30:48 +0000 |
| 4 |
|
|
Subject: [PATCH] Allow build with -Werror=format-security |
| 5 |
|
|
Patch by Adam Williamson |
| 6 |
|
|
|
| 7 |
|
|
--- |
| 8 |
|
|
libengine/themer.c | 6 +++--- |
| 9 |
|
|
src/engine_loader.c | 2 +- |
| 10 |
|
|
themer/main.c | 2 ++ |
| 11 |
|
|
3 files changed, 6 insertions(+), 4 deletions(-) |
| 12 |
|
|
|
| 13 |
|
|
diff --git a/libengine/themer.c b/libengine/themer.c |
| 14 |
|
|
index c940594..e17bca8 100644 |
| 15 |
|
|
--- a/libengine/themer.c |
| 16 |
|
|
+++ b/libengine/themer.c |
| 17 |
|
|
@@ -874,7 +874,7 @@ static void append_engine(gchar * dlname) |
| 18 |
|
|
err = dlerror(); |
| 19 |
|
|
if (!hand || err) |
| 20 |
|
|
{ |
| 21 |
|
|
- g_warning(err); |
| 22 |
|
|
+ g_warning("%s", err); |
| 23 |
|
|
if (hand) |
| 24 |
|
|
dlclose(hand); |
| 25 |
|
|
return; |
| 26 |
|
|
@@ -885,7 +885,7 @@ static void append_engine(gchar * dlname) |
| 27 |
|
|
layout_settings_proc lay; |
| 28 |
|
|
lay = dlsym(hand,"layout_engine_settings"); |
| 29 |
|
|
if ((err=dlerror())) |
| 30 |
|
|
- g_warning(err); |
| 31 |
|
|
+ g_warning("%s", err); |
| 32 |
|
|
if (lay) |
| 33 |
|
|
{ |
| 34 |
|
|
get_meta_info_proc meta; |
| 35 |
|
|
@@ -896,7 +896,7 @@ static void append_engine(gchar * dlname) |
| 36 |
|
|
"<i><small>%s</small></i>"; |
| 37 |
|
|
meta = dlsym(hand,"get_meta_info"); |
| 38 |
|
|
if ((err=dlerror())) |
| 39 |
|
|
- g_warning(err); |
| 40 |
|
|
+ g_warning("%s", err); |
| 41 |
|
|
d->meta.description=g_strdup("No Description"); |
| 42 |
|
|
d->meta.version=g_strdup("0.0"); |
| 43 |
|
|
d->meta.last_compat=g_strdup("0.0"); |
| 44 |
|
|
diff --git a/src/engine_loader.c b/src/engine_loader.c |
| 45 |
|
|
index 4b5270f..86aad62 100644 |
| 46 |
|
|
--- a/src/engine_loader.c |
| 47 |
|
|
+++ b/src/engine_loader.c |
| 48 |
|
|
@@ -54,7 +54,7 @@ gboolean load_engine(gchar * engine_name, window_settings * ws) |
| 49 |
|
|
newengine = dlopen(path,RTLD_NOW); |
| 50 |
|
|
if (!newengine) |
| 51 |
|
|
{ |
| 52 |
|
|
- g_warning(dlerror()); |
| 53 |
|
|
+ g_warning("%s", dlerror()); |
| 54 |
|
|
//here's where we should bail out somehow |
| 55 |
|
|
} |
| 56 |
|
|
} |
| 57 |
|
|
diff --git a/themer/main.c b/themer/main.c |
| 58 |
|
|
index ead154c..2e26e40 100644 |
| 59 |
|
|
--- a/themer/main.c |
| 60 |
|
|
+++ b/themer/main.c |
| 61 |
|
|
@@ -264,6 +264,7 @@ static void info_dialog(gchar * val) |
| 62 |
|
|
GTK_DIALOG_DESTROY_WITH_PARENT, |
| 63 |
|
|
GTK_MESSAGE_INFO, |
| 64 |
|
|
GTK_BUTTONS_CLOSE, |
| 65 |
|
|
+ "%s", |
| 66 |
|
|
val); |
| 67 |
|
|
gtk_dialog_run(GTK_DIALOG(w)); |
| 68 |
|
|
gtk_widget_destroy(w); |
| 69 |
|
|
@@ -275,6 +276,7 @@ static void error_dialog(gchar * val) |
| 70 |
|
|
GTK_DIALOG_DESTROY_WITH_PARENT, |
| 71 |
|
|
GTK_MESSAGE_ERROR, |
| 72 |
|
|
GTK_BUTTONS_CLOSE, |
| 73 |
|
|
+ "%s", |
| 74 |
|
|
val); |
| 75 |
|
|
gtk_dialog_run(GTK_DIALOG(w)); |
| 76 |
|
|
gtk_widget_destroy(w); |
| 77 |
|
|
-- |
| 78 |
|
|
1.6.1.2 |
| 79 |
|
|
|
Parent Directory
| 
Revision Log