diff options
author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-05-11 16:02:58 +0100 |
---|---|---|
committer | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-05-11 14:51:35 -0400 |
commit | 9b9e4b12f7825dce352f9f48d6e829be30c7512a (patch) | |
tree | 06e9ce1f573e4f6a11d0a7bd2b3883d6e9ff852a | |
parent | 67c955953493fa5ddac776defd23f1cad262eb14 (diff) | |
download | telepathy-logger-9b9e4b12f7825dce352f9f48d6e829be30c7512a.tar.gz |
all: fix -Wunused-but-set-variable warnings
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r-- | src/test-api.c | 3 | ||||
-rw-r--r-- | telepathy-logger/dbus-service.c | 6 | ||||
-rw-r--r-- | tests/dbus/test-tpl-log-store-pidgin.c | 5 | ||||
-rw-r--r-- | tests/dbus/test-tpl-log-store-xml.c | 3 |
4 files changed, 2 insertions, 15 deletions
diff --git a/src/test-api.c b/src/test-api.c index be6ef3a..1f8f6cf 100644 --- a/src/test-api.c +++ b/src/test-api.c @@ -35,7 +35,7 @@ main (int argc, char *argv[]) TpDBusDaemon *bus; TpProxy *proxy; GError *error = NULL; - char *account, *identifer; + char *account; g_type_init (); mainloop = g_main_loop_new (NULL, FALSE); @@ -47,7 +47,6 @@ main (int argc, char *argv[]) } account = g_strdup_printf ("%s%s", TP_ACCOUNT_OBJECT_PATH_BASE, argv[1]); - identifer = argv[2]; bus = tp_dbus_daemon_dup (&error); g_assert_no_error (error); diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c index 3f3cf2e..db41e83 100644 --- a/telepathy-logger/dbus-service.c +++ b/telepathy-logger/dbus-service.c @@ -203,12 +203,9 @@ favourite_contacts_file_read_line_cb (GObject *object, GDataInputStream *data_stream = G_DATA_INPUT_STREAM (object); TplActionChain *action_chain = (TplActionChain *) (user_data); TplDBusService *self = _tpl_action_chain_get_object (action_chain); - TplDBusServicePriv *priv; gchar *line; GError *error = NULL; - priv = self->priv; - line = g_data_input_stream_read_line_finish (data_stream, result, NULL, &error); if (error != NULL) @@ -574,15 +571,12 @@ pendingproc_add_favourite_contact (TplActionChain *action_chain, { FavouriteContactClosure *closure = user_data; gboolean should_add = FALSE; - TplDBusServicePriv *priv; GError *error = NULL; g_return_if_fail (closure); g_return_if_fail (TPL_IS_DBUS_SERVICE (closure->service)); g_return_if_fail (closure->context != NULL); - priv = closure->service->priv; - if (!tp_dbus_check_valid_object_path (closure->account, &error)) { dbus_g_method_return_error (closure->context, error); diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c index f8563da..94fb3f8 100644 --- a/tests/dbus/test-tpl-log-store-pidgin.c +++ b/tests/dbus/test-tpl-log-store-pidgin.c @@ -438,7 +438,6 @@ test_search_new (PidginTestCaseFixture *fixture, gconstpointer user_data) { GList *l = NULL; - TplLogSearchHit *hit; /* empty search */ l = log_store_pidgin_search_new (TPL_LOG_STORE (fixture->store), @@ -456,8 +455,6 @@ test_search_new (PidginTestCaseFixture *fixture, g_assert_cmpint (g_list_length (l), ==, 1); - hit = g_list_nth_data (l, 0); - tpl_log_manager_search_free (l); /* non empty search, checking chatrooms are also searched */ @@ -467,8 +464,6 @@ test_search_new (PidginTestCaseFixture *fixture, g_assert_cmpint (g_list_length (l), ==, 1); - hit = g_list_nth_data (l, 0); - tpl_log_manager_search_free (l); } diff --git a/tests/dbus/test-tpl-log-store-xml.c b/tests/dbus/test-tpl-log-store-xml.c index f2c8c1f..db89bed 100644 --- a/tests/dbus/test-tpl-log-store-xml.c +++ b/tests/dbus/test-tpl-log-store-xml.c @@ -95,9 +95,8 @@ teardown (XmlTestCaseFixture *fixture, if (fixture->tmp_basedir != NULL) { gchar *command = g_strdup_printf ("rm -rf %s", fixture->tmp_basedir); - int res; - res = system (command); + system (command); g_free (fixture->tmp_basedir); } |