From e315d108283aa60fbd948eff457437f4b8a96252 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Wed, 29 Jan 2014 14:36:00 +0200 Subject: [PATCH] android/avctp: Use predefined HEADER_LENGTH instead of sizeof Make code consistent with using HEADER_LENGTH defined. Remove also type conversion. --- android/avctp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/android/avctp.c b/android/avctp.c index 6f9b33bb2..4ebf2ffbe 100644 --- a/android/avctp.c +++ b/android/avctp.c @@ -818,24 +818,24 @@ static gboolean session_cb(GIOChannel *chan, GIOCondition cond, gpointer data) if (ret <= 0) goto failed; - if ((unsigned int) ret < sizeof(struct avctp_header)) { + if (ret < AVCTP_HEADER_LENGTH) { error("Too small AVCTP packet"); goto failed; } avctp = (struct avctp_header *) buf; - ret -= sizeof(struct avctp_header); - if ((unsigned int) ret < sizeof(struct avc_header)) { + ret -= AVCTP_HEADER_LENGTH; + if (ret < AVC_HEADER_LENGTH) { error("Too small AVCTP packet"); goto failed; } - avc = (struct avc_header *) (buf + sizeof(struct avctp_header)); + avc = (struct avc_header *) (buf + AVCTP_HEADER_LENGTH); - ret -= sizeof(struct avc_header); + ret -= AVC_HEADER_LENGTH; - operands = (uint8_t *) avc + sizeof(struct avc_header); + operands = (uint8_t *) avc + AVC_HEADER_LENGTH; operand_count = ret; if (avctp->cr == AVCTP_RESPONSE) { -- 2.47.3