2012-01-13 14:17:50

by Syam Sidhardhan

[permalink] [raw]
Subject: [PATCH obexd] client: Remove unused code in pbap

---
client/pbap.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/client/pbap.c b/client/pbap.c
index 9e9eb05..73d496a 100644
--- a/client/pbap.c
+++ b/client/pbap.c
@@ -364,7 +364,6 @@ static void read_return_apparam(struct obc_session *session,
{
struct obc_transfer *transfer = obc_session_get_transfer(session);
struct obc_transfer_params params;
- unsigned char *buf;
size_t size = 0;

*phone_book_size = 0;
@@ -404,7 +403,6 @@ static void read_return_apparam(struct obc_session *session,
hdr->tag, hdr->len);
}

- buf += APPARAM_HDR_SIZE + hdr->len;
size -= APPARAM_HDR_SIZE + hdr->len;
}
}
--
1.7.4.1



2012-01-13 16:35:23

by Luiz Augusto von Dentz

[permalink] [raw]
Subject: Re: [PATCH obexd] client: Remove unused code in pbap

Hi Syam,

On Fri, Jan 13, 2012 at 4:17 PM, Syam Sidhardhan <[email protected]> wrote:
> ---
> ?client/pbap.c | ? ?2 --
> ?1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/client/pbap.c b/client/pbap.c
> index 9e9eb05..73d496a 100644
> --- a/client/pbap.c
> +++ b/client/pbap.c
> @@ -364,7 +364,6 @@ static void read_return_apparam(struct obc_session *session,
> ?{
> ? ? ? ?struct obc_transfer *transfer = obc_session_get_transfer(session);
> ? ? ? ?struct obc_transfer_params params;
> - ? ? ? unsigned char *buf;
> ? ? ? ?size_t size = 0;
>
> ? ? ? ?*phone_book_size = 0;
> @@ -404,7 +403,6 @@ static void read_return_apparam(struct obc_session *session,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?hdr->tag, hdr->len);
> ? ? ? ? ? ? ? ?}
>
> - ? ? ? ? ? ? ? buf += APPARAM_HDR_SIZE + hdr->len;
> ? ? ? ? ? ? ? ?size -= APPARAM_HDR_SIZE + hdr->len;
> ? ? ? ?}
> ?}
> --
> 1.7.4.1

Actually this is still wrong since hdr pointer is never updated it is
only processing the first header, I was just fixing it today while
doing some other cleanups , apparently we never got any problem
because the responses normally only contain one hdr/parameter.

--
Luiz Augusto von Dentz