more fix for -Wformat

Issue #2 resolved
grafi-tt created an issue

Some distros (Ubuntu 13.04, Debian wheezy, Gentoo, etc) turns on Wformat -Werror=format-security by default, and which causing compile error.

Following trivial patch fixes the issue.

diff -urN imsettings-1.6.7.orig/backends/lxde/lxde-module.c imsettings-1.6.7/backends/lxde/lxde-module.c
--- imsettings-1.6.7.orig/backends/lxde/lxde-module.c   2013-12-25 17:44:33.590093451 +0900
+++ imsettings-1.6.7/backends/lxde/lxde-module.c    2013-12-25 17:52:18.200100683 +0900
@@ -176,7 +176,7 @@

    retval = g_key_file_get_string(key, "GTK", "sGtk/IMModule", &err);
    if (err) {
-       g_warning(err->message);
+       g_warning("%s", err->message);
        g_error_free(err);
    }
   finalize:
diff -urN imsettings-1.6.7.orig/backends/xim/loopback.c imsettings-1.6.7/backends/xim/loopback.c
--- imsettings-1.6.7.orig/backends/xim/loopback.c   2013-12-25 17:44:33.590093451 +0900
+++ imsettings-1.6.7/backends/xim/loopback.c    2013-12-25 17:57:34.240105602 +0900
@@ -773,7 +773,7 @@
        gboolean retval;

        g_xim_messages_warning(G_XIM_PROTOCOL_GET_IFACE (proto)->message,
-                      msg);
+                      "%s", msg);
        retval = g_xim_connection_cmd_error(G_XIM_CONNECTION (proto),
                            imid, icid, G_XIM_EMASK_VALID_IMID | G_XIM_EMASK_VALID_ICID,
                            G_XIM_ERR_BadProtocol,
@@ -803,7 +803,7 @@
        gboolean retval;

        g_xim_messages_warning(G_XIM_PROTOCOL_GET_IFACE (proto)->message,
-                      msg);
+                      "%s", msg);
        retval = g_xim_connection_cmd_error(G_XIM_CONNECTION (proto),
                            imid, icid, G_XIM_EMASK_VALID_IMID | G_XIM_EMASK_VALID_ICID,
                            G_XIM_ERR_BadProtocol,
@@ -844,7 +844,7 @@
        gboolean retval;

        g_xim_messages_warning(G_XIM_PROTOCOL_GET_IFACE (proto)->message,
-                      msg);
+                      "%s", msg);
        retval = g_xim_connection_cmd_error(G_XIM_CONNECTION (proto),
                            imid, icid, G_XIM_EMASK_VALID_IMID | G_XIM_EMASK_VALID_ICID,
                            G_XIM_ERR_BadProtocol,
diff -urN imsettings-1.6.7.orig/backends/xim/proxy.c imsettings-1.6.7/backends/xim/proxy.c
--- imsettings-1.6.7.orig/backends/xim/proxy.c  2013-12-25 17:44:33.590093451 +0900
+++ imsettings-1.6.7/backends/xim/proxy.c   2013-12-25 17:59:04.460107006 +0900
@@ -798,7 +798,7 @@
        retval = g_xim_connection_cmd_error(G_XIM_CONNECTION (conn), imid, icid, flag,
                            G_XIM_ERR_BadProtocol, 0, msg);
    }
-   g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, msg);
+   g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, "%s", msg);
    g_free(msg);

    return retval;
diff -urN imsettings-1.6.7.orig/imsettings/imsettings-utils.c imsettings-1.6.7/imsettings/imsettings-utils.c
--- imsettings-1.6.7.orig/imsettings/imsettings-utils.c 2013-12-25 17:44:33.600093451 +0900
+++ imsettings-1.6.7/imsettings/imsettings-utils.c  2013-12-25 17:45:59.410094786 +0900
@@ -146,7 +146,7 @@
        GDBusNodeInfo *introspection_data = g_dbus_node_info_new_for_xml(introspection_xml, &err);

        if (err) {
-           g_warning(err->message);
+           g_warning("%s", err->message);
            return NULL;
        }
        info = g_dbus_interface_info_ref(introspection_data->interfaces[0]);
diff -urN imsettings-1.6.7.orig/imsettings-daemon/imsettings-module.c imsettings-1.6.7/imsettings-daemon/imsettings-module.c
--- imsettings-1.6.7.orig/imsettings-daemon/imsettings-module.c 2013-12-25 17:44:33.600093451 +0900
+++ imsettings-1.6.7/imsettings-daemon/imsettings-module.c  2013-12-25 17:49:52.250098411 +0900
@@ -260,7 +260,7 @@
                        &mod_cb);

                if (!mod_cb) {
-                   g_warning(g_module_error());
+                   g_warning("%s", g_module_error());
                    goto next;
                }
                priv->switch_im = mod_cb;
@@ -268,7 +268,7 @@
                        "module_dump_im",
                        &mod_cb);
                if (!mod_cb) {
-                   g_warning(g_module_error());
+                   g_warning("%s", g_module_error());
                    goto next;
                }
                priv->dump_im = mod_cb;
diff -urN imsettings-1.6.7.orig/imsettings-daemon/imsettings-proc.c imsettings-1.6.7/imsettings-daemon/imsettings-proc.c
--- imsettings-1.6.7.orig/imsettings-daemon/imsettings-proc.c   2013-12-25 17:44:33.590093451 +0900
+++ imsettings-1.6.7/imsettings-daemon/imsettings-proc.c    2013-12-25 17:53:38.500101933 +0900
@@ -109,7 +109,7 @@
    }
    str = g_string_new(NULL);
    g_string_append_printf(str, "%s[%lu]: %s", module, (gulong)priv->main.pid, buffer);
-   g_message(str->str);
+   g_message("%s", str->str);
    g_string_free(str, TRUE);
    g_free(buffer);

@@ -204,7 +204,7 @@
                             type_names[type],
                             module);

-           g_critical(message);
+           g_critical("%s", message);
            g_signal_emit(proc, signals[SIG_NOTIFY_NOTIFICATION], 0, NOTIFY_URGENCY_CRITICAL, title, message, 0);
            g_free(message);
            unref = TRUE;
@@ -303,7 +303,7 @@
        g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_UNKNOWN,
                _("[BUG] %s process is still running [pid: %d]\n"),
                type_name, pinfo->pid);
-       g_warning((*error)->message);
+       g_warning("%s", (*error)->message);
        return FALSE;
    } else {
        /* close io channels prior to create new one */

Comments (1)

  1. Log in to comment