From ca5d2090f6361ee9d618eb7c4d3123ed2b812042 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 20 Aug 2010 01:51:40 +0300 Subject: [PATCH] obexd: Fix format string warnings for g_dbus_create_error This patch fixes gcc warnings for "format not a string literal and no format arguments". --- obexd/client/main.c | 10 +++++----- obexd/client/pbap.c | 2 +- obexd/client/session.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/obexd/client/main.c b/obexd/client/main.c index 3b2762eba..74db15e2c 100644 --- a/obexd/client/main.c +++ b/obexd/client/main.c @@ -77,7 +77,7 @@ static void create_callback(struct session_data *session, GError *err, if (err != NULL) { DBusMessage *error = g_dbus_create_error(data->message, "org.openobex.Error.Failed", - err->message); + "%s", err->message); g_dbus_send_message(data->connection, error); shutdown_session(session); goto done; @@ -239,7 +239,7 @@ static void pull_complete_callback(struct session_data *session, if (err != NULL) { DBusMessage *error = g_dbus_create_error(data->message, "org.openobex.Error.Failed", - err->message); + "%s", err->message); g_dbus_send_message(data->connection, error); goto done; } @@ -263,7 +263,7 @@ static void pull_session_callback(struct session_data *session, if (err != NULL) { DBusMessage *error = g_dbus_create_error(data->message, "org.openobex.Error.Failed", - err->message); + "%s", err->message); g_dbus_send_message(data->connection, error); shutdown_session(session); goto done; @@ -435,7 +435,7 @@ static void capabilities_complete_callback(struct session_data *session, if (err != NULL) { DBusMessage *error = g_dbus_create_error(data->message, "org.openobex.Error.Failed", - err->message); + "%s", err->message); g_dbus_send_message(data->connection, error); goto done; } @@ -465,7 +465,7 @@ static void capability_session_callback(struct session_data *session, if (err != NULL) { DBusMessage *error = g_dbus_create_error(data->message, "org.openobex.Error.Failed", - err->message); + "%s", err->message); g_dbus_send_message(data->connection, error); shutdown_session(session); goto done; diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c index 8f4441bf1..837419c45 100644 --- a/obexd/client/pbap.c +++ b/obexd/client/pbap.c @@ -691,7 +691,7 @@ static DBusMessage *pbap_select(DBusConnection *connection, if (err) return g_dbus_create_error(message, ERROR_INF ".Failed", - OBEX_ResponseToString(err)); + "%s", OBEX_ResponseToString(err)); return dbus_message_new_method_return(message); } diff --git a/obexd/client/session.c b/obexd/client/session.c index 7a71eccf5..7539a97be 100644 --- a/obexd/client/session.c +++ b/obexd/client/session.c @@ -945,7 +945,7 @@ static void session_notify_error(struct session_data *session, reply = g_dbus_create_error(session->msg, "org.openobex.Error.Failed", - err->message); + "%s", err->message); g_dbus_send_message(session->conn, reply); dbus_message_unref(session->msg); @@ -1116,7 +1116,7 @@ static DBusMessage *change_folder(DBusConnection *connection, if (gw_obex_chdir(session->obex, folder, &err) == FALSE) { return g_dbus_create_error(message, "org.openobex.Error.Failed", - OBEX_ResponseToString(err)); + "%s", OBEX_ResponseToString(err)); } return dbus_message_new_method_return(message); @@ -1138,7 +1138,7 @@ static DBusMessage *create_folder(DBusConnection *connection, if (gw_obex_mkdir(session->obex, folder, &err) == FALSE) return g_dbus_create_error(message, "org.openobex.Error.Failed", - OBEX_ResponseToString(err)); + "%s", OBEX_ResponseToString(err)); return dbus_message_new_method_return(message); } @@ -1243,7 +1243,7 @@ static DBusMessage *delete(DBusConnection *connection, if (gw_obex_delete(session->obex, file, &err) == FALSE) { return g_dbus_create_error(message, "org.openobex.Error.Failed", - OBEX_ResponseToString(err)); + "%s", OBEX_ResponseToString(err)); } return dbus_message_new_method_return(message); -- 2.47.3