From b42d23e56061cf657e9c6aad98d6afd183ecc4bf Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 19 Mar 2014 16:14:01 +0200 Subject: [PATCH] core: Fix unnecessary calls to agent_cancel() The agent_unref() function already takes care of agent_cancel() so there's no need to call both functions in sequence. --- src/adapter.c | 8 ++------ src/agent.c | 1 - src/device.c | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 060d895cc..cf063ba64 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -1063,10 +1063,8 @@ static void service_auth_cancel(struct service_auth *auth) dbus_error_free(&derr); - if (auth->agent != NULL) { - agent_cancel(auth->agent); + if (auth->agent != NULL) agent_unref(auth->agent); - } g_free(auth); } @@ -4742,10 +4740,8 @@ int btd_cancel_authorization(guint id) g_queue_remove(auth->adapter->auths, auth); - if (auth->agent) { - agent_cancel(auth->agent); + if (auth->agent) agent_unref(auth->agent); - } g_free(auth); diff --git a/src/agent.c b/src/agent.c index 6887bc1b8..4a2f606dd 100644 --- a/src/agent.c +++ b/src/agent.c @@ -329,7 +329,6 @@ static void simple_agent_reply(DBusPendingCall *call, void *user_data) if (dbus_error_has_name(&err, DBUS_ERROR_NO_REPLY)) { error("Timed out waiting for reply from agent"); - agent_cancel(agent); dbus_message_unref(message); dbus_error_free(&err); agent_unref(agent); diff --git a/src/device.c b/src/device.c index 2e25fe656..a4ea140d8 100644 --- a/src/device.c +++ b/src/device.c @@ -1812,7 +1812,6 @@ static void bonding_request_free(struct bonding_req *bonding) g_free(bonding->cb_iter); if (bonding->agent) { - agent_cancel(bonding->agent); agent_unref(bonding->agent); bonding->agent = NULL; } -- 2.47.3