2014-04-29 10:31:08

by Jakub Tyszkowski

Subject: [PATCH] android/gatt: Remove redundant find function parameter

As client and server apps id is guaranteed to be unique, there is no
need for this search function parameter.
---
android/gatt.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/android/gatt.c b/android/gatt.c
index 0e81e7d..b2c1a02 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -1242,8 +1242,7 @@ static void handle_client_unregister(const void *buf, uint16_t len)
HAL_OP_GATT_CLIENT_UNREGISTER, status);
}

-static struct app_connection *find_conn(const bdaddr_t *addr, int32_t app_id,
- int32_t app_type)
+static struct app_connection *find_conn(const bdaddr_t *addr, int32_t app_id)
{
struct app_connection conn_match;
struct gatt_device *dev = NULL;
@@ -2875,7 +2874,7 @@ static void handle_client_register_for_notification(const void *buf,

android2bdaddr(&cmd->bdaddr, &addr);

- conn = find_conn(&addr, cmd->client_if, APP_CLIENT);
+ conn = find_conn(&addr, cmd->client_if);
if (!conn) {
status = HAL_STATUS_FAILED;
goto failed;
@@ -2980,7 +2979,7 @@ static void handle_client_deregister_for_notification(const void *buf,

android2bdaddr(&cmd->bdaddr, &addr);

- conn = find_conn(&addr, cmd->client_if, APP_CLIENT);
+ conn = find_conn(&addr, cmd->client_if);
if (!conn) {
status = HAL_STATUS_FAILED;
goto failed;
--
1.9.1

2014-04-30 09:22:48

by Szymon Janc

Subject: Re: [PATCH] android/gatt: Remove redundant find function parameter

Hi Jakub,

On Tuesday 29 of April 2014 12:31:08 Jakub Tyszkowski wrote:
> As client and server apps id is guaranteed to be unique, there is no
> need for this search function parameter.
> ---
> android/gatt.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/android/gatt.c b/android/gatt.c
> index 0e81e7d..b2c1a02 100644
> --- a/android/gatt.c
> +++ b/android/gatt.c
> @@ -1242,8 +1242,7 @@ static void handle_client_unregister(const void *buf, uint16_t len)
> HAL_OP_GATT_CLIENT_UNREGISTER, status);
> }
>
> -static struct app_connection *find_conn(const bdaddr_t *addr, int32_t app_id,
> - int32_t app_type)
> +static struct app_connection *find_conn(const bdaddr_t *addr, int32_t app_id)
> {
> struct app_connection conn_match;
> struct gatt_device *dev = NULL;
> @@ -2875,7 +2874,7 @@ static void handle_client_register_for_notification(const void *buf,
>
> android2bdaddr(&cmd->bdaddr, &addr);
>
> - conn = find_conn(&addr, cmd->client_if, APP_CLIENT);
> + conn = find_conn(&addr, cmd->client_if);
> if (!conn) {
> status = HAL_STATUS_FAILED;
> goto failed;
> @@ -2980,7 +2979,7 @@ static void handle_client_deregister_for_notification(const void *buf,
>
> android2bdaddr(&cmd->bdaddr, &addr);
>
> - conn = find_conn(&addr, cmd->client_if, APP_CLIENT);
> + conn = find_conn(&addr, cmd->client_if);
> if (!conn) {
> status = HAL_STATUS_FAILED;
> goto failed;
>

Applied, thanks.

--
Best regards,
Szymon Janc