summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gorse <mgorse@suse.com>2014-09-15 16:20:14 -0500
committerMike Gorse <mgorse@suse.com>2014-09-15 16:20:14 -0500
commitd5db834d06845224b37240e5299770006e32655a (patch)
treed7b07ac4d0547517cc97cc048a3e1e2562eed5bf
parent9630b21558ef3d01f0f12cc8100d9fe5a9cb65ba (diff)
downloadat-spi2-core-d5db834d06845224b37240e5299770006e32655a.tar.gz
Fix some warnings
-rw-r--r--dbind/dbind.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/dbind/dbind.c b/dbind/dbind.c
index 98467e65..9d7304ed 100644
--- a/dbind/dbind.c
+++ b/dbind/dbind.c
@@ -162,7 +162,6 @@ dbind_method_call_reentrant_va (DBusConnection *cnx,
if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
{
- const char *name = dbus_message_get_error_name (reply);
goto out;
}
/* demarshal */
@@ -246,6 +245,7 @@ dbind_method_call_reentrant (DBusConnection *cnx,
/*---------------------------------------------------------------------------*/
+/* TODO: opt_error is unused; should be removed */
dbus_bool_t
dbind_emit_signal_va (DBusConnection *cnx,
const char *path,
@@ -258,17 +258,8 @@ dbind_emit_signal_va (DBusConnection *cnx,
dbus_bool_t success = FALSE;
DBusMessage *msg = NULL;
DBusMessageIter iter;
- DBusError *err, real_err;
const char *p;
- dbus_error_init (&real_err);
-
- if (opt_error)
- err = opt_error;
- else {
- err = &real_err;
- }
-
msg = dbus_message_new_signal (path, interface, signal);
if (!msg)
goto out;
@@ -286,9 +277,6 @@ out:
if (msg)
dbus_message_unref (msg);
- if (dbus_error_is_set (&real_err))
- dbus_error_free (&real_err);
-
return success;
}