aboutsummaryrefslogtreecommitdiff
path: root/hw/bt-l2cap.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2012-07-08 06:56:53 +0000
committerBlue Swirl <blauwirbel@gmail.com>2012-07-28 09:23:11 +0000
commit0ed8b6f67f26acc2e88dfc6be4954e63f943bd28 (patch)
tree8490bfb39362e56f8238ba9208114764bc938d7e /hw/bt-l2cap.c
parent16fd921bd3a266d321071739cf40785abce4bcb1 (diff)
downloadqemu-0ed8b6f67f26acc2e88dfc6be4954e63f943bd28.zip
qemu-0ed8b6f67f26acc2e88dfc6be4954e63f943bd28.tar.gz
qemu-0ed8b6f67f26acc2e88dfc6be4954e63f943bd28.tar.bz2
Avoid returning void
It's silly and non-conforming to standards to return void, don't do it. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/bt-l2cap.c')
-rw-r--r--hw/bt-l2cap.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/hw/bt-l2cap.c b/hw/bt-l2cap.c
index 2ccba60..cb43ee7 100644
--- a/hw/bt-l2cap.c
+++ b/hw/bt-l2cap.c
@@ -1000,7 +1000,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid,
/* TODO: Signal an error? */
return;
}
- return l2cap_sframe_in(ch, le16_to_cpup((void *) hdr->data));
+ l2cap_sframe_in(ch, le16_to_cpup((void *) hdr->data));
+ return;
}
switch (hdr->data[1] >> 6) { /* SAR */
@@ -1010,7 +1011,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid,
if (len - 4 > ch->mps)
goto len_error;
- return ch->params.sdu_in(ch->params.opaque, hdr->data + 2, len - 4);
+ ch->params.sdu_in(ch->params.opaque, hdr->data + 2, len - 4);
+ break;
case L2CAP_SAR_START:
if (ch->len_total || len < 6)
@@ -1033,7 +1035,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid,
goto len_error;
memcpy(ch->sdu + ch->len_cur, hdr->data + 2, len - 4);
- return ch->params.sdu_in(ch->params.opaque, ch->sdu, ch->len_total);
+ ch->params.sdu_in(ch->params.opaque, ch->sdu, ch->len_total);
+ break;
case L2CAP_SAR_CONT:
if (!ch->len_total || ch->len_cur + len - 4 >= ch->len_total)
@@ -1136,7 +1139,7 @@ static void l2cap_bframe_submit(struct bt_l2cap_conn_params_s *parms)
{
struct l2cap_chan_s *chan = (struct l2cap_chan_s *) parms;
- return l2cap_pdu_submit(chan->l2cap);
+ l2cap_pdu_submit(chan->l2cap);
}
#if 0