Remove deprecated UNUSED macro (4/5)
These variables are the unused results of parsing macros.
Test: mma -j32
Change-Id: Id377b8280d8fb7cf1e4a366d8ac10bdb5a09361c
diff --git a/system/stack/avct/avct_bcb_act.cc b/system/stack/avct/avct_bcb_act.cc
index 42f252b..455ed9f 100644
--- a/system/stack/avct/avct_bcb_act.cc
+++ b/system/stack/avct/avct_bcb_act.cc
@@ -559,7 +559,6 @@
/* parse header byte */
AVCT_PARSE_HDR(p, label, type, cr_ipid);
- UNUSED(type);
/* check for invalid cr_ipid */
if (cr_ipid == AVCT_CR_IPID_INVALID)
diff --git a/system/stack/avct/avct_lcb_act.cc b/system/stack/avct/avct_lcb_act.cc
index dff0fcc..4d36668 100644
--- a/system/stack/avct/avct_lcb_act.cc
+++ b/system/stack/avct/avct_lcb_act.cc
@@ -671,7 +671,6 @@
/* parse header byte */
AVCT_PARSE_HDR(p, label, type, cr_ipid);
- UNUSED(type);
/* check for invalid cr_ipid */
if (cr_ipid == AVCT_CR_IPID_INVALID)
diff --git a/system/stack/avdt/avdt_msg.cc b/system/stack/avdt/avdt_msg.cc
index 0c5ed41..ed4a2de 100644
--- a/system/stack/avdt/avdt_msg.cc
+++ b/system/stack/avdt/avdt_msg.cc
@@ -1612,8 +1612,6 @@
/* parse the message header */
AVDT_MSG_PRS_HDR(p, label, pkt_type, msg_type);
- UNUSED(pkt_type);
-
AVDT_TRACE_DEBUG("msg_type=%d, sig=%d", msg_type, sig);
/* set up label and ccb_idx in message hdr */
msg.hdr.label = label;
diff --git a/system/stack/avdt/avdt_scb_act.cc b/system/stack/avdt/avdt_scb_act.cc
index 74c840c..91ce95a3 100644
--- a/system/stack/avdt/avdt_scb_act.cc
+++ b/system/stack/avdt/avdt_scb_act.cc
@@ -253,8 +253,6 @@
BE_STREAM_TO_UINT32(time_stamp, p);
p += 4;
- UNUSED(o_v);
-
/* skip over any csrc's in packet */
p += o_cc * 4;
@@ -331,9 +329,6 @@
p += 2;
BE_STREAM_TO_UINT32(ssrc, p);
- UNUSED(o_p);
- UNUSED(o_v);
-
switch(pt)
{
case AVDT_RTCP_PT_SR: /* the packet type - SR (Sender Report) */