2014-01-27 16:01:43

by Andrei Emeltchenko

Subject: [PATCH 1/2] unit/avdtp: trivial: Remove empty line

From: Andrei Emeltchenko <[email protected]>

---
unit/test-avdtp.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c
index 4726c4b..8fe5ce3 100644
--- a/unit/test-avdtp.c
+++ b/unit/test-avdtp.c
@@ -216,7 +216,6 @@ static gboolean test_handler(GIOChannel *channel, GIOCondition cond,
return TRUE;
}

-
static struct context *context_new(uint16_t version, uint16_t imtu,
uint16_t omtu, gconstpointer data)
{
--
1.8.3.2

2014-01-27 19:32:28

by Luiz Augusto von Dentz

Subject: Re: [PATCH 1/2] unit/avdtp: trivial: Remove empty line

Hi Andrei,

On Mon, Jan 27, 2014 at 8:01 AM, Andrei Emeltchenko
<[email protected]> wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> ---
> unit/test-avdtp.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c
> index 4726c4b..8fe5ce3 100644
> --- a/unit/test-avdtp.c
> +++ b/unit/test-avdtp.c
> @@ -216,7 +216,6 @@ static gboolean test_handler(GIOChannel *channel, GIOCondition cond,
> return TRUE;
> }
>
> -
> static struct context *context_new(uint16_t version, uint16_t imtu,
> uint16_t omtu, gconstpointer data)
> {
> --
> 1.8.3.2

Applied, thanks.


--
Luiz Augusto von Dentz

2014-01-27 16:01:44

by Andrei Emeltchenko

Subject: [PATCH 2/2] android/avctp: Trivial cleanup code

From: Andrei Emeltchenko <[email protected]>

Avoid extra header calculation and fix wrong line indentation.
---
android/avctp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/android/avctp.c b/android/avctp.c
index 615fecf..6f9b33b 100644
--- a/android/avctp.c
+++ b/android/avctp.c
@@ -798,8 +798,7 @@ failed:
return FALSE;
}

-static gboolean session_cb(GIOChannel *chan, GIOCondition cond,
- gpointer data)
+static gboolean session_cb(GIOChannel *chan, GIOCondition cond, gpointer data)
{
struct avctp *session = data;
struct avctp_channel *control = session->control;
@@ -836,7 +835,7 @@ static gboolean session_cb(GIOChannel *chan, GIOCondition cond,

ret -= sizeof(struct avc_header);

- operands = buf + sizeof(struct avctp_header) + sizeof(struct avc_header);
+ operands = (uint8_t *) avc + sizeof(struct avc_header);
operand_count = ret;

if (avctp->cr == AVCTP_RESPONSE) {
--
1.8.3.2