[PATCH 1/2] service: Remove extra memory copying from cancel_authorization

[PATCH 1/2] service: Remove extra memory copying from cancel_authorization

[Szymon Janc]

src is never read before being overwritten few lines below.

---
 plugins/service.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/service.c b/plugins/service.c
index 45886ac..d586d79 100644
--- a/plugins/service.c
+++ b/plugins/service.c
@@ -662,11 +662,6 @@ static DBusMessage *cancel_authorization(DBusConnection *conn,
 	if (auth == NULL)
 		return btd_error_does_not_exist(msg);
 
-	if (serv_adapter->adapter)
-		adapter_get_address(serv_adapter->adapter, &src);
-	else
-		bacpy(&src, BDADDR_ANY);
-
 	btd_cancel_authorization(auth->id);
 
 	reply = btd_error_not_authorized(auth->msg);
-- 
1.7.9.5

[PATCH 2/2] agent: Remote not used variables from pincode_reply

[Szymon Janc]

adapter and sba are not used later in function code.

---
 src/agent.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/agent.c b/src/agent.c
index 8cf37b1..e206c56 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -355,16 +355,12 @@ static void pincode_reply(DBusPendingCall *call, void *user_data)
 {
 	struct agent_request *req = user_data;
 	struct agent *agent = req->agent;
-	struct btd_adapter *adapter = agent->adapter;
 	agent_pincode_cb cb = req->cb;
 	DBusMessage *message;
 	DBusError err;
-	bdaddr_t sba;
 	size_t len;
 	char *pin;
 
-	adapter_get_address(adapter, &sba);
-
 	/* steal_reply will always return non-NULL since the callback
 	 * is only called after a reply has been received */
 	message = dbus_pending_call_steal_reply(call);
-- 
1.7.9.5

Re: [PATCH 1/2] service: Remove extra memory copying from cancel_authorization

[Johan Hedberg]

Hi Szymon,

On Tue, Oct 02, 2012, Szymon Janc wrote:
> src is never read before being overwritten few lines below.
> 
> ---
>  plugins/service.c |    5 -----
>  1 file changed, 5 deletions(-)

Both patches have been applied. Thanks.

Johan