2014-08-26 13:43:21

by Andrei Emeltchenko

Subject: [PATCH] android/handsfree: Refactor handle_dial()

From: Andrei Emeltchenko <[email protected]>

Call callback only once.
---
android/hal-handsfree.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/hal-handsfree.c b/android/hal-handsfree.c
index 0f5e1d7..986e745 100644
--- a/android/hal-handsfree.c
+++ b/android/hal-handsfree.c
@@ -86,6 +86,7 @@ static void handle_dial(void *buf, uint16_t len, int fd)
{
struct hal_ev_handsfree_dial *ev = buf;
uint16_t num_len = ev->number_len;
+ char *number = NULL;

if (len != sizeof(*ev) + num_len ||
(num_len != 0 && ev->number[num_len - 1] != '\0')) {
@@ -97,9 +98,9 @@ static void handle_dial(void *buf, uint16_t len, int fd)
return;

if (ev->number_len)
- cbs->dial_call_cmd_cb((char *) ev->number);
- else
- cbs->dial_call_cmd_cb(NULL);
+ number = (char *) ev->number;
+
+ cbs->dial_call_cmd_cb(number);
}

static void handle_dtmf(void *buf, uint16_t len, int fd)
--
1.9.1

2014-08-29 13:58:51

by Szymon Janc

Subject: Re: [PATCH] android/handsfree: Refactor handle_dial()

Hi Andrei,

On Tuesday 26 of August 2014 16:43:21 Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> Call callback only once.
> ---
> android/hal-handsfree.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/android/hal-handsfree.c b/android/hal-handsfree.c
> index 0f5e1d7..986e745 100644
> --- a/android/hal-handsfree.c
> +++ b/android/hal-handsfree.c
> @@ -86,6 +86,7 @@ static void handle_dial(void *buf, uint16_t len, int fd)
> {
> struct hal_ev_handsfree_dial *ev = buf;
> uint16_t num_len = ev->number_len;
> + char *number = NULL;
>
> if (len != sizeof(*ev) + num_len ||
> (num_len != 0 && ev->number[num_len - 1] != '\0')) {
> @@ -97,9 +98,9 @@ static void handle_dial(void *buf, uint16_t len, int fd)
> return;
>
> if (ev->number_len)
> - cbs->dial_call_cmd_cb((char *) ev->number);
> - else
> - cbs->dial_call_cmd_cb(NULL);
> + number = (char *) ev->number;
> +
> + cbs->dial_call_cmd_cb(number);
> }
>
> static void handle_dtmf(void *buf, uint16_t len, int fd)

Patch applied. Thanks.

--
Best regards,
Szymon Janc