From f1c764fab01c929f71e185b97433bf40938026d3 Mon Sep 17 00:00:00 2001 From: Sharvil Nanavati Date: Mon, 23 Feb 2015 17:31:48 -0800 Subject: [PATCH] Make build more strict by adding more warning flags. This change introduces -Wunused-but-set-variable to help catch programming errors. It also undefines NDEBUG so assertions are fatal and defines LOG_NDEBUG=1 to suppress LOGV. --- Android.mk | 12 ++++++++---- bta/av/bta_av_act.c | 3 +-- bta/av/bta_av_main.c | 2 -- bta/dm/bta_dm_act.c | 5 +---- bta/gatt/bta_gatts_act.c | 2 -- bta/hl/bta_hl_main.c | 2 -- bta/hl/bta_hl_sdp.c | 4 ++-- bta/hl/bta_hl_utils.c | 3 +-- btif/src/btif_dm.c | 3 +-- btif/src/btif_hl.c | 38 ++++++++++++-------------------------- btif/src/btif_pan.c | 4 ++-- btif/src/btif_rc.c | 2 -- stack/a2dp/a2d_sbc.c | 3 +-- stack/avct/avct_lcb_act.c | 1 + stack/avdt/avdt_msg.c | 2 ++ stack/avdt/avdt_scb_act.c | 14 ++++++++++---- stack/bnep/bnep_main.c | 3 +-- stack/btm/btm_acl.c | 7 ++----- stack/btm/btm_ble.c | 4 ++-- stack/btm/btm_ble_multi_adv.c | 4 ++-- stack/btm/btm_pm.c | 4 ++-- stack/btu/btu_hcif.c | 3 +-- stack/gatt/gatt_api.c | 3 +-- stack/gatt/gatt_db.c | 7 ------- stack/hid/hidh_conn.c | 7 ------- stack/l2cap/l2c_ble.c | 7 +++---- stack/mcap/mca_cact.c | 3 +-- stack/pan/pan_api.c | 6 ------ stack/sdp/sdp_discovery.c | 3 +-- 29 files changed, 58 insertions(+), 103 deletions(-) diff --git a/Android.mk b/Android.mk index e4a40e498..37eb48a76 100644 --- a/Android.mk +++ b/Android.mk @@ -1,7 +1,5 @@ LOCAL_PATH := $(call my-dir) -bdroid_CFLAGS := -Wno-unused-parameter - # Setup bdroid local make variables for handling configuration ifneq ($(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR),) bdroid_C_INCLUDES := $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR) @@ -11,12 +9,18 @@ else bdroid_CFLAGS += -DHAS_NO_BDROID_BUILDCFG endif -bdroid_CFLAGS += -Wall -Werror -UNDEBUG - ifneq ($(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED),) bdroid_CFLAGS += -DHCILP_INCLUDED=$(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED) endif +bdroid_CFLAGS += \ + -Wall \ + -Werror \ + -Wno-unused-parameter \ + -Wunused-but-set-variable \ + -UNDEBUG \ + -DLOG_NDEBUG=1 + include $(call all-subdir-makefiles) # Cleanup our locals diff --git a/bta/av/bta_av_act.c b/bta/av/bta_av_act.c index af3d2e2b5..a93c7b47a 100644 --- a/bta/av/bta_av_act.c +++ b/bta/av/bta_av_act.c @@ -870,7 +870,6 @@ void bta_av_rc_msg(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data) tAVRC_MSG_VENDOR *p_vendor = &p_data->rc_msg.msg.vendor; BOOLEAN is_inquiry = ((p_data->rc_msg.msg.hdr.ctype == AVRC_CMD_SPEC_INQ) || p_data->rc_msg.msg.hdr.ctype == AVRC_CMD_GEN_INQ); #if (AVRC_METADATA_INCLUDED == TRUE) - tAVRC_STS res; UINT8 ctype = 0; tAVRC_RESPONSE rc_rsp; @@ -998,7 +997,7 @@ void bta_av_rc_msg(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data) if (!p_pkt) { rc_rsp.rsp.opcode = p_data->rc_msg.opcode; - res = AVRC_BldResponse (0, &rc_rsp, &p_pkt); + AVRC_BldResponse (0, &rc_rsp, &p_pkt); } if (p_pkt) AVRC_MsgReq (p_data->rc_msg.handle, p_data->rc_msg.label, ctype, p_pkt); diff --git a/bta/av/bta_av_main.c b/bta/av/bta_av_main.c index 08c0be43d..89e5c6de7 100644 --- a/bta/av/bta_av_main.c +++ b/bta/av/bta_av_main.c @@ -1097,7 +1097,6 @@ BOOLEAN bta_av_link_role_ok(tBTA_AV_SCB *p_scb, UINT8 bits) { UINT8 role; BOOLEAN is_ok = TRUE; - BOOLEAN need_timer = FALSE; if (BTM_GetRole(p_scb->peer_addr, &role) == BTM_SUCCESS) { @@ -1110,7 +1109,6 @@ BOOLEAN bta_av_link_role_ok(tBTA_AV_SCB *p_scb, UINT8 bits) if (BTM_CMD_STARTED != BTM_SwitchRole(p_scb->peer_addr, BTM_ROLE_MASTER, NULL)) { /* can not switch role on SCB - start the timer on SCB */ - need_timer = TRUE; } is_ok = FALSE; p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START; diff --git a/bta/dm/bta_dm_act.c b/bta/dm/bta_dm_act.c index 707914795..960b31c18 100644 --- a/bta/dm/bta_dm_act.c +++ b/bta/dm/bta_dm_act.c @@ -628,10 +628,7 @@ void bta_dm_set_afhchannels (tBTA_DM_MSG *p_data) *******************************************************************************/ void bta_dm_vendor_spec_command (tBTA_DM_MSG *p_data) { - tBTM_STATUS status; - - status = BTM_VendorSpecificCommand(p_data->vendor_command.opcode,p_data->vendor_command.param_len,p_data->vendor_command.p_param_buf, p_data->vendor_command.p_cback); - + BTM_VendorSpecificCommand(p_data->vendor_command.opcode,p_data->vendor_command.param_len,p_data->vendor_command.p_param_buf, p_data->vendor_command.p_cback); } diff --git a/bta/gatt/bta_gatts_act.c b/bta/gatt/bta_gatts_act.c index 20faa6238..43befe533 100644 --- a/bta/gatt/bta_gatts_act.c +++ b/bta/gatt/bta_gatts_act.c @@ -113,7 +113,6 @@ void bta_gatts_enable(tBTA_GATTS_CB *p_cb) { UINT8 index=0; tBTA_GATTS_HNDL_RANGE handle_range; - tBTA_GATT_STATUS status = BTA_GATT_OK; if (p_cb->enabled) { @@ -137,7 +136,6 @@ void bta_gatts_enable(tBTA_GATTS_CB *p_cb) if (!GATTS_NVRegister(&bta_gatts_nv_cback)) { APPL_TRACE_ERROR("BTA GATTS NV register failed."); - status = BTA_GATT_ERROR; } } } diff --git a/bta/hl/bta_hl_main.c b/bta/hl/bta_hl_main.c index 7f087527d..5b2c799f0 100644 --- a/bta/hl/bta_hl_main.c +++ b/bta/hl/bta_hl_main.c @@ -1565,13 +1565,11 @@ static void bta_hl_sdp_query_results(tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data) tBTA_HL_APP_CB *p_acb = BTA_HL_GET_APP_CB_PTR( app_idx); tBTA_HL_MCL_CB *p_mcb = BTA_HL_GET_MCL_CB_PTR( app_idx, mcl_idx); tBTA_HL_SDP *p_sdp=NULL; - tBTA_HL_SDP_OPER sdp_oper; UINT16 event; BOOLEAN release_sdp_buf=FALSE; UNUSED(p_cb); event = p_data->hdr.event; - sdp_oper = p_mcb->sdp_oper; if ( event == BTA_HL_SDP_QUERY_OK_EVT) { diff --git a/bta/hl/bta_hl_sdp.c b/bta/hl/bta_hl_sdp.c index 14171fa3d..f5b3fd1fe 100644 --- a/bta/hl/bta_hl_sdp.c +++ b/bta/hl/bta_hl_sdp.c @@ -39,7 +39,7 @@ BOOLEAN bta_hl_fill_sup_feature_list( const tSDP_DISC_ATTR *p_attr, tBTA_HL_SUP_FEATURE_LIST_ELEM *p_list) { tSDP_DISC_ATTR *p_sattr; - UINT8 seq_len, item_cnt; + UINT8 item_cnt; UINT8 list_cnt=0; BOOLEAN status=TRUE; @@ -50,7 +50,7 @@ BOOLEAN bta_hl_fill_sup_feature_list( const tSDP_DISC_ATTR *p_attr, { return(FALSE); } - seq_len =SDP_DISC_ATTR_LEN(p_attr->attr_len_type); + SDP_DISC_ATTR_LEN(p_attr->attr_len_type); item_cnt=0; for (p_sattr = p_attr->attr_value.v.p_sub_attr; p_sattr && (item_cnt < 4) ; p_sattr = p_sattr->p_next_attr) diff --git a/bta/hl/bta_hl_utils.c b/bta/hl/bta_hl_utils.c index 5cb41a94e..e80316d82 100644 --- a/bta/hl/bta_hl_utils.c +++ b/bta/hl/bta_hl_utils.c @@ -1168,11 +1168,10 @@ BOOLEAN bta_hl_find_mcl_idx(UINT8 app_idx, BD_ADDR p_bd_addr, UINT8 *p_mcl_idx) { BOOLEAN found=FALSE; UINT8 i; - tBTA_HL_MCL_CB *p_mcb; for (i=0; i < BTA_HL_NUM_MCLS ; i ++) { - p_mcb = BTA_HL_GET_MCL_CB_PTR(app_idx, i); + BTA_HL_GET_MCL_CB_PTR(app_idx, i); if (bta_hl_cb.acb[app_idx].mcb[i].in_use && (!memcmp (bta_hl_cb.acb[app_idx].mcb[i].bd_addr, p_bd_addr, BD_ADDR_LEN))) diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index 51d5e5ab8..310ffc95c 100644 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -435,7 +435,6 @@ BOOLEAN check_sdp_bl(const bt_bdaddr_t *remote_bdaddr) UINT16 manufacturer = 0; UINT8 lmp_ver = 0; UINT16 lmp_subver = 0; - tBTM_STATUS btm_status; bt_property_t prop_name; bt_remote_version_t info; bt_status_t status; @@ -445,7 +444,7 @@ BOOLEAN check_sdp_bl(const bt_bdaddr_t *remote_bdaddr) return FALSE; /* fetch additional info about remote device used in iop query */ - btm_status = BTM_ReadRemoteVersion(*(BD_ADDR*)remote_bdaddr, &lmp_ver, + BTM_ReadRemoteVersion(*(BD_ADDR*)remote_bdaddr, &lmp_ver, &manufacturer, &lmp_subver); diff --git a/btif/src/btif_hl.c b/btif/src/btif_hl.c index 64b1f59ef..7da7c80f1 100644 --- a/btif/src/btif_hl.c +++ b/btif/src/btif_hl.c @@ -564,7 +564,7 @@ static BOOLEAN btif_hl_find_sdp_idx_using_mdep_filter(UINT8 app_idx, UINT8 mcl_i { btif_hl_app_cb_t *p_acb =BTIF_HL_GET_APP_CB_PTR(app_idx); btif_hl_mcl_cb_t *p_mcb =BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); - UINT8 i, j, num_recs,num_elems, num_mdeps, mdep_cnt, mdep_idx; + UINT8 i, j, num_recs,num_elems, num_mdeps, mdep_idx; tBTA_HL_MDEP_ROLE peer_mdep_role; UINT16 data_type; tBTA_HL_SDP_MDEP_CFG *p_mdep; @@ -590,7 +590,6 @@ static BOOLEAN btif_hl_find_sdp_idx_using_mdep_filter(UINT8 app_idx, UINT8 mcl_i data_type = p_acb->filter.elem[j].data_type; peer_mdep_role = p_acb->filter.elem[j].peer_mdep_role; elem_found = FALSE; - mdep_cnt =0; mdep_idx=0; while (!elem_found && mdep_idx < num_mdeps ) { @@ -1176,7 +1175,6 @@ static BOOLEAN btif_hl_find_peer_mdep_id(UINT8 app_id, BD_ADDR bd_addr, UINT16 data_type, tBTA_HL_MDEP_ID *p_peer_mdep_id){ UINT8 app_idx, mcl_idx; - btif_hl_app_cb_t *p_acb; btif_hl_mcl_cb_t *p_mcb; tBTA_HL_SDP_REC *p_rec; UINT8 i, num_mdeps; @@ -1203,7 +1201,7 @@ static BOOLEAN btif_hl_find_peer_mdep_id(UINT8 app_id, BD_ADDR bd_addr, if (btif_hl_find_app_idx(app_id, &app_idx) ) { - p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); + BTIF_HL_GET_APP_CB_PTR(app_idx); if (btif_hl_find_mcl_idx(app_idx, bd_addr, &mcl_idx)) { p_mcb =BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); @@ -2574,7 +2572,6 @@ BOOLEAN btif_hl_proc_pending_op(UINT8 app_idx, UINT8 mcl_idx) static BOOLEAN btif_hl_proc_cch_open_cfm(tBTA_HL *p_data) { - btif_hl_app_cb_t *p_acb; btif_hl_mcl_cb_t *p_mcb; UINT8 app_idx, mcl_idx; BOOLEAN status = FALSE; @@ -2587,7 +2584,7 @@ static BOOLEAN btif_hl_proc_cch_open_cfm(tBTA_HL *p_data) BTIF_TRACE_DEBUG("app_idx=%d", app_idx); if (btif_hl_find_mcl_idx(app_idx, p_data->cch_open_cfm.bd_addr, &mcl_idx)) { - p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); + BTIF_HL_GET_APP_CB_PTR(app_idx); p_mcb = BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); BTIF_TRACE_DEBUG("mcl_idx=%d, mcl_handle=%d", mcl_idx,p_data->cch_open_cfm.mcl_handle); @@ -2765,8 +2762,6 @@ static void btif_hl_proc_create_ind(tBTA_HL *p_data){ static void btif_hl_proc_dch_open_ind(tBTA_HL *p_data) { - btif_hl_app_cb_t *p_acb; - btif_hl_mcl_cb_t *p_mcb; btif_hl_mdl_cb_t *p_dcb; UINT8 orig_app_idx, mcl_idx, mdl_idx, mdep_cfg_idx; UINT8 dc_cfg; @@ -2779,8 +2774,8 @@ static void btif_hl_proc_dch_open_ind(tBTA_HL *p_data) if (btif_hl_find_mcl_idx_using_app_idx(p_data->dch_open_ind.mcl_handle, orig_app_idx, &mcl_idx )) { - p_acb =BTIF_HL_GET_APP_CB_PTR(orig_app_idx); - p_mcb =BTIF_HL_GET_MCL_CB_PTR(orig_app_idx, mcl_idx); + BTIF_HL_GET_APP_CB_PTR(orig_app_idx); + BTIF_HL_GET_MCL_CB_PTR(orig_app_idx, mcl_idx); if (btif_hl_find_avail_mdl_idx(orig_app_idx, mcl_idx, &mdl_idx)) { @@ -2845,8 +2840,6 @@ static void btif_hl_proc_dch_open_ind(tBTA_HL *p_data) static BOOLEAN btif_hl_proc_dch_open_cfm(tBTA_HL *p_data) { - btif_hl_app_cb_t *p_acb; - btif_hl_mcl_cb_t *p_mcb; btif_hl_mdl_cb_t *p_dcb; btif_hl_pending_chan_cb_t *p_pcb; UINT8 app_idx, mcl_idx, mdl_idx, mdep_cfg_idx; @@ -2860,8 +2853,8 @@ static BOOLEAN btif_hl_proc_dch_open_cfm(tBTA_HL *p_data) if (btif_hl_find_mcl_idx_using_app_idx(p_data->dch_open_cfm.mcl_handle, app_idx, &mcl_idx )) { - p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); - p_mcb = BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); + BTIF_HL_GET_APP_CB_PTR(app_idx); + BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); p_pcb = BTIF_HL_GET_PCB_PTR(app_idx, mcl_idx); if (btif_hl_find_avail_mdl_idx(app_idx, mcl_idx, &mdl_idx)) @@ -2922,8 +2915,6 @@ static BOOLEAN btif_hl_proc_dch_open_cfm(tBTA_HL *p_data) *******************************************************************************/ static BOOLEAN btif_hl_proc_dch_reconnect_cfm(tBTA_HL *p_data) { - btif_hl_app_cb_t *p_acb; - btif_hl_mcl_cb_t *p_mcb; btif_hl_mdl_cb_t *p_dcb; btif_hl_pending_chan_cb_t *p_pcb; UINT8 app_idx, mcl_idx, mdl_idx, mdep_cfg_idx; @@ -2936,8 +2927,8 @@ static BOOLEAN btif_hl_proc_dch_reconnect_cfm(tBTA_HL *p_data) if (btif_hl_find_mcl_idx_using_app_idx(p_data->dch_reconnect_cfm.mcl_handle, app_idx, &mcl_idx )) { - p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); - p_mcb = BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); + BTIF_HL_GET_APP_CB_PTR(app_idx); + BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); p_pcb = BTIF_HL_GET_PCB_PTR(app_idx, mcl_idx); if (btif_hl_find_avail_mdl_idx(app_idx, mcl_idx, &mdl_idx)) @@ -3001,7 +2992,6 @@ static void btif_hl_proc_dch_reconnect_ind(tBTA_HL *p_data) { btif_hl_app_cb_t *p_acb; - btif_hl_mcl_cb_t *p_mcb; btif_hl_mdl_cb_t *p_dcb; UINT8 app_idx, mcl_idx, mdl_idx, mdep_cfg_idx, dc_cfg; BOOLEAN close_dch = FALSE; @@ -3016,7 +3006,7 @@ static void btif_hl_proc_dch_reconnect_ind(tBTA_HL *p_data) p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); BTIF_TRACE_DEBUG("btif_hl_proc_dch_reconnect_ind: app_idx = %d, mcl_idx = %d", app_idx, mcl_idx); - p_mcb = BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); + BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); if (btif_hl_find_avail_mdl_idx(app_idx, mcl_idx, &mdl_idx)) { @@ -3292,7 +3282,6 @@ static void btif_hl_proc_cb_evt(UINT16 event, char* p_param){ tBTA_HL_REG_PARAM reg_param; btif_hl_app_cb_t *p_acb; bthl_app_reg_state_t reg_state = BTHL_APP_REG_STATE_REG_FAILED; - int app_id; UINT8 preg_idx; bt_status_t bt_status; @@ -3326,7 +3315,6 @@ static void btif_hl_proc_cb_evt(UINT16 event, char* p_param){ break; case BTIF_HL_REG_APP: p_acb = BTIF_HL_GET_APP_CB_PTR(p_data->reg.app_idx); - app_id = (int) p_acb->app_id; BTIF_TRACE_DEBUG("Rcv BTIF_HL_REG_APP app_idx=%d reg_pending=%d", p_data->reg.app_idx, p_acb->reg_pending); if (btif_hl_get_state() == BTIF_HL_STATE_ENABLED && p_acb->reg_pending) { @@ -4166,7 +4154,6 @@ static bt_status_t destroy_channel(int channel_id){ ** *******************************************************************************/ static bt_status_t unregister_application(int app_id){ - btif_hl_app_cb_t *p_acb; UINT8 app_idx; int len; bt_status_t status = BT_STATUS_SUCCESS; @@ -4179,7 +4166,7 @@ static bt_status_t unregister_application(int app_id){ if (btif_hl_find_app_idx(((UINT8)app_id), &app_idx)) { evt_param.unreg.app_idx = app_idx; - p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); + BTIF_HL_GET_APP_CB_PTR(app_idx); reg_counter --; len = sizeof(btif_hl_unreg_t); status = btif_transfer_context (btif_hl_proc_cb_evt, BTIF_HL_UNREG_APP, @@ -4403,7 +4390,6 @@ BOOLEAN btif_hl_save_mdl_cfg(UINT8 mdep_id, UINT8 item_idx, BOOLEAN btif_hl_delete_mdl_cfg(UINT8 mdep_id, UINT8 item_idx){ btif_hl_mdl_cfg_t *p_mdl=NULL; BOOLEAN success = FALSE; - btif_hl_app_cb_t *p_acb; UINT8 app_idx, len; bt_status_t bt_status; btif_hl_evt_cb_t evt_param; @@ -4411,7 +4397,7 @@ BOOLEAN btif_hl_delete_mdl_cfg(UINT8 mdep_id, UINT8 item_idx){ if(btif_hl_find_app_idx_using_mdepId(mdep_id,&app_idx)) { - p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); + BTIF_HL_GET_APP_CB_PTR(app_idx); p_mdl = BTIF_HL_GET_MDL_CFG_PTR(app_idx, item_idx); if (p_mdl) diff --git a/btif/src/btif_pan.c b/btif/src/btif_pan.c index 3b7df1efa..fe0d7427f 100644 --- a/btif/src/btif_pan.c +++ b/btif/src/btif_pan.c @@ -368,7 +368,7 @@ static int tap_if_up(const char *devname, const bt_bdaddr_t *addr) static int tap_if_down(const char *devname) { struct ifreq ifr; - int sk, err; + int sk; sk = socket(AF_INET, SOCK_DGRAM, 0); @@ -377,7 +377,7 @@ static int tap_if_down(const char *devname) ifr.ifr_flags &= ~IFF_UP; - err = ioctl(sk, SIOCSIFFLAGS, (caddr_t) &ifr); + ioctl(sk, SIOCSIFFLAGS, (caddr_t) &ifr); close(sk); diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c index de6c3281c..7321fd474 100644 --- a/btif/src/btif_rc.c +++ b/btif/src/btif_rc.c @@ -674,7 +674,6 @@ void handle_rc_metamsg_cmd (tBTA_AV_META_MSG *pmeta_msg) UINT8 scratch_buf[512] = {0}; tAVRC_COMMAND avrc_command = {0}; tAVRC_STS status; - int param_len; BTIF_TRACE_EVENT("+ %s", __FUNCTION__); @@ -734,7 +733,6 @@ void handle_rc_metamsg_cmd (tBTA_AV_META_MSG *pmeta_msg) if (avrc_command.cmd.pdu == AVRC_PDU_REGISTER_NOTIFICATION) { UINT8 event_id = avrc_command.reg_notif.event_id; - param_len = sizeof(tAVRC_REG_NOTIF_CMD); BTIF_TRACE_EVENT("%s:New register notification received.event_id:%s,label:0x%x,code:%x", __FUNCTION__,dump_rc_notification_event_id(event_id), pmeta_msg->label,pmeta_msg->code); btif_rc_cb.rc_notif[event_id-1].bNotify = TRUE; diff --git a/stack/a2dp/a2d_sbc.c b/stack/a2dp/a2d_sbc.c index 3858b4a21..5e6adeb4e 100644 --- a/stack/a2dp/a2d_sbc.c +++ b/stack/a2dp/a2d_sbc.c @@ -280,14 +280,13 @@ tA2D_STATUS A2D_ParsSbcInfo(tA2D_SBC_CIE *p_ie, UINT8 *p_info, BOOLEAN for_caps) { tA2D_STATUS status; UINT8 losc; - UINT8 mt; if( p_ie == NULL || p_info == NULL) status = A2D_INVALID_PARAMS; else { losc = *p_info++; - mt = *p_info++; + *p_info++; /* If the function is called for the wrong Media Type or Media Codec Type */ if(losc != A2D_SBC_INFO_LEN || *p_info != A2D_MEDIA_CT_SBC) status = A2D_WRONG_CODEC; diff --git a/stack/avct/avct_lcb_act.c b/stack/avct/avct_lcb_act.c index 4ca1745a1..063b16f20 100644 --- a/stack/avct/avct_lcb_act.c +++ b/stack/avct/avct_lcb_act.c @@ -674,6 +674,7 @@ void avct_lcb_msg_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data) /* parse header byte */ AVCT_PRS_HDR(p, label, type, cr_ipid); + UNUSED(type); /* check for invalid cr_ipid */ if (cr_ipid == AVCT_CR_IPID_INVALID) diff --git a/stack/avdt/avdt_msg.c b/stack/avdt/avdt_msg.c index 2f38c3af6..e4980d818 100644 --- a/stack/avdt/avdt_msg.c +++ b/stack/avdt/avdt_msg.c @@ -1719,6 +1719,8 @@ void avdt_msg_ind(tAVDT_CCB *p_ccb, BT_HDR *p_buf) /* parse the message header */ AVDT_MSG_PRS_HDR(p, label, pkt_type, msg_type); + UNUSED(pkt_type); + /* AVDT_TRACE_DEBUG("msg_type=%d", msg_type); */ /* set up label and ccb_idx in message hdr */ msg.hdr.label = label; diff --git a/stack/avdt/avdt_scb_act.c b/stack/avdt/avdt_scb_act.c index 8c46f7b69..12b94e235 100644 --- a/stack/avdt/avdt_scb_act.c +++ b/stack/avdt/avdt_scb_act.c @@ -247,7 +247,6 @@ void avdt_scb_hdl_pkt_no_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data) UINT8 marker; UINT16 seq; UINT32 time_stamp; - UINT32 ssrc; UINT16 offset; UINT16 ex_len; UINT8 pad_len = 0; @@ -259,7 +258,9 @@ void avdt_scb_hdl_pkt_no_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data) AVDT_MSG_PRS_M_PT(p, m_pt, marker); BE_STREAM_TO_UINT16(seq, p); BE_STREAM_TO_UINT32(time_stamp, p); - BE_STREAM_TO_UINT32(ssrc, p); + p += 4; + + UNUSED(o_v); /* skip over any csrc's in packet */ p += o_cc * 4; @@ -336,7 +337,6 @@ UINT8 * avdt_scb_hdl_report(tAVDT_SCB *p_scb, UINT8 *p, UINT16 len) UINT8 *p_start = p; UINT32 ssrc; UINT8 o_v, o_p, o_cc; - UINT16 pkt_len; AVDT_REPORT_TYPE pt; tAVDT_REPORT_DATA report, *p_rpt; @@ -347,9 +347,12 @@ UINT8 * avdt_scb_hdl_report(tAVDT_SCB *p_scb, UINT8 *p, UINT16 len) /* parse report packet header */ AVDT_MSG_PRS_RPT_OCTET1(p, o_v, o_p, o_cc); pt = *p++; - BE_STREAM_TO_UINT16(pkt_len, p); + 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) */ @@ -573,6 +576,9 @@ void avdt_scb_hdl_pkt_frag(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data) BE_STREAM_TO_UINT32(time_stamp, p_payload); BE_STREAM_TO_UINT32(ssrc, p_payload); + UNUSED(o_v); + UNUSED(ssrc); + /* skip over any csrc's in packet */ p_payload += o_cc * 4; diff --git a/stack/bnep/bnep_main.c b/stack/bnep/bnep_main.c index 2e3d959cf..99b91eb0f 100644 --- a/stack/bnep/bnep_main.c +++ b/stack/bnep/bnep_main.c @@ -508,12 +508,11 @@ static void bnep_data_ind (UINT16 l2cap_cid, BT_HDR *p_buf) ** with unknown control extension headers then those should be processed ** according to complain/ignore law */ - UINT8 ext, length, *p_data; + UINT8 ext, length; UINT16 org_len, new_len; /* parse the extension headers and process unknown control headers */ org_len = rem_len; new_len = 0; - p_data = p; do { ext = *p++; diff --git a/stack/btm/btm_acl.c b/stack/btm/btm_acl.c index 54da26046..fd3302c0b 100644 --- a/stack/btm/btm_acl.c +++ b/stack/btm/btm_acl.c @@ -1138,11 +1138,8 @@ void btm_process_remote_ext_features (tACL_CONN *p_acl_cb, UINT8 num_read_pages) void btm_process_remote_ext_features_page (tACL_CONN *p_acl_cb, tBTM_SEC_DEV_REC *p_dev_rec, UINT8 page_idx) { - UINT16 handle; UINT8 req_pend; - handle = p_acl_cb->hci_handle; - memcpy (p_dev_rec->features[page_idx], p_acl_cb->peer_lmp_features[page_idx], HCI_FEATURE_BYTES_PER_PAGE); @@ -1322,13 +1319,13 @@ void btm_read_remote_features_complete (UINT8 *p) void btm_read_remote_ext_features_complete (UINT8 *p) { tACL_CONN *p_acl_cb; - UINT8 status, page_num, max_page; + UINT8 page_num, max_page; UINT16 handle; UINT8 acl_idx; BTM_TRACE_DEBUG ("btm_read_remote_ext_features_complete"); - STREAM_TO_UINT8 (status, p); + ++p; STREAM_TO_UINT16 (handle, p); STREAM_TO_UINT8 (page_num, p); STREAM_TO_UINT8 (max_page, p); diff --git a/stack/btm/btm_ble.c b/stack/btm/btm_ble.c index 58d397112..562280c47 100644 --- a/stack/btm/btm_ble.c +++ b/stack/btm/btm_ble.c @@ -1510,13 +1510,13 @@ static void btm_ble_resolve_random_addr_on_conn_cmpl(void * p_rec, void *p_data) { UINT8 *p = (UINT8 *)p_data; tBTM_SEC_DEV_REC *match_rec = (tBTM_SEC_DEV_REC *) p_rec; - UINT8 role, status, bda_type; + UINT8 role, bda_type; UINT16 handle; BD_ADDR bda; UINT16 conn_interval, conn_latency, conn_timeout; BOOLEAN match = FALSE; - STREAM_TO_UINT8 (status, p); + ++p; STREAM_TO_UINT16 (handle, p); STREAM_TO_UINT8 (role, p); STREAM_TO_UINT8 (bda_type, p); diff --git a/stack/btm/btm_ble_multi_adv.c b/stack/btm/btm_ble_multi_adv.c index ae3aa0b67..aef4ad68b 100644 --- a/stack/btm/btm_ble_multi_adv.c +++ b/stack/btm/btm_ble_multi_adv.c @@ -735,7 +735,7 @@ tBTM_STATUS BTM_BleDisableAdvInstance (UINT8 inst_id) void btm_ble_multi_adv_vse_cback(UINT8 len, UINT8 *p) { UINT8 sub_event; - UINT8 adv_inst, reason, conn_handle, idx; + UINT8 adv_inst, conn_handle, idx; /* Check if this is a BLE RSSI vendor specific event */ STREAM_TO_UINT8(sub_event, p); @@ -745,7 +745,7 @@ void btm_ble_multi_adv_vse_cback(UINT8 len, UINT8 *p) if ((sub_event == HCI_VSE_SUBCODE_BLE_MULTI_ADV_ST_CHG) && (len >= 4)) { STREAM_TO_UINT8(adv_inst, p); - STREAM_TO_UINT8(reason, p); + ++p; STREAM_TO_UINT16(conn_handle, p); if ((idx = btm_handle_to_acl_index(conn_handle)) != MAX_L2CAP_LINKS) diff --git a/stack/btm/btm_pm.c b/stack/btm/btm_pm.c index 7f73cec0c..ddb613394 100644 --- a/stack/btm/btm_pm.c +++ b/stack/btm/btm_pm.c @@ -870,7 +870,7 @@ void btm_pm_proc_ssr_evt (UINT8 *p, UINT16 evt_len) { UINT8 status; UINT16 handle; - UINT16 max_tx_lat, max_rx_lat; + UINT16 max_rx_lat; int xx, yy; tBTM_PM_MCB *p_cb; tACL_CONN *p_acl=NULL; @@ -884,7 +884,7 @@ void btm_pm_proc_ssr_evt (UINT8 *p, UINT16 evt_len) if ((xx = btm_handle_to_acl_index(handle)) >= MAX_L2CAP_LINKS) return; - STREAM_TO_UINT16 (max_tx_lat, p); + p += 2; STREAM_TO_UINT16 (max_rx_lat, p); p_cb = &(btm_cb.pm_mode_db[xx]); diff --git a/stack/btu/btu_hcif.c b/stack/btu/btu_hcif.c index 27e9f0172..b01e77eb2 100644 --- a/stack/btu/btu_hcif.c +++ b/stack/btu/btu_hcif.c @@ -592,11 +592,10 @@ static void btu_hcif_connection_request_evt (UINT8 *p) *******************************************************************************/ static void btu_hcif_disconnection_comp_evt (UINT8 *p) { - UINT8 status; UINT16 handle; UINT8 reason; - STREAM_TO_UINT8 (status, p); + ++p; STREAM_TO_UINT16 (handle, p); STREAM_TO_UINT8 (reason, p); diff --git a/stack/gatt/gatt_api.c b/stack/gatt/gatt_api.c index 32e5ffcb9..d7b06e40b 100644 --- a/stack/gatt/gatt_api.c +++ b/stack/gatt/gatt_api.c @@ -1601,7 +1601,6 @@ BOOLEAN GATT_GetConnIdIfConnected(tGATT_IF gatt_if, BD_ADDR bd_addr, UINT16 *p_c BOOLEAN GATT_Listen (tGATT_IF gatt_if, BOOLEAN start, BD_ADDR_PTR bd_addr) { tGATT_REG *p_reg; - BOOLEAN status = TRUE; GATT_TRACE_API ("GATT_Listen gatt_if=%d", gatt_if); @@ -1614,7 +1613,7 @@ BOOLEAN GATT_Listen (tGATT_IF gatt_if, BOOLEAN start, BD_ADDR_PTR bd_addr) if (bd_addr != NULL) { - status = gatt_update_auto_connect_dev(gatt_if,start, bd_addr, FALSE); + gatt_update_auto_connect_dev(gatt_if,start, bd_addr, FALSE); } else { diff --git a/stack/gatt/gatt_db.c b/stack/gatt/gatt_db.c index b12ff5235..ef4f468b6 100644 --- a/stack/gatt/gatt_db.c +++ b/stack/gatt/gatt_db.c @@ -216,7 +216,6 @@ static tGATT_STATUS read_attr_value (void *p_attr, UINT16 len = 0, uuid16 = 0; UINT8 *p = *p_data; tGATT_STATUS status; - UINT16 read_long_uuid=0; tGATT_ATTR16 *p_attr16 = (tGATT_ATTR16 *)p_attr; GATT_TRACE_DEBUG("read_attr_value uuid=0x%04x perm=0x%0x sec_flag=0x%x offset=%d read_long=%d", @@ -236,12 +235,6 @@ static tGATT_STATUS read_attr_value (void *p_attr, status = GATT_NO_RESOURCES; - if (read_long && - (uuid16 == GATT_UUID_CHAR_DESCRIPTION || uuid16 == GATT_UUID_CHAR_AGG_FORMAT)) - { - read_long_uuid = p_attr16->uuid; - } - if (uuid16 == GATT_UUID_PRI_SERVICE || uuid16 == GATT_UUID_SEC_SERVICE) { len = p_attr16->p_value->uuid.len; diff --git a/stack/hid/hidh_conn.c b/stack/hid/hidh_conn.c index 853e3ed53..d8b619da2 100644 --- a/stack/hid/hidh_conn.c +++ b/stack/hid/hidh_conn.c @@ -321,9 +321,6 @@ void hidh_sec_check_complete_orig (BD_ADDR bd_addr, tBT_TRANSPORT transport, voi { tHID_HOST_DEV_CTB *p_dev = (tHID_HOST_DEV_CTB *) p_ref_data; UINT8 dhandle; -#if (HID_HOST_MAX_CONN_RETRY > 0) - UINT32 cb_res = HID_ERR_AUTH_FAILED; -#endif UINT32 reason; UNUSED(bd_addr); UNUSED (transport); @@ -351,8 +348,6 @@ void hidh_sec_check_complete_orig (BD_ADDR bd_addr, tBT_TRANSPORT transport, voi hidh_conn_retry (dhandle); return; } - else - cb_res = HID_L2CAP_CONN_FAIL | HCI_ERR_PAGE_TIMEOUT ; } #endif p_dev->conn.disc_reason = HID_ERR_AUTH_FAILED; /* Save reason for disconnecting */ @@ -457,13 +452,11 @@ static void hidh_l2cif_config_ind (UINT16 l2cap_cid, tL2CAP_CFG_INFO *p_cfg) { UINT8 dhandle; tHID_CONN *p_hcon = NULL; - tHID_HOST_DEV_CTB *p_dev; UINT32 reason; /* Find CCB based on CID */ if( (dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES ) { - p_dev = &hh_cb.devices[dhandle]; p_hcon = &hh_cb.devices[dhandle].conn; } diff --git a/stack/l2cap/l2c_ble.c b/stack/l2cap/l2c_ble.c index 87b152115..bb885a069 100644 --- a/stack/l2cap/l2c_ble.c +++ b/stack/l2cap/l2c_ble.c @@ -583,8 +583,7 @@ void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, UINT8 *p, UINT16 pkt_len) { UINT8 *p_pkt_end; UINT8 cmd_code, id; - UINT16 cmd_len, rej_reason; - UINT16 result; + UINT16 cmd_len; UINT16 min_interval, max_interval, latency, timeout; p_pkt_end = p + pkt_len; @@ -605,7 +604,7 @@ void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, UINT8 *p, UINT16 pkt_len) case L2CAP_CMD_REJECT: case L2CAP_CMD_ECHO_RSP: case L2CAP_CMD_INFO_RSP: - STREAM_TO_UINT16 (rej_reason, p); + p += 2; break; case L2CAP_CMD_ECHO_REQ: case L2CAP_CMD_INFO_REQ: @@ -648,7 +647,7 @@ void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, UINT8 *p, UINT16 pkt_len) break; case L2CAP_CMD_BLE_UPDATE_RSP: - STREAM_TO_UINT16 (result, p); + p += 2; break; default: diff --git a/stack/mcap/mca_cact.c b/stack/mcap/mca_cact.c index bab3c76db..7ac0efb0d 100644 --- a/stack/mcap/mca_cact.c +++ b/stack/mcap/mca_cact.c @@ -165,7 +165,6 @@ void mca_ccb_snd_rsp(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data) BT_HDR *p_pkt; UINT8 *p, *p_start; BOOLEAN chk_mdl = FALSE; - tMCA_DCB *p_dcb; MCA_TRACE_DEBUG ("mca_ccb_snd_rsp cong=%d req=%d", p_ccb->cong, p_msg->op_code); /* assume that API functions verified the parameters */ @@ -187,7 +186,7 @@ void mca_ccb_snd_rsp(tMCA_CCB *p_ccb, tMCA_CCB_EVT *p_data) if (chk_mdl && p_msg->rsp_code == MCA_RSP_SUCCESS) { - p_dcb = mca_dcb_by_hdl(p_msg->dcb_idx); + mca_dcb_by_hdl(p_msg->dcb_idx); BTM_SetSecurityLevel(FALSE, "", BTM_SEC_SERVICE_MCAP_DATA, p_ccb->sec_mask, p_ccb->p_rcb->reg.data_psm, BTM_SEC_PROTO_MCA, p_msg->dcb_idx); p_ccb->status = MCA_CCB_STAT_PENDING; diff --git a/stack/pan/pan_api.c b/stack/pan/pan_api.c index 6ba97b2b9..61175c62c 100644 --- a/stack/pan/pan_api.c +++ b/stack/pan/pan_api.c @@ -299,7 +299,6 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16 tPAN_CONN *pcb; tBNEP_RESULT result; tBT_UUID src_uuid, dst_uuid; - UINT8 service_id; UINT32 mx_chan_id; /* @@ -343,17 +342,14 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16 src_uuid.uu.uuid16 = UUID_SERVCLASS_PANU; if (dst_role == PAN_ROLE_CLIENT) { - service_id = BTM_SEC_SERVICE_BNEP_PANU; dst_uuid.uu.uuid16 = UUID_SERVCLASS_PANU; } else if (dst_role == PAN_ROLE_GN_SERVER) { - service_id = BTM_SEC_SERVICE_BNEP_GN; dst_uuid.uu.uuid16 = UUID_SERVCLASS_GN; } else { - service_id = BTM_SEC_SERVICE_BNEP_NAP; dst_uuid.uu.uuid16 = UUID_SERVCLASS_NAP; } mx_chan_id = dst_uuid.uu.uuid16; @@ -370,12 +366,10 @@ tPAN_RESULT PAN_Connect (BD_ADDR rem_bda, UINT8 src_role, UINT8 dst_role, UINT16 dst_uuid.uu.uuid16 = UUID_SERVCLASS_PANU; if (src_role == PAN_ROLE_GN_SERVER) { - service_id = BTM_SEC_SERVICE_BNEP_GN; src_uuid.uu.uuid16 = UUID_SERVCLASS_GN; } else { - service_id = BTM_SEC_SERVICE_BNEP_NAP; src_uuid.uu.uuid16 = UUID_SERVCLASS_NAP; } mx_chan_id = src_uuid.uu.uuid16; diff --git a/stack/sdp/sdp_discovery.c b/stack/sdp/sdp_discovery.c index 91733d80c..c56459d3f 100644 --- a/stack/sdp/sdp_discovery.c +++ b/stack/sdp/sdp_discovery.c @@ -351,7 +351,6 @@ static void sdp_copy_raw_data (tCONN_CB *p_ccb, BOOLEAN offset) unsigned int cpy_len; UINT32 list_len; UINT8 *p; - UINT8 * p_temp; UINT8 type; UINT32 delta_len = 0; @@ -370,7 +369,7 @@ static void sdp_copy_raw_data (tCONN_CB *p_ccb, BOOLEAN offset) { cpy_len = p_ccb->p_db->raw_size - p_ccb->p_db->raw_used; list_len = p_ccb->list_len; - p_temp = p = &p_ccb->rsp_list[0]; + p = &p_ccb->rsp_list[0]; if(offset) { -- 2.11.0