[Telepathy-commits] [telepathy-gabble/master] in functions taking format string and arguments, explicitly specify format string

Senko Rasic senko at phyrexia.lan
Tue Dec 2 04:34:01 PST 2008


---
 src/error.c          |    2 +-
 src/muc-channel.c    |    4 ++--
 src/write-mgr-file.c |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/error.c b/src/error.c
index 9d8eaf4..54b3255 100644
--- a/src/error.c
+++ b/src/error.c
@@ -380,7 +380,7 @@ gabble_xmpp_error_to_g_error (GabbleXmppError error)
 
   return g_error_new (GABBLE_XMPP_ERROR,
                       error,
-                      xmpp_errors[error].description);
+                      "%s", xmpp_errors[error].description);
 }
 
 /*
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 54f7a7b..31ef76e 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -1476,7 +1476,7 @@ _gabble_muc_channel_presence_error (GabbleMucChannel *chan,
           break;
         default:
           tp_error = g_error_new (TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
-              gabble_xmpp_error_description (error));
+              "%s", gabble_xmpp_error_description (error));
           break;
       }
 
@@ -2125,7 +2125,7 @@ _gabble_muc_channel_handle_subject (GabbleMucChannel *chan,
           GError *error = NULL;
 
           error = g_error_new (TP_ERRORS, TP_ERROR_PERMISSION_DENIED,
-              (err_desc) ? err_desc : "failed to change subject");
+              "%s", (err_desc) ? err_desc : "failed to change subject");
 
           tp_properties_context_return (priv->properties_ctx, error);
           priv->properties_ctx = NULL;
diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c
index 50db5ed..a0179d5 100644
--- a/src/write-mgr-file.c
+++ b/src/write-mgr-file.c
@@ -95,7 +95,7 @@ main (void)
                                gabble_protocols, &error);
   if (!s)
     {
-      fprintf (stderr, error->message);
+      fprintf (stderr, "%s", error->message);
       g_error_free (error);
       return 1;
     }
-- 
1.5.6.5




More information about the Telepathy-commits mailing list