diff --git a/system/bta/ag/bta_ag_main.cc b/system/bta/ag/bta_ag_main.cc
index 44965eafb74b2b62152400f82eb2de7a9cd8db71..0d8d605e3cc8685e6ceadc5650dc354a13753987 100644
--- a/system/bta/ag/bta_ag_main.cc
+++ b/system/bta/ag/bta_ag_main.cc
@@ -668,7 +668,8 @@ static void bta_ag_api_register(tBTA_AG_DATA* p_data) {
tBTA_AG_REGISTER reg;
/* allocate an scb */
- if ((p_scb = bta_ag_scb_alloc()) != NULL) {
+ p_scb = bta_ag_scb_alloc();
+ if (p_scb != NULL) {
APPL_TRACE_DEBUG("bta_ag_api_register: p_scb 0x%08x ", p_scb);
bta_ag_sm_execute(p_scb, p_data->hdr.event, p_data);
} else {
@@ -692,7 +693,8 @@ static void bta_ag_api_result(tBTA_AG_DATA* p_data) {
int i;
if (p_data->hdr.layer_specific != BTA_AG_HANDLE_ALL) {
- if ((p_scb = bta_ag_scb_by_idx(p_data->hdr.layer_specific)) != NULL) {
+ p_scb = bta_ag_scb_by_idx(p_data->hdr.layer_specific);
+ if (p_scb != NULL) {
APPL_TRACE_DEBUG("bta_ag_api_result: p_scb 0x%08x ", p_scb);
bta_ag_sm_execute(p_scb, BTA_AG_API_RESULT_EVT, p_data);
}
@@ -753,7 +755,8 @@ void bta_ag_sm_execute(tBTA_AG_SCB* p_scb, uint16_t event,
/* execute action functions */
for (i = 0; i < BTA_AG_ACTIONS; i++) {
- if ((action = state_table[event][i]) != BTA_AG_IGNORE) {
+ action = state_table[event][i];
+ if (action != BTA_AG_IGNORE) {
(*bta_ag_action[action])(p_scb, p_data);
} else {
break;
@@ -805,7 +808,8 @@ bool bta_ag_hdl_event(BT_HDR* p_msg) {
/* all others reference scb by handle */
default:
- if ((p_scb = bta_ag_scb_by_idx(p_msg->layer_specific)) != NULL) {
+ p_scb = bta_ag_scb_by_idx(p_msg->layer_specific);
+ if (p_scb != NULL) {
APPL_TRACE_DEBUG("bta_ag_hdl_event: p_scb 0x%08x ", p_scb);
bta_ag_sm_execute(p_scb, p_msg->event, (tBTA_AG_DATA*)p_msg);
}
diff --git a/system/bta/ag/bta_ag_rfc.cc b/system/bta/ag/bta_ag_rfc.cc
index 22be8031ed03e66247fea557bded46fad78302b2..fcf61a146c920503c4cc52fc8186570bc1579148 100644
--- a/system/bta/ag/bta_ag_rfc.cc
+++ b/system/bta/ag/bta_ag_rfc.cc
@@ -79,7 +79,8 @@ static void bta_ag_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_handle,
uint16_t handle) {
tBTA_AG_SCB* p_scb;
- if ((p_scb = bta_ag_scb_by_idx(handle)) != NULL) {
+ p_scb = bta_ag_scb_by_idx(handle);
+ if (p_scb != NULL) {
/* ignore port events for port handles other than connected handle */
if (port_handle != p_scb->conn_handle) {
APPL_TRACE_DEBUG(
@@ -115,7 +116,8 @@ static void bta_ag_mgmt_cback(uint32_t code, uint16_t port_handle,
APPL_TRACE_DEBUG("ag_mgmt_cback : code = %d, port_handle = %d, handle = %d",
code, port_handle, handle);
- if ((p_scb = bta_ag_scb_by_idx(handle)) != NULL) {
+ p_scb = bta_ag_scb_by_idx(handle);
+ if (p_scb != NULL) {
/* ignore close event for port handles other than connected handle */
if ((code != PORT_SUCCESS) && (port_handle != p_scb->conn_handle)) {
APPL_TRACE_DEBUG("ag_mgmt_cback ignoring handle:%d", port_handle);
diff --git a/system/bta/ag/bta_ag_sdp.cc b/system/bta/ag/bta_ag_sdp.cc
index 957bf8b0e4ae038e1228b589fc09d92bece31bee..5481fc6f52e1fa7009d1064d238fb5e0d204cf3f 100644
--- a/system/bta/ag/bta_ag_sdp.cc
+++ b/system/bta/ag/bta_ag_sdp.cc
@@ -72,7 +72,8 @@ static void bta_ag_sdp_cback(uint16_t status, uint8_t idx) {
APPL_TRACE_DEBUG("%s status:0x%x", __func__, status);
- if ((p_scb = bta_ag_scb_by_idx(idx)) != NULL) {
+ p_scb = bta_ag_scb_by_idx(idx);
+ if (p_scb != NULL) {
/* set event according to int/acp */
if (p_scb->role == BTA_AG_ACP) {
event = BTA_AG_DISC_ACP_RES_EVT;
@@ -303,12 +304,13 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) {
/* loop through all records we found */
while (true) {
/* get next record; if none found, we're done */
- if ((p_rec = SDP_FindServiceInDb(p_scb->p_disc_db, uuid, p_rec)) == NULL) {
+ p_rec = SDP_FindServiceInDb(p_scb->p_disc_db, uuid, p_rec);
+ if (p_rec == NULL) {
if (uuid == UUID_SERVCLASS_HEADSET_HS) {
/* Search again in case the peer device is HSP v1.0 */
uuid = UUID_SERVCLASS_HEADSET;
- if ((p_rec = SDP_FindServiceInDb(p_scb->p_disc_db, uuid, p_rec)) ==
- NULL) {
+ p_rec = SDP_FindServiceInDb(p_scb->p_disc_db, uuid, p_rec);
+ if (p_rec == NULL) {
break;
}
} else
@@ -329,8 +331,8 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) {
/* get features if HFP */
if (service & BTA_HFP_SERVICE_MASK) {
- if ((p_attr = SDP_FindAttributeInRec(
- p_rec, ATTR_ID_SUPPORTED_FEATURES)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_FEATURES);
+ if (p_attr != NULL) {
/* Found attribute. Get value. */
/* There might be race condition between SDP and BRSF. */
/* Do not update if we already received BRSF. */
@@ -339,8 +341,9 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) {
}
} else /* HSP */
{
- if ((p_attr = SDP_FindAttributeInRec(
- p_rec, ATTR_ID_REMOTE_AUDIO_VOLUME_CONTROL)) != NULL) {
+ p_attr =
+ SDP_FindAttributeInRec(p_rec, ATTR_ID_REMOTE_AUDIO_VOLUME_CONTROL);
+ if (p_attr != NULL) {
/* Remote volume control of HSP */
if (p_attr->attr_value.v.u8)
p_scb->peer_features |= BTA_AG_PEER_FEAT_VOL;
diff --git a/system/bta/av/bta_av_act.cc b/system/bta/av/bta_av_act.cc
index 2a536595f58945189510ba6ce92e85f05d0754b5..e06a305e07aa13606d40e325a280ea026214ff6f 100644
--- a/system/bta/av/bta_av_act.cc
+++ b/system/bta/av/bta_av_act.cc
@@ -316,7 +316,8 @@ uint8_t bta_av_rc_create(tBTA_AV_CB* p_cb, uint8_t role, uint8_t shdl,
bda = p_scb->peer_addr;
status = BTA_AV_RC_ROLE_INT;
} else {
- if ((p_rcb = bta_av_get_rcb_by_shdl(shdl)) != NULL) {
+ p_rcb = bta_av_get_rcb_by_shdl(shdl);
+ if (p_rcb != NULL) {
APPL_TRACE_ERROR("bta_av_rc_create ACP handle exist for shdl:%d", shdl);
return p_rcb->handle;
}
@@ -868,8 +869,8 @@ void bta_av_rc_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) {
p_data->rc_msg.msg.pass.p_pass_data, is_inquiry);
#endif
} else if (((p_data->rc_msg.msg.pass.op_id == AVRC_ID_VOL_UP) ||
- (p_data->rc_msg.msg.pass.op_id == AVRC_ID_VOL_DOWN)) &&
- !strcmp(avrcp_ct_support, "true")) {
+ (p_data->rc_msg.msg.pass.op_id == AVRC_ID_VOL_DOWN)) &&
+ !strcmp(avrcp_ct_support, "true")) {
p_data->rc_msg.msg.hdr.ctype = BTA_AV_RSP_ACCEPT;
} else {
p_data->rc_msg.msg.hdr.ctype =
@@ -1603,8 +1604,8 @@ tBTA_AV_FEAT bta_av_check_peer_features(uint16_t service_uuid) {
/* loop through all records we found */
while (true) {
/* get next record; if none found, we're done */
- if ((p_rec = SDP_FindServiceInDb(p_cb->p_disc_db, service_uuid, p_rec)) ==
- NULL) {
+ p_rec = SDP_FindServiceInDb(p_cb->p_disc_db, service_uuid, p_rec);
+ if (p_rec == NULL) {
break;
}
@@ -1633,8 +1634,8 @@ tBTA_AV_FEAT bta_av_check_peer_features(uint16_t service_uuid) {
if (peer_rc_version >= AVRC_REV_1_4) {
peer_features |= (BTA_AV_FEAT_ADV_CTRL);
/* get supported categories */
- if ((p_attr = SDP_FindAttributeInRec(
- p_rec, ATTR_ID_SUPPORTED_FEATURES)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_FEATURES);
+ if (p_attr != NULL) {
categories = p_attr->attr_value.v.u16;
if (categories & AVRC_SUPF_CT_BROWSE)
peer_features |= (BTA_AV_FEAT_BROWSE);
diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc
index 702e75987f8ce688e5694d00bbaa161f2e0956d1..ee719dcbe6add7975600d8d036a9a469b5020d2b 100644
--- a/system/bta/av/bta_av_main.cc
+++ b/system/bta/av/bta_av_main.cc
@@ -1120,7 +1120,8 @@ void bta_av_sm_execute(tBTA_AV_CB* p_cb, uint16_t event, tBTA_AV_DATA* p_data) {
APPL_TRACE_EVENT("next state=%d event offset:%d", p_cb->state, event);
/* execute action functions */
- if ((action = state_table[event][BTA_AV_ACTION_COL]) != BTA_AV_IGNORE) {
+ action = state_table[event][BTA_AV_ACTION_COL];
+ if (action != BTA_AV_IGNORE) {
APPL_TRACE_EVENT("%s action executed %d", __func__, action);
(*bta_av_action[action])(p_cb, p_data);
}
diff --git a/system/bta/av/bta_av_ssm.cc b/system/bta/av/bta_av_ssm.cc
index 1578c224c13c529ef1f5795622711d17c104b2a7..05d5446237ab52691cf165bfb1466bf612e6e22c 100644
--- a/system/bta/av/bta_av_ssm.cc
+++ b/system/bta/av/bta_av_ssm.cc
@@ -548,7 +548,8 @@ void bta_av_ssm_execute(tBTA_AV_SCB* p_scb, uint16_t event,
/* execute action functions */
for (i = 0; i < BTA_AV_SACTIONS; i++) {
- if ((action = state_table[event][i]) != BTA_AV_SIGNORE) {
+ action = state_table[event][i];
+ if (action != BTA_AV_SIGNORE) {
(*p_scb->p_act_tbl[action])(p_scb, p_data);
} else
break;
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index 2e112fc14e4373e0404c0f36ad2bd33e55811e84..56cda90e85e207a5f4fe800c1e53b1b2347c616f 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -1400,7 +1400,8 @@ void bta_dm_inq_cmpl(tBTA_DM_MSG* p_data) {
data.inq_cmpl.num_resps = p_data->inq_cmpl.num;
bta_dm_search_cb.p_search_cback(BTA_DM_INQ_CMPL_EVT, &data);
- if ((bta_dm_search_cb.p_btm_inq_info = BTM_InqDbFirst()) != NULL) {
+ bta_dm_search_cb.p_btm_inq_info = BTM_InqDbFirst();
+ if (bta_dm_search_cb.p_btm_inq_info != NULL) {
/* start name and service discovery from the first device on inquiry result
*/
bta_dm_search_cb.name_discover_done = false;
@@ -2030,8 +2031,9 @@ static void bta_dm_discover_next_device(void) {
APPL_TRACE_DEBUG("bta_dm_discover_next_device");
/* searching next device on inquiry result */
- if ((bta_dm_search_cb.p_btm_inq_info =
- BTM_InqDbNext(bta_dm_search_cb.p_btm_inq_info)) != NULL) {
+ bta_dm_search_cb.p_btm_inq_info =
+ BTM_InqDbNext(bta_dm_search_cb.p_btm_inq_info);
+ if (bta_dm_search_cb.p_btm_inq_info != NULL) {
bta_dm_search_cb.name_discover_done = false;
bta_dm_search_cb.peer_name[0] = 0;
bta_dm_discover_device(
@@ -2229,7 +2231,8 @@ static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, uint8_t* p_eir) {
/* application will parse EIR to find out remote device name */
result.inq_res.p_eir = p_eir;
- if ((p_inq_info = BTM_InqDbRead(p_inq->remote_bd_addr)) != NULL) {
+ p_inq_info = BTM_InqDbRead(p_inq->remote_bd_addr);
+ if (p_inq_info != NULL) {
/* initialize remt_name_not_required to false so that we get the name by
* default */
result.inq_res.remt_name_not_required = false;
@@ -3344,9 +3347,10 @@ static char* bta_dm_get_remname(void) {
char* p_temp;
/* If the name isn't already stored, try retrieving from BTM */
- if (*p_name == '\0')
- if ((p_temp = BTM_SecReadDevName(bta_dm_search_cb.peer_bdaddr)) != NULL)
- p_name = p_temp;
+ if (*p_name == '\0') {
+ p_temp = BTM_SecReadDevName(bta_dm_search_cb.peer_bdaddr);
+ if (p_temp != NULL) p_name = p_temp;
+ }
return p_name;
}
@@ -3917,7 +3921,8 @@ static void bta_dm_observe_results_cb(tBTM_INQ_RESULTS* p_inq, uint8_t* p_eir) {
/* application will parse EIR to find out remote device name */
result.inq_res.p_eir = p_eir;
- if ((p_inq_info = BTM_InqDbRead(p_inq->remote_bd_addr)) != NULL) {
+ p_inq_info = BTM_InqDbRead(p_inq->remote_bd_addr);
+ if (p_inq_info != NULL) {
/* initialize remt_name_not_required to false so that we get the name by
* default */
result.inq_res.remt_name_not_required = false;
@@ -4320,9 +4325,9 @@ void bta_dm_ble_observe(tBTA_DM_MSG* p_data) {
if (p_data->ble_observe.start) {
/*Save the callback to be called when a scan results are available */
bta_dm_search_cb.p_scan_cback = p_data->ble_observe.p_cback;
- if ((status = BTM_BleObserve(true, p_data->ble_observe.duration,
- bta_dm_observe_results_cb,
- bta_dm_observe_cmpl_cb)) != BTM_CMD_STARTED) {
+ status = BTM_BleObserve(true, p_data->ble_observe.duration,
+ bta_dm_observe_results_cb, bta_dm_observe_cmpl_cb);
+ if (status != BTM_CMD_STARTED) {
tBTA_DM_SEARCH data;
APPL_TRACE_WARNING(" %s BTM_BleObserve failed. status %d", __func__,
status);
@@ -4591,13 +4596,13 @@ void bta_dm_cfg_filter_cond(tBTA_DM_MSG* p_data) {
APPL_TRACE_DEBUG("bta_dm_cfg_filter_cond");
BTM_BleGetVendorCapabilities(&cmn_vsc_cb);
if (0 != cmn_vsc_cb.filter_support) {
- if ((st = BTM_BleCfgFilterCondition(
- p_data->ble_cfg_filter_cond.action,
- p_data->ble_cfg_filter_cond.cond_type,
- (tBTM_BLE_PF_FILT_INDEX)p_data->ble_cfg_filter_cond.filt_index,
- (tBTM_BLE_PF_COND_PARAM*)p_data->ble_cfg_filter_cond.p_cond_param,
- bta_ble_scan_cfg_cmpl, p_data->ble_cfg_filter_cond.ref_value)) ==
- BTM_CMD_STARTED) {
+ st = BTM_BleCfgFilterCondition(
+ p_data->ble_cfg_filter_cond.action,
+ p_data->ble_cfg_filter_cond.cond_type,
+ (tBTM_BLE_PF_FILT_INDEX)p_data->ble_cfg_filter_cond.filt_index,
+ (tBTM_BLE_PF_COND_PARAM*)p_data->ble_cfg_filter_cond.p_cond_param,
+ bta_ble_scan_cfg_cmpl, p_data->ble_cfg_filter_cond.ref_value);
+ if (st == BTM_CMD_STARTED) {
bta_dm_cb.p_scan_filt_cfg_cback =
p_data->ble_cfg_filter_cond.p_filt_cfg_cback;
return;
@@ -4629,11 +4634,11 @@ void bta_dm_enable_scan_filter(tBTA_DM_MSG* p_data) {
BTM_BleGetVendorCapabilities(&cmn_vsc_cb);
if (0 != cmn_vsc_cb.filter_support) {
- if ((st = BTM_BleEnableDisableFilterFeature(
- p_data->ble_enable_scan_filt.action,
- p_data->ble_enable_scan_filt.p_filt_status_cback,
- (tBTM_BLE_REF_VALUE)p_data->ble_enable_scan_filt.ref_value)) ==
- BTM_CMD_STARTED)
+ st = BTM_BleEnableDisableFilterFeature(
+ p_data->ble_enable_scan_filt.action,
+ p_data->ble_enable_scan_filt.p_filt_status_cback,
+ (tBTM_BLE_REF_VALUE)p_data->ble_enable_scan_filt.ref_value);
+ if (st == BTM_CMD_STARTED)
bta_dm_cb.p_scan_filt_status_cback =
p_data->ble_enable_scan_filt.p_filt_status_cback;
return;
@@ -4663,14 +4668,15 @@ void bta_dm_scan_filter_param_setup(tBTA_DM_MSG* p_data) {
APPL_TRACE_DEBUG("bta_dm_scan_filter_param_setup");
BTM_BleGetVendorCapabilities(&cmn_vsc_cb);
if (0 != cmn_vsc_cb.filter_support) {
- if ((st = BTM_BleAdvFilterParamSetup(
- p_data->ble_scan_filt_param_setup.action,
- p_data->ble_scan_filt_param_setup.filt_index,
- (tBTM_BLE_PF_FILT_PARAMS*)&p_data->ble_scan_filt_param_setup
- .filt_params,
- p_data->ble_scan_filt_param_setup.p_target,
- p_data->ble_scan_filt_param_setup.p_filt_param_cback,
- p_data->ble_scan_filt_param_setup.ref_value)) == BTM_CMD_STARTED) {
+ st = BTM_BleAdvFilterParamSetup(
+ p_data->ble_scan_filt_param_setup.action,
+ p_data->ble_scan_filt_param_setup.filt_index,
+ (tBTM_BLE_PF_FILT_PARAMS*)&p_data->ble_scan_filt_param_setup
+ .filt_params,
+ p_data->ble_scan_filt_param_setup.p_target,
+ p_data->ble_scan_filt_param_setup.p_filt_param_cback,
+ p_data->ble_scan_filt_param_setup.ref_value);
+ if (st == BTM_CMD_STARTED) {
bta_dm_cb.p_scan_filt_param_cback =
p_data->ble_scan_filt_param_setup.p_filt_param_cback;
return;
diff --git a/system/bta/dm/bta_dm_main.cc b/system/bta/dm/bta_dm_main.cc
index b8c572b6d8e59fd696fbaf932f97870f544fcf41..3d25691e0fa0b43dc59a1d37ca057b31a37c95ae 100644
--- a/system/bta/dm/bta_dm_main.cc
+++ b/system/bta/dm/bta_dm_main.cc
@@ -343,8 +343,8 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) {
/* execute action functions */
for (i = 0; i < BTA_DM_SEARCH_ACTIONS; i++) {
- if ((action = state_table[p_msg->event & 0x00ff][i]) !=
- BTA_DM_SEARCH_IGNORE) {
+ action = state_table[p_msg->event & 0x00ff][i];
+ if (action != BTA_DM_SEARCH_IGNORE) {
(*bta_dm_search_action[action])((tBTA_DM_MSG*)p_msg);
} else {
break;
diff --git a/system/bta/dm/bta_dm_pm.cc b/system/bta/dm/bta_dm_pm.cc
index a857b9769cf08ae78d5e90831be3e9de7929204b..e65979672f66818bd7d02f3f83ac25903ede0456 100644
--- a/system/bta/dm/bta_dm_pm.cc
+++ b/system/bta/dm/bta_dm_pm.cc
@@ -578,8 +578,8 @@ static void bta_dm_pm_set_mode(BD_ADDR peer_addr, tBTA_DM_PM_ACTION pm_request,
for (i = 0; i < BTA_DM_NUM_PM_TIMER; i++) {
if (bta_dm_cb.pm_timer[i].in_use &&
bdcmp(bta_dm_cb.pm_timer[i].peer_bdaddr, peer_addr) == 0) {
- if ((timer_idx = bta_pm_action_to_timer_idx(pm_action)) !=
- BTA_DM_PM_MODE_TIMER_MAX) {
+ timer_idx = bta_pm_action_to_timer_idx(pm_action);
+ if (timer_idx != BTA_DM_PM_MODE_TIMER_MAX) {
remaining_ms =
alarm_get_remaining_ms(bta_dm_cb.pm_timer[i].timer[timer_idx]);
if (remaining_ms < timeout_ms) {
@@ -607,8 +607,8 @@ static void bta_dm_pm_set_mode(BD_ADDR peer_addr, tBTA_DM_PM_ACTION pm_request,
if (!timer_started) {
if (available_timer != BTA_DM_PM_MODE_TIMER_MAX) {
bdcpy(bta_dm_cb.pm_timer[available_timer].peer_bdaddr, peer_addr);
- if ((timer_idx = bta_pm_action_to_timer_idx(pm_action)) !=
- BTA_DM_PM_MODE_TIMER_MAX) {
+ timer_idx = bta_pm_action_to_timer_idx(pm_action);
+ if (timer_idx != BTA_DM_PM_MODE_TIMER_MAX) {
bta_dm_pm_start_timer(&bta_dm_cb.pm_timer[available_timer], timer_idx,
timeout_ms, p_srvcs->id, pm_action);
timer_started = true;
diff --git a/system/bta/gatt/bta_gattc_act.cc b/system/bta/gatt/bta_gattc_act.cc
index 40b8c49fc348afc15fe9f51075fb80283840af9f..5504da1fe9fbf323fe5bf459e3840ac436126e1f 100644
--- a/system/bta/gatt/bta_gattc_act.cc
+++ b/system/bta/gatt/bta_gattc_act.cc
@@ -287,9 +287,10 @@ void bta_gattc_process_api_open(tBTA_GATTC_DATA* p_msg) {
if (p_clreg != NULL) {
if (p_msg->api_conn.is_direct) {
- if ((p_clcb = bta_gattc_find_alloc_clcb(
- p_msg->api_conn.client_if, p_msg->api_conn.remote_bda,
- p_msg->api_conn.transport)) != NULL) {
+ p_clcb = bta_gattc_find_alloc_clcb(p_msg->api_conn.client_if,
+ p_msg->api_conn.remote_bda,
+ p_msg->api_conn.transport);
+ if (p_clcb != NULL) {
bta_gattc_sm_execute(p_clcb, event, p_msg);
} else {
APPL_TRACE_ERROR("No resources to open a new connection.");
@@ -322,9 +323,10 @@ void bta_gattc_process_api_open_cancel(tBTA_GATTC_DATA* p_msg) {
tBTA_GATTC cb_data;
if (p_msg->api_cancel_conn.is_direct) {
- if ((p_clcb = bta_gattc_find_clcb_by_cif(p_msg->api_cancel_conn.client_if,
- p_msg->api_cancel_conn.remote_bda,
- BTA_GATT_TRANSPORT_LE)) != NULL) {
+ p_clcb = bta_gattc_find_clcb_by_cif(p_msg->api_cancel_conn.client_if,
+ p_msg->api_cancel_conn.remote_bda,
+ BTA_GATT_TRANSPORT_LE);
+ if (p_clcb != NULL) {
bta_gattc_sm_execute(p_clcb, event, p_msg);
} else {
APPL_TRACE_ERROR("No such connection need to be cancelled");
@@ -481,9 +483,9 @@ void bta_gattc_init_bk_conn(tBTA_GATTC_API_OPEN* p_data,
/* if is a connected remote device */
if (GATT_GetConnIdIfConnected(p_data->client_if, p_data->remote_bda,
&conn_id, p_data->transport)) {
- if ((p_clcb = bta_gattc_find_alloc_clcb(
- p_data->client_if, p_data->remote_bda,
- BTA_GATT_TRANSPORT_LE)) != NULL) {
+ p_clcb = bta_gattc_find_alloc_clcb(
+ p_data->client_if, p_data->remote_bda, BTA_GATT_TRANSPORT_LE);
+ if (p_clcb != NULL) {
gattc_data.hdr.layer_specific = p_clcb->bta_conn_id = conn_id;
/* open connection */
@@ -843,8 +845,8 @@ void bta_gattc_start_discover(tBTA_GATTC_CLCB* p_clcb,
/* set all srcb related clcb into discovery ST */
bta_gattc_set_discover_st(p_clcb->p_srcb);
- if ((p_clcb->status = bta_gattc_init_cache(p_clcb->p_srcb)) ==
- BTA_GATT_OK) {
+ p_clcb->status = bta_gattc_init_cache(p_clcb->p_srcb);
+ if (p_clcb->status == BTA_GATT_OK) {
p_clcb->status = bta_gattc_discover_pri_service(
p_clcb->bta_conn_id, p_clcb->p_srcb, GATT_DISC_SRVC_ALL);
}
@@ -1567,14 +1569,16 @@ void bta_gattc_process_indicate(uint16_t conn_id, tGATTC_OPTYPE op,
return;
}
- if ((p_clrcb = bta_gattc_cl_get_regcb(gatt_if)) == NULL) {
+ p_clrcb = bta_gattc_cl_get_regcb(gatt_if);
+ if (p_clrcb == NULL) {
APPL_TRACE_ERROR("%s indication/notif for unregistered app", __func__);
if (op == GATTC_OPTYPE_INDICATION)
GATTC_SendHandleValueConfirm(conn_id, handle);
return;
}
- if ((p_srcb = bta_gattc_find_srcb(remote_bda)) == NULL) {
+ p_srcb = bta_gattc_find_srcb(remote_bda);
+ if (p_srcb == NULL) {
APPL_TRACE_ERROR("%s indication/notif for unknown device, ignore",
__func__);
if (op == GATTC_OPTYPE_INDICATION)
@@ -1637,10 +1641,13 @@ static void bta_gattc_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op,
return;
}
/* for all other operation, not expected if w/o connection */
- else if ((p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id)) == NULL) {
- APPL_TRACE_ERROR("bta_gattc_cmpl_cback unknown conn_id = %d, ignore data",
- conn_id);
- return;
+ else {
+ p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);
+ if (p_clcb == NULL) {
+ APPL_TRACE_ERROR(
+ "bta_gattc_cmpl_cback unknown conn_id = %d, ignore data", conn_id);
+ return;
+ }
}
/* if over BR_EDR, inform PM for mode change */
@@ -1693,7 +1700,8 @@ static void bta_gattc_cong_cback(uint16_t conn_id, bool congested) {
tBTA_GATTC_CLCB* p_clcb;
tBTA_GATTC cb_data;
- if ((p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id)) != NULL) {
+ p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);
+ if (p_clcb != NULL) {
if (p_clcb->p_rcb->p_cback) {
cb_data.congest.conn_id = conn_id;
cb_data.congest.congested = congested;
diff --git a/system/bta/gatt/bta_gattc_api.cc b/system/bta/gatt/bta_gattc_api.cc
index 11c574ef19638909c80e09ecf626dd3d566ab84c..108812e1027951922ecd7c6b6d7ce127c54df308 100644
--- a/system/bta/gatt/bta_gattc_api.cc
+++ b/system/bta/gatt/bta_gattc_api.cc
@@ -597,7 +597,8 @@ tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications(tBTA_GATTC_IF client_if,
return status;
}
- if ((p_clreg = bta_gattc_cl_get_regcb(client_if)) != NULL) {
+ p_clreg = bta_gattc_cl_get_regcb(client_if);
+ if (p_clreg != NULL) {
for (i = 0; i < BTA_GATTC_NOTIF_REG_MAX; i++) {
if (p_clreg->notif_reg[i].in_use &&
!memcmp(p_clreg->notif_reg[i].remote_bda, bda, BD_ADDR_LEN) &&
diff --git a/system/bta/gatt/bta_gattc_main.cc b/system/bta/gatt/bta_gattc_main.cc
index 56053b634c1d8b8b40d7f018dedc1468f93c0bb1..3fe0d665fbc3edf06e4e15845463200624ddf686 100644
--- a/system/bta/gatt/bta_gattc_main.cc
+++ b/system/bta/gatt/bta_gattc_main.cc
@@ -325,7 +325,8 @@ bool bta_gattc_sm_execute(tBTA_GATTC_CLCB* p_clcb, uint16_t event,
/* execute action functions */
for (i = 0; i < BTA_GATTC_ACTIONS; i++) {
- if ((action = state_table[event][i]) != BTA_GATTC_IGNORE) {
+ action = state_table[event][i];
+ if (action != BTA_GATTC_IGNORE) {
(*bta_gattc_action[action])(p_clcb, p_data);
if (p_clcb->p_q_cmd == p_data) {
/* buffer is queued, don't free in the bta dispatcher.
diff --git a/system/bta/gatt/bta_gattc_utils.cc b/system/bta/gatt/bta_gattc_utils.cc
index 50967e073159a3cdd8866734903b9b364c929368..3b305844fc8820962673a02dac67c8691cc72fff 100644
--- a/system/bta/gatt/bta_gattc_utils.cc
+++ b/system/bta/gatt/bta_gattc_utils.cc
@@ -212,7 +212,8 @@ tBTA_GATTC_CLCB* bta_gattc_clcb_alloc(tBTA_GATTC_IF client_if,
p_clcb->p_rcb = bta_gattc_cl_get_regcb(client_if);
- if ((p_clcb->p_srcb = bta_gattc_find_srcb(remote_bda)) == NULL)
+ p_clcb->p_srcb = bta_gattc_find_srcb(remote_bda);
+ if (p_clcb->p_srcb == NULL)
p_clcb->p_srcb = bta_gattc_srcb_alloc(remote_bda);
if (p_clcb->p_rcb != NULL && p_clcb->p_srcb != NULL) {
@@ -242,8 +243,8 @@ tBTA_GATTC_CLCB* bta_gattc_find_alloc_clcb(tBTA_GATTC_IF client_if,
tBTA_TRANSPORT transport) {
tBTA_GATTC_CLCB* p_clcb;
- if ((p_clcb = bta_gattc_find_clcb_by_cif(client_if, remote_bda, transport)) ==
- NULL) {
+ p_clcb = bta_gattc_find_clcb_by_cif(client_if, remote_bda, transport);
+ if (p_clcb == NULL) {
p_clcb = bta_gattc_clcb_alloc(client_if, remote_bda, transport);
}
return p_clcb;
@@ -443,7 +444,8 @@ void bta_gattc_clear_notif_registration(tBTA_GATTC_SERV* p_srcb,
uint16_t handle;
if (GATT_GetConnectionInfor(conn_id, &gatt_if, remote_bda, &transport)) {
- if ((p_clrcb = bta_gattc_cl_get_regcb(gatt_if)) != NULL) {
+ p_clrcb = bta_gattc_cl_get_regcb(gatt_if);
+ if (p_clrcb != NULL) {
for (i = 0; i < BTA_GATTC_NOTIF_REG_MAX; i++) {
if (p_clrcb->notif_reg[i].in_use &&
!bdcmp(p_clrcb->notif_reg[i].remote_bda, remote_bda)) {
@@ -691,9 +693,10 @@ tBTA_GATTC_CLCB* bta_gattc_find_int_conn_clcb(tBTA_GATTC_DATA* p_msg) {
bta_gattc_conn_find_alloc(p_msg->int_conn.remote_bda);
/* try to locate a logic channel */
- if ((p_clcb = bta_gattc_find_clcb_by_cif(
- p_msg->int_conn.client_if, p_msg->int_conn.remote_bda,
- p_msg->int_conn.transport)) == NULL) {
+ p_clcb = bta_gattc_find_clcb_by_cif(p_msg->int_conn.client_if,
+ p_msg->int_conn.remote_bda,
+ p_msg->int_conn.transport);
+ if (p_clcb == NULL) {
/* for a background connection or listening connection */
if (/*p_msg->int_conn.role == HCI_ROLE_SLAVE || */
bta_gattc_check_bg_conn(p_msg->int_conn.client_if,
@@ -722,8 +725,8 @@ tBTA_GATTC_CLCB* bta_gattc_find_int_disconn_clcb(tBTA_GATTC_DATA* p_msg) {
tBTA_GATTC_CLCB* p_clcb = NULL;
bta_gattc_conn_dealloc(p_msg->int_conn.remote_bda);
- if ((p_clcb = bta_gattc_find_clcb_by_conn_id(
- p_msg->int_conn.hdr.layer_specific)) == NULL) {
+ p_clcb = bta_gattc_find_clcb_by_conn_id(p_msg->int_conn.hdr.layer_specific);
+ if (p_clcb == NULL) {
/* connection attempt failed, send connection callback event */
p_clcb = bta_gattc_find_clcb_by_cif(p_msg->int_conn.client_if,
p_msg->int_conn.remote_bda,
diff --git a/system/bta/gatt/bta_gatts_act.cc b/system/bta/gatt/bta_gatts_act.cc
index 3346b31696dda9401dcbd18ddd5be1eac6ee3185..fb5fcf84b2002cb56f5d36f786212f5504a9e377 100644
--- a/system/bta/gatt/bta_gatts_act.cc
+++ b/system/bta/gatt/bta_gatts_act.cc
@@ -419,8 +419,8 @@ void bta_gatts_open(UNUSED_ATTR tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg) {
tBTA_GATT_STATUS status = BTA_GATT_ERROR;
uint16_t conn_id;
- if ((p_rcb = bta_gatts_find_app_rcb_by_app_if(p_msg->api_open.server_if)) !=
- NULL) {
+ p_rcb = bta_gatts_find_app_rcb_by_app_if(p_msg->api_open.server_if);
+ if (p_rcb != NULL) {
/* should always get the connection ID */
if (GATT_Connect(p_rcb->gatt_if, p_msg->api_open.remote_bda,
p_msg->api_open.is_direct, p_msg->api_open.transport,
@@ -453,8 +453,8 @@ void bta_gatts_cancel_open(UNUSED_ATTR tBTA_GATTS_CB* p_cb,
tBTA_GATTS_RCB* p_rcb;
tBTA_GATT_STATUS status = BTA_GATT_ERROR;
- if ((p_rcb = bta_gatts_find_app_rcb_by_app_if(
- p_msg->api_cancel_open.server_if)) != NULL) {
+ p_rcb = bta_gatts_find_app_rcb_by_app_if(p_msg->api_cancel_open.server_if);
+ if (p_rcb != NULL) {
if (!GATT_CancelConnect(p_rcb->gatt_if, p_msg->api_cancel_open.remote_bda,
p_msg->api_cancel_open.is_direct)) {
APPL_TRACE_ERROR("bta_gatts_cancel_open failed for open request");
diff --git a/system/bta/hf_client/bta_hf_client_main.cc b/system/bta/hf_client/bta_hf_client_main.cc
index 85e24c63ee1bf4cf347abbb912d4f91cf52ad8c9..5808952bd26ec56bca5e6d03e3bbbb4651f37b5a 100644
--- a/system/bta/hf_client/bta_hf_client_main.cc
+++ b/system/bta/hf_client/bta_hf_client_main.cc
@@ -550,7 +550,8 @@ void bta_hf_client_sm_execute(uint16_t event, tBTA_HF_CLIENT_DATA* p_data) {
/* execute action functions */
for (i = 0; i < BTA_HF_CLIENT_ACTIONS; i++) {
- if ((action = state_table[event][i]) != BTA_HF_CLIENT_IGNORE) {
+ action = state_table[event][i];
+ if (action != BTA_HF_CLIENT_IGNORE) {
(*bta_hf_client_action[action])(p_data);
} else {
break;
diff --git a/system/bta/hf_client/bta_hf_client_sdp.cc b/system/bta/hf_client/bta_hf_client_sdp.cc
index b4e063cb51256803c7c2c65d3b04ad9fdfc456c5..c4c43908473e2d45e7e0a66ba3a682b54008e58f 100644
--- a/system/bta/hf_client/bta_hf_client_sdp.cc
+++ b/system/bta/hf_client/bta_hf_client_sdp.cc
@@ -220,9 +220,9 @@ bool bta_hf_client_sdp_find_attr(void) {
/* loop through all records we found */
while (true) {
/* get next record; if none found, we're done */
- if ((p_rec = SDP_FindServiceInDb(bta_hf_client_cb.scb.p_disc_db,
- UUID_SERVCLASS_AG_HANDSFREE, p_rec)) ==
- NULL) {
+ p_rec = SDP_FindServiceInDb(bta_hf_client_cb.scb.p_disc_db,
+ UUID_SERVCLASS_AG_HANDSFREE, p_rec);
+ if (p_rec == NULL) {
break;
}
@@ -240,8 +240,8 @@ bool bta_hf_client_sdp_find_attr(void) {
&bta_hf_client_cb.scb.peer_version);
/* get features */
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_FEATURES)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_FEATURES);
+ if (p_attr != NULL) {
/* Found attribute. Get value. */
/* There might be race condition between SDP and BRSF. */
/* Do not update if we already received BRSF. */
@@ -255,7 +255,8 @@ bool bta_hf_client_sdp_find_attr(void) {
}
/* get network for ability to reject calls */
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_NETWORK)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_NETWORK);
+ if (p_attr != NULL) {
if (p_attr->attr_value.v.u16 == 0x01) {
bta_hf_client_cb.scb.peer_features |= BTA_HF_CLIENT_PEER_REJECT;
}
diff --git a/system/bta/hh/bta_hh_act.cc b/system/bta/hh/bta_hh_act.cc
index 6240211b1b021316d9f1b867e0b02bb016d2d889..371b31794bf25d59104d44d0e382cd7ca358e672 100644
--- a/system/bta/hh/bta_hh_act.cc
+++ b/system/bta/hh/bta_hh_act.cc
@@ -271,9 +271,9 @@ static void bta_hh_di_sdp_cback(uint16_t result) {
bta_hh_update_di_info(p_cb, BTA_HH_VENDOR_ID_INVALID, 0, 0, 0);
}
- if ((ret = HID_HostGetSDPRecord(p_cb->addr, bta_hh_cb.p_disc_db,
- p_bta_hh_cfg->sdp_db_size,
- bta_hh_sdp_cback)) == HID_SUCCESS) {
+ ret = HID_HostGetSDPRecord(p_cb->addr, bta_hh_cb.p_disc_db,
+ p_bta_hh_cfg->sdp_db_size, bta_hh_sdp_cback);
+ if (ret == HID_SUCCESS) {
status = BTA_HH_OK;
} else {
#if (BTA_HH_DEBUG == TRUE)
@@ -648,9 +648,8 @@ void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
case BTA_HH_GET_IDLE_EVT:
hs_data.handle = p_cb->hid_handle;
/* if handshake gives an OK code for these transaction, fill in UNSUPT */
- if ((hs_data.status = bta_hh_get_trans_status(p_data->hid_cback.data)) ==
- BTA_HH_OK)
- hs_data.status = BTA_HH_HS_TRANS_NOT_SPT;
+ hs_data.status = bta_hh_get_trans_status(p_data->hid_cback.data);
+ if (hs_data.status == BTA_HH_OK) hs_data.status = BTA_HH_HS_TRANS_NOT_SPT;
(*bta_hh_cb.p_cback)(p_cb->w4_evt, (tBTA_HH*)&hs_data);
p_cb->w4_evt = 0;
diff --git a/system/bta/hh/bta_hh_le.cc b/system/bta/hh/bta_hh_le.cc
index d33084c031df7352bd741e1f13fea941bd855832..1d7e96223344effe9771fdb691b254627956cad3 100644
--- a/system/bta/hh/bta_hh_le.cc
+++ b/system/bta/hh/bta_hh_le.cc
@@ -1459,10 +1459,10 @@ static void read_report_ref_desc_cb(uint16_t conn_id, tGATT_STATUS status,
BTA_GATTC_GetDescriptor(conn_id, handle);
tBTA_HH_LE_RPT* p_rpt;
- if ((p_rpt = bta_hh_le_find_report_entry(
- p_dev_cb, p_desc->characteristic->service->handle,
- GATT_UUID_HID_REPORT, p_desc->characteristic->handle)))
- bta_hh_le_save_report_ref(p_dev_cb, p_rpt, status, value, len);
+ p_rpt = bta_hh_le_find_report_entry(
+ p_dev_cb, p_desc->characteristic->service->handle, GATT_UUID_HID_REPORT,
+ p_desc->characteristic->handle);
+ if (p_rpt) bta_hh_le_save_report_ref(p_dev_cb, p_rpt, status, value, len);
}
void read_pref_conn_params_cb(uint16_t conn_id, tGATT_STATUS status,
@@ -2270,7 +2270,8 @@ void bta_hh_le_hid_read_rpt_clt_cfg(BD_ADDR bd_addr, uint8_t rpt_id) {
uint8_t index = BTA_HH_IDX_INVALID;
index = bta_hh_find_cb(bd_addr);
- if ((index = bta_hh_find_cb(bd_addr)) == BTA_HH_IDX_INVALID) {
+ index = bta_hh_find_cb(bd_addr);
+ if (index == BTA_HH_IDX_INVALID) {
APPL_TRACE_ERROR("%s: unknown device", __func__);
return;
}
diff --git a/system/bta/hh/bta_hh_main.cc b/system/bta/hh/bta_hh_main.cc
index ca7601ade8a1c1ae201dff43579f1ac894b5435f..a403f222beac9a385cfb7b6a5512dbb8684e6d31 100644
--- a/system/bta/hh/bta_hh_main.cc
+++ b/system/bta/hh/bta_hh_main.cc
@@ -333,7 +333,8 @@ void bta_hh_sm_execute(tBTA_HH_DEV_CB* p_cb, uint16_t event,
p_cb->state = state_table[event][BTA_HH_NEXT_STATE];
- if ((action = state_table[event][BTA_HH_ACTION]) != BTA_HH_IGNORE) {
+ action = state_table[event][BTA_HH_ACTION];
+ if (action != BTA_HH_IGNORE) {
(*bta_hh_action[action])(p_cb, p_data);
}
diff --git a/system/bta/hh/bta_hh_utils.cc b/system/bta/hh/bta_hh_utils.cc
index 8274c9588cb2784a8bf07aa738bcb0c42262ad33..6f030fe120808d1b2c16ee087d1bf3d006860b7f 100644
--- a/system/bta/hh/bta_hh_utils.cc
+++ b/system/bta/hh/bta_hh_utils.cc
@@ -290,7 +290,8 @@ void bta_hh_parse_keybd_rpt(tBTA_HH_BOOT_RPT* p_kb_data, uint8_t* p_report,
#if (BTA_HH_DEBUG == TRUE)
APPL_TRACE_DEBUG("this_char = %02x", this_report[xx]);
#endif
- if ((this_char = this_report[xx]) == 0) continue;
+ this_char = this_report[xx];
+ if (this_char == 0) continue;
/* take the key code as the report data */
if (this_report[xx] == BTA_HH_KB_CAPS_LOCK)
p_kb->caps_lock = p_kb->caps_lock ? false : true;
diff --git a/system/bta/hl/bta_hl_act.cc b/system/bta/hl/bta_hl_act.cc
index 5d78f3247b7452da950d9250527af1c21e52930d..0a8e8d05d6ac846e13fae557ba822bd83f444c48 100644
--- a/system/bta/hl/bta_hl_act.cc
+++ b/system/bta/hl/bta_hl_act.cc
@@ -382,8 +382,8 @@ void bta_hl_dch_ci_get_tx_data(uint8_t app_idx, uint8_t mcl_idx,
close_dch = true;
}
} else {
- if ((result = MCA_WriteReq((tMCA_DL)p_dcb->mdl_handle, p_dcb->p_tx_pkt)) !=
- MCA_SUCCESS) {
+ result = MCA_WriteReq((tMCA_DL)p_dcb->mdl_handle, p_dcb->p_tx_pkt);
+ if (result != MCA_SUCCESS) {
if (result == MCA_BUSY) {
status = BTA_HL_STATUS_DCH_BUSY;
} else {
@@ -432,8 +432,8 @@ void bta_hl_dch_send_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
// p_dcb->chnl_cfg.fcs may be BTA_HL_MCA_USE_FCS (0x11) or BTA_HL_MCA_NO_FCS
// (0x10) or BTA_HL_DEFAULT_SOURCE_FCS (1)
bool fcs_use = (bool)(p_dcb->chnl_cfg.fcs & BTA_HL_MCA_FCS_USE_MASK);
- if ((p_dcb->p_tx_pkt =
- bta_hl_get_buf(p_data->api_send_data.pkt_size, fcs_use)) != NULL) {
+ p_dcb->p_tx_pkt = bta_hl_get_buf(p_data->api_send_data.pkt_size, fcs_use);
+ if (p_dcb->p_tx_pkt != NULL) {
bta_hl_co_get_tx_data(
p_acb->app_id, p_dcb->mdl_handle, p_data->api_send_data.pkt_size,
BTA_HL_GET_BUF_PTR(p_dcb->p_tx_pkt), BTA_HL_CI_GET_TX_DATA_EVT);
@@ -978,7 +978,8 @@ void bta_hl_dch_mca_abort(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
p_dcb->abort_oper &= ~BTA_HL_ABORT_PENDING_MASK;
- if ((mca_result = MCA_Abort((tMCA_CL)p_mcb->mcl_handle)) != MCA_SUCCESS) {
+ mca_result = MCA_Abort((tMCA_CL)p_mcb->mcl_handle);
+ if (mca_result != MCA_SUCCESS) {
if (mca_result == MCA_NO_RESOURCES) {
p_dcb->abort_oper |= BTA_HL_ABORT_PENDING_MASK;
} else {
@@ -1344,10 +1345,10 @@ void bta_hl_dch_mca_create(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
bta_hl_validate_peer_cfg(app_idx, mcl_idx, mdl_idx, p_dcb->peer_mdep_id,
p_dcb->peer_mdep_role, sdp_idx)) {
p_mcb->data_psm = p_mcb->sdp.sdp_rec[sdp_idx].data_psm;
- if ((result =
- MCA_CreateMdl((tMCA_CL)p_mcb->mcl_handle, p_dcb->local_mdep_id,
+ result = MCA_CreateMdl((tMCA_CL)p_mcb->mcl_handle, p_dcb->local_mdep_id,
p_mcb->data_psm, p_dcb->mdl_id, p_dcb->peer_mdep_id,
- p_dcb->local_cfg, NULL)) != MCA_SUCCESS) {
+ p_dcb->local_cfg, NULL);
+ if (result != MCA_SUCCESS) {
APPL_TRACE_ERROR("MCA_CreateMdl FAIL mca_result=%d", result);
bta_hl_dch_sm_execute(app_idx, mcl_idx, mdl_idx,
BTA_HL_DCH_CLOSE_CMPL_EVT, p_data);
@@ -1442,8 +1443,8 @@ static void bta_hl_sdp_cback(uint8_t sdp_oper, uint8_t app_idx, uint8_t mcl_idx,
}
p_hdp_rec->srv_name[0] = '\0';
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME);
+ if (p_attr != NULL) {
if (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) < BT_MAX_SERVICE_NAME_LEN)
name_len = (uint16_t)SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
else
@@ -1452,8 +1453,8 @@ static void bta_hl_sdp_cback(uint8_t sdp_oper, uint8_t app_idx, uint8_t mcl_idx,
}
p_hdp_rec->srv_desp[0] = '\0';
- if ((p_attr = SDP_FindAttributeInRec(
- p_rec, ATTR_ID_SERVICE_DESCRIPTION)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_DESCRIPTION);
+ if (p_attr != NULL) {
if (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) < BT_MAX_SERVICE_NAME_LEN)
name_len = (uint16_t)SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
else
@@ -1462,8 +1463,8 @@ static void bta_hl_sdp_cback(uint8_t sdp_oper, uint8_t app_idx, uint8_t mcl_idx,
}
p_hdp_rec->provider_name[0] = '\0';
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_PROVIDER_NAME)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_PROVIDER_NAME);
+ if (p_attr != NULL) {
if (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) < BT_MAX_SERVICE_NAME_LEN)
name_len = (uint16_t)SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
else
@@ -1471,16 +1472,16 @@ static void bta_hl_sdp_cback(uint8_t sdp_oper, uint8_t app_idx, uint8_t mcl_idx,
memcpy(p_hdp_rec->provider_name, p_attr->attr_value.v.array, name_len);
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_HDP_MCAP_SUP_PROC)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_HDP_MCAP_SUP_PROC);
+ if (p_attr != NULL) {
p_hdp_rec->mcap_sup_proc = p_attr->attr_value.v.u8;
} else {
APPL_TRACE_WARNING("MCAP SUP PROC not found");
break;
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_HDP_SUP_FEAT_LIST)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_HDP_SUP_FEAT_LIST);
+ if (p_attr != NULL) {
if (bta_hl_fill_sup_feature_list(p_attr, &sup_feature)) {
p_hdp_rec->num_mdeps = (uint8_t)sup_feature.num_elems;
APPL_TRACE_WARNING("bta_hl_sdp_cback num_mdeps %d",
@@ -1819,8 +1820,9 @@ tBTA_HL_STATUS bta_hl_init_sdp(tBTA_HL_SDP_OPER sdp_oper, uint8_t app_idx,
"bta_hl_init_sdp sdp_oper=%d app_idx=%d mcl_idx=%d, mdl_idx=%d", sdp_oper,
app_idx, mcl_idx, mdl_idx);
#endif
- if ((p_cb->sdp_cback = bta_hl_allocate_spd_cback(
- sdp_oper, app_idx, mcl_idx, mdl_idx, &sdp_cback_idx)) != NULL) {
+ p_cb->sdp_cback = bta_hl_allocate_spd_cback(sdp_oper, app_idx, mcl_idx,
+ mdl_idx, &sdp_cback_idx);
+ if (p_cb->sdp_cback != NULL) {
if (p_cb->p_db == NULL)
(p_cb->p_db = (tSDP_DISCOVERY_DB*)osi_malloc(BTA_HL_DISC_SIZE));
attr_list[0] = ATTR_ID_SERVICE_CLASS_ID_LIST;
diff --git a/system/bta/hl/bta_hl_main.cc b/system/bta/hl/bta_hl_main.cc
index 6f1533897a940c8fffce190e806a408ca57ea4f5..bc8f3968698953ec31d10325a65c24fe54a7795e 100644
--- a/system/bta/hl/bta_hl_main.cc
+++ b/system/bta/hl/bta_hl_main.cc
@@ -451,7 +451,8 @@ void bta_hl_cch_sm_execute(uint8_t app_idx, uint8_t mcl_idx, uint16_t event,
p_cb->cch_state = state_table[event][BTA_HL_CCH_NEXT_STATE];
for (i = 0; i < BTA_HL_CCH_ACTIONS; i++) {
- if ((action = state_table[event][i]) != BTA_HL_CCH_IGNORE) {
+ action = state_table[event][i];
+ if (action != BTA_HL_CCH_IGNORE) {
(*bta_hl_cch_action[action])(app_idx, mcl_idx, p_data);
} else {
/* discard HDP data */
@@ -501,7 +502,8 @@ void bta_hl_dch_sm_execute(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
p_cb->dch_state = state_table[event][BTA_HL_DCH_NEXT_STATE];
for (i = 0; i < BTA_HL_DCH_ACTIONS; i++) {
- if ((action = state_table[event][i]) != BTA_HL_DCH_IGNORE) {
+ action = state_table[event][i];
+ if (action != BTA_HL_DCH_IGNORE) {
(*bta_hl_dch_action[action])(app_idx, mcl_idx, mdl_idx, p_data);
} else {
/* discard mas data */
@@ -925,9 +927,9 @@ static void bta_hl_api_dch_open(UNUSED_ATTR tBTA_HL_CB* p_cb,
p_data->api_dch_open.local_cfg = BTA_HL_DCH_CFG_NO_PREF;
}
- if ((status = bta_hl_chk_local_cfg(app_idx, mcl_idx, mdep_cfg_idx,
- p_data->api_dch_open.local_cfg)) ==
- BTA_HL_STATUS_OK) {
+ status = bta_hl_chk_local_cfg(app_idx, mcl_idx, mdep_cfg_idx,
+ p_data->api_dch_open.local_cfg);
+ if (status == BTA_HL_STATUS_OK) {
if (p_data->api_dch_open.local_mdep_id !=
BTA_HL_ECHO_TEST_MDEP_ID) {
if (bta_hl_set_ctrl_psm_for_dch(app_idx, mcl_idx, mdl_idx,
@@ -1224,8 +1226,9 @@ static void bta_hl_api_dch_echo_test(UNUSED_ATTR tBTA_HL_CB* p_cb,
BTA_HL_DCH_CFG_STREAMING)) {
bool fcs_use =
(bool)(p_dcb->chnl_cfg.fcs & BTA_HL_MCA_FCS_USE_MASK);
- if ((p_dcb->p_echo_tx_pkt = bta_hl_get_buf(
- p_data->api_dch_echo_test.pkt_size, fcs_use)) != NULL) {
+ p_dcb->p_echo_tx_pkt =
+ bta_hl_get_buf(p_data->api_dch_echo_test.pkt_size, fcs_use);
+ if (p_dcb->p_echo_tx_pkt != NULL) {
if (bta_hl_set_ctrl_psm_for_dch(app_idx, mcl_idx, mdl_idx,
p_data->api_dch_open.ctrl_psm)) {
p_dcb->in_use = true;
diff --git a/system/bta/hl/bta_hl_sdp.cc b/system/bta/hl/bta_hl_sdp.cc
index 69b6f68e49ca8f1ca22bcb5d5a6d7652e5dbac25..9aa629403d3e1fefc83ff49a0ce6526159b6f562 100644
--- a/system/bta/hl/bta_hl_sdp.cc
+++ b/system/bta/hl/bta_hl_sdp.cc
@@ -369,7 +369,8 @@ tBTA_HL_STATUS bta_hl_sdp_register(uint8_t app_idx) {
return BTA_HL_STATUS_OK;
}
- if ((p_cb->sdp_handle = SDP_CreateRecord()) == 0) {
+ p_cb->sdp_handle = SDP_CreateRecord();
+ if (p_cb->sdp_handle == 0) {
return BTA_HL_STATUS_SDP_NO_RESOURCE;
}
diff --git a/system/bta/hl/bta_hl_utils.cc b/system/bta/hl/bta_hl_utils.cc
index 1dea0a2c34a59ad40e1035cec2c26f2c981d1e5a..3510cfdaa9c994d3af7943e5cb4c8a56706e630e 100644
--- a/system/bta/hl/bta_hl_utils.cc
+++ b/system/bta/hl/bta_hl_utils.cc
@@ -262,14 +262,14 @@ bool bta_hl_find_service_in_db(uint8_t app_idx, uint8_t mcl_idx,
switch (service_uuid) {
case UUID_SERVCLASS_HDP_SINK:
case UUID_SERVCLASS_HDP_SOURCE:
- if ((*pp_rec = SDP_FindServiceInDb(p_mcb->p_db, service_uuid, *pp_rec)) ==
- NULL) {
+ *pp_rec = SDP_FindServiceInDb(p_mcb->p_db, service_uuid, *pp_rec);
+ if (*pp_rec == NULL) {
found = false;
}
break;
default:
- if ((*pp_rec = bta_hl_find_sink_or_src_srv_class_in_db(
- p_mcb->p_db, *pp_rec)) == NULL) {
+ *pp_rec = bta_hl_find_sink_or_src_srv_class_in_db(p_mcb->p_db, *pp_rec);
+ if (*pp_rec == NULL) {
found = false;
}
break;
@@ -2036,8 +2036,9 @@ tBTA_HL_STATUS bta_hl_app_registration(uint8_t app_idx) {
reg.sec_mask = p_acb->sec_mask;
reg.rsp_tout = BTA_HL_MCAP_RSP_TOUT;
- if ((p_acb->app_handle = (tBTA_HL_APP_HANDLE)MCA_Register(
- ®, bta_hl_mcap_ctrl_cback)) != 0) {
+ p_acb->app_handle =
+ (tBTA_HL_APP_HANDLE)MCA_Register(®, bta_hl_mcap_ctrl_cback);
+ if (p_acb->app_handle != 0) {
mca_cs.type = MCA_TDEP_ECHO;
mca_cs.max_mdl = BTA_HL_NUM_MDLS_PER_MDEP;
mca_cs.p_data_cback = bta_hl_mcap_data_cback;
diff --git a/system/bta/jv/bta_jv_act.cc b/system/bta/jv/bta_jv_act.cc
index 7430c39156e2d1dee27b48c24eb274ce6c327422..2506d24a08f3d4083e8eb86ffca992ab7a0dc086 100644
--- a/system/bta/jv/bta_jv_act.cc
+++ b/system/bta/jv/bta_jv_act.cc
@@ -705,9 +705,12 @@ void bta_jv_get_channel_id(tBTA_JV_MSG* p_data) {
APPL_TRACE_ERROR("rfc channel:%d already in use or invalid", channel);
channel = 0;
}
- } else if ((channel = BTM_AllocateSCN()) == 0) {
- APPL_TRACE_ERROR("run out of rfc channels");
- channel = 0;
+ } else {
+ channel = BTM_AllocateSCN();
+ if (channel == 0) {
+ APPL_TRACE_ERROR("run out of rfc channels");
+ channel = 0;
+ }
}
if (channel != 0) {
bta_jv_cb.scn[channel - 1] = true;
@@ -879,7 +882,8 @@ void bta_jv_start_discovery(tBTA_JV_MSG* p_data) {
bta_jv_cb.sdp_active = BTA_JV_SDP_ACT_YES;
if (!SDP_ServiceSearchAttributeRequest2(
p_data->start_discovery.bd_addr, p_bta_jv_cfg->p_sdp_db,
- bta_jv_start_discovery_cback, UINT_TO_PTR(p_data->start_discovery.rfcomm_slot_id))) {
+ bta_jv_start_discovery_cback,
+ UINT_TO_PTR(p_data->start_discovery.rfcomm_slot_id))) {
bta_jv_cb.sdp_active = BTA_JV_SDP_ACT_NONE;
/* failed to start SDP. report the failure right away */
if (bta_jv_cb.p_dm_cback)
@@ -1038,10 +1042,10 @@ void bta_jv_l2cap_connect(tBTA_JV_MSG* p_data) {
if ((cc->type != BTA_JV_CONN_TYPE_L2CAP) ||
(bta_jv_check_psm(cc->remote_psm))) /* allowed */
{
- if ((handle = GAP_ConnOpen("", sec_id, 0, cc->peer_bd_addr,
- cc->remote_psm, &cfg, ertm_info, cc->sec_mask,
- chan_mode_mask, bta_jv_l2cap_client_cback,
- cc->type)) != GAP_INVALID_HANDLE) {
+ handle = GAP_ConnOpen("", sec_id, 0, cc->peer_bd_addr, cc->remote_psm,
+ &cfg, ertm_info, cc->sec_mask, chan_mode_mask,
+ bta_jv_l2cap_client_cback, cc->type);
+ if (handle != GAP_INVALID_HANDLE) {
evt_data.status = BTA_JV_SUCCESS;
}
}
diff --git a/system/bta/jv/bta_jv_api.cc b/system/bta/jv/bta_jv_api.cc
index 1cc02ed7b4a9a159269ac95ec55855c19efc5e04..d59aced80dd9d9e2968fa291446ed1452ef082df 100644
--- a/system/bta/jv/bta_jv_api.cc
+++ b/system/bta/jv/bta_jv_api.cc
@@ -147,8 +147,7 @@ bool BTA_JvIsEncrypted(BD_ADDR bd_addr) {
* BTA_JV_FAILURE, otherwise.
*
******************************************************************************/
-tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, uint32_t id,
- int32_t channel) {
+tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, uint32_t id, int32_t channel) {
tBTA_JV_API_ALLOC_CHANNEL* p_msg =
(tBTA_JV_API_ALLOC_CHANNEL*)osi_malloc(sizeof(tBTA_JV_API_ALLOC_CHANNEL));
@@ -158,13 +157,13 @@ tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, uint32_t id,
p_msg->type = conn_type;
p_msg->channel = channel;
if (conn_type == BTA_JV_CONN_TYPE_RFCOMM) {
- p_msg->rfcomm_slot_id = id;
+ p_msg->rfcomm_slot_id = id;
} else if (conn_type == BTA_JV_CONN_TYPE_L2CAP ||
conn_type == BTA_JV_CONN_TYPE_L2CAP_LE) {
- p_msg->l2cap_socket_id = id;
+ p_msg->l2cap_socket_id = id;
} else {
- APPL_TRACE_ERROR("%s: Invalid connection type");
- return BTA_JV_FAILURE;
+ APPL_TRACE_ERROR("%s: Invalid connection type");
+ return BTA_JV_FAILURE;
}
bta_sys_sendmsg(p_msg);
@@ -215,7 +214,8 @@ tBTA_JV_STATUS BTA_JvFreeChannel(uint16_t channel, int conn_type) {
*
******************************************************************************/
tBTA_JV_STATUS BTA_JvStartDiscovery(BD_ADDR bd_addr, uint16_t num_uuid,
- tSDP_UUID* p_uuid_list, uint32_t rfcomm_slot_id) {
+ tSDP_UUID* p_uuid_list,
+ uint32_t rfcomm_slot_id) {
tBTA_JV_API_START_DISCOVERY* p_msg = (tBTA_JV_API_START_DISCOVERY*)osi_malloc(
sizeof(tBTA_JV_API_START_DISCOVERY));
diff --git a/system/bta/mce/bta_mce_act.cc b/system/bta/mce/bta_mce_act.cc
index 02dc317611763c3a27c0c243644554552e897b4c..7851c7684b0c7ccc9d85fc063a41572ebc5d6764 100644
--- a/system/bta/mce/bta_mce_act.cc
+++ b/system/bta/mce/bta_mce_act.cc
@@ -87,23 +87,20 @@ static void bta_mce_search_cback(uint16_t result, void* user_data) {
evt_data.mas[found].scn = pe.params[0];
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME)) ==
- NULL)
- continue;
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME);
+ if (p_attr == NULL) continue;
evt_data.mas[found].p_srv_name = (char*)p_attr->attr_value.v.array;
evt_data.mas[found].srv_name_len =
SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_MAS_INSTANCE_ID)) ==
- NULL)
- break;
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_MAS_INSTANCE_ID);
+ if (p_attr == NULL) break;
evt_data.mas[found].instance_id = p_attr->attr_value.v.u8;
- if ((p_attr = SDP_FindAttributeInRec(p_rec,
- ATTR_ID_SUPPORTED_MSG_TYPE)) == NULL)
- break;
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_MSG_TYPE);
+ if (p_attr == NULL) break;
evt_data.mas[found].msg_type = p_attr->attr_value.v.u8;
diff --git a/system/bta/pan/bta_pan_act.cc b/system/bta/pan/bta_pan_act.cc
index 2f1892a1d22b13dc5793338dfb3a6f645c351248..5512c896c3d9acf39c6a14fdc41c37e2e87707cd 100644
--- a/system/bta/pan/bta_pan_act.cc
+++ b/system/bta/pan/bta_pan_act.cc
@@ -92,7 +92,8 @@ static void bta_pan_conn_state_cback(uint16_t handle, BD_ADDR bd_addr,
if ((state == PAN_SUCCESS) && !is_role_change) {
p_buf->hdr.event = BTA_PAN_CONN_OPEN_EVT;
- if ((p_scb = bta_pan_scb_by_handle(handle)) == NULL) {
+ p_scb = bta_pan_scb_by_handle(handle);
+ if (p_scb == NULL) {
/* allocate an scb */
p_scb = bta_pan_scb_alloc();
}
@@ -140,7 +141,8 @@ static void bta_pan_conn_state_cback(uint16_t handle, BD_ADDR bd_addr,
static void bta_pan_data_flow_cb(uint16_t handle, tPAN_RESULT result) {
tBTA_PAN_SCB* p_scb;
- if ((p_scb = bta_pan_scb_by_handle(handle)) == NULL) return;
+ p_scb = bta_pan_scb_by_handle(handle);
+ if (p_scb == NULL) return;
if (result == PAN_TX_FLOW_ON) {
BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));
@@ -188,7 +190,8 @@ static void bta_pan_data_buf_ind_cback(uint16_t handle, BD_ADDR src,
((tBTA_PAN_DATA_PARAMS*)p_new_buf)->ext = ext;
((tBTA_PAN_DATA_PARAMS*)p_new_buf)->forward = forward;
- if ((p_scb = bta_pan_scb_by_handle(handle)) == NULL) {
+ p_scb = bta_pan_scb_by_handle(handle);
+ if (p_scb == NULL) {
osi_free(p_new_buf);
return;
}
@@ -613,8 +616,8 @@ void bta_pan_tx_path(tBTA_PAN_SCB* p_scb, UNUSED_ATTR tBTA_PAN_DATA* p_data) {
BT_HDR* p_buf;
/* read data from the queue */
- if ((p_buf = (BT_HDR*)fixed_queue_try_dequeue(p_scb->data_queue)) !=
- NULL) {
+ p_buf = (BT_HDR*)fixed_queue_try_dequeue(p_scb->data_queue);
+ if (p_buf != NULL) {
/* send data to application */
bta_pan_co_tx_writebuf(p_scb->handle, p_scb->app_id,
((tBTA_PAN_DATA_PARAMS*)p_buf)->src,
diff --git a/system/bta/pan/bta_pan_main.cc b/system/bta/pan/bta_pan_main.cc
index d003bcea65a457c3277f626be8d10365c490f8f6..b0abd27a3c668b3bc9a6c5323bd94af7ebeb6dd6 100644
--- a/system/bta/pan/bta_pan_main.cc
+++ b/system/bta/pan/bta_pan_main.cc
@@ -183,7 +183,8 @@ static void bta_pan_sm_execute(tBTA_PAN_SCB* p_scb, uint16_t event,
/* execute action functions */
for (i = 0; i < BTA_PAN_ACTIONS; i++) {
- if ((action = state_table[event][i]) != BTA_PAN_IGNORE) {
+ action = state_table[event][i];
+ if (action != BTA_PAN_IGNORE) {
(*bta_pan_action[action])(p_scb, p_data);
} else {
break;
@@ -239,7 +240,8 @@ static void bta_pan_api_open(tBTA_PAN_DATA* p_data) {
tBTA_PAN_OPEN data;
/* allocate an scb */
- if ((p_scb = bta_pan_scb_alloc()) != NULL) {
+ p_scb = bta_pan_scb_alloc();
+ if (p_scb != NULL) {
bta_pan_open(p_scb, p_data);
} else {
bdcpy(data.bd_addr, p_data->api_open.bd_addr);
@@ -341,14 +343,16 @@ bool bta_pan_hdl_event(BT_HDR* p_msg) {
/* events that require buffer not be released */
case BTA_PAN_CI_RX_WRITEBUF_EVT:
freebuf = false;
- if ((p_scb = bta_pan_scb_by_handle(p_msg->layer_specific)) != NULL) {
+ p_scb = bta_pan_scb_by_handle(p_msg->layer_specific);
+ if (p_scb != NULL) {
bta_pan_sm_execute(p_scb, p_msg->event, (tBTA_PAN_DATA*)p_msg);
}
break;
/* all other events */
default:
- if ((p_scb = bta_pan_scb_by_handle(p_msg->layer_specific)) != NULL) {
+ p_scb = bta_pan_scb_by_handle(p_msg->layer_specific);
+ if (p_scb != NULL) {
bta_pan_sm_execute(p_scb, p_msg->event, (tBTA_PAN_DATA*)p_msg);
}
break;
diff --git a/system/bta/sdp/bta_sdp_act.cc b/system/bta/sdp/bta_sdp_act.cc
index 3787298a3340a4d6da7a7698059bd6441db3d1a7..9b8a8e08fe2afae7d79aaeb565b149056ceea000 100644
--- a/system/bta/sdp/bta_sdp_act.cc
+++ b/system/bta/sdp/bta_sdp_act.cc
@@ -105,12 +105,13 @@ static void bta_create_mns_sdp_record(bluetooth_sdp_record* record,
record->mns.hdr.profile_version = 0;
record->mns.supported_features = 0x0000001F; // default value if not found
- if ((p_attr = SDP_FindAttributeInRec(
- p_rec, ATTR_ID_MAP_SUPPORTED_FEATURES)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_MAP_SUPPORTED_FEATURES);
+ if (p_attr != NULL) {
record->mns.supported_features = p_attr->attr_value.v.u32;
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME);
+ if (p_attr != NULL) {
record->mns.hdr.service_name_length =
SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
record->mns.hdr.service_name = (char*)p_attr->attr_value.v.array;
@@ -125,8 +126,8 @@ static void bta_create_mns_sdp_record(bluetooth_sdp_record* record,
record->mns.hdr.rfcomm_channel_number = pe.params[0];
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_GOEP_L2CAP_PSM)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_GOEP_L2CAP_PSM);
+ if (p_attr != NULL) {
record->mns.hdr.l2cap_psm = p_attr->attr_value.v.u16;
}
}
@@ -147,22 +148,23 @@ static void bta_create_mas_sdp_record(bluetooth_sdp_record* record,
record->mas.supported_features = 0x0000001F;
record->mas.supported_message_types = 0;
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_MAS_INSTANCE_ID)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_MAS_INSTANCE_ID);
+ if (p_attr != NULL) {
record->mas.mas_instance_id = p_attr->attr_value.v.u8;
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_MSG_TYPE)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_MSG_TYPE);
+ if (p_attr != NULL) {
record->mas.supported_message_types = p_attr->attr_value.v.u8;
}
- if ((p_attr = SDP_FindAttributeInRec(
- p_rec, ATTR_ID_MAP_SUPPORTED_FEATURES)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_MAP_SUPPORTED_FEATURES);
+ if (p_attr != NULL) {
record->mas.supported_features = p_attr->attr_value.v.u32;
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME);
+ if (p_attr != NULL) {
record->mas.hdr.service_name_length =
SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
record->mas.hdr.service_name = (char*)p_attr->attr_value.v.array;
@@ -177,8 +179,8 @@ static void bta_create_mas_sdp_record(bluetooth_sdp_record* record,
record->mas.hdr.rfcomm_channel_number = pe.params[0];
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_GOEP_L2CAP_PSM)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_GOEP_L2CAP_PSM);
+ if (p_attr != NULL) {
record->mas.hdr.l2cap_psm = p_attr->attr_value.v.u16;
}
}
@@ -198,16 +200,17 @@ static void bta_create_pse_sdp_record(bluetooth_sdp_record* record,
record->pse.supported_features = 0x00000003;
record->pse.supported_repositories = 0;
- if ((p_attr = SDP_FindAttributeInRec(
- p_rec, ATTR_ID_SUPPORTED_REPOSITORIES)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_REPOSITORIES);
+ if (p_attr != NULL) {
record->pse.supported_repositories = p_attr->attr_value.v.u8;
}
- if ((p_attr = SDP_FindAttributeInRec(
- p_rec, ATTR_ID_PBAP_SUPPORTED_FEATURES)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_PBAP_SUPPORTED_FEATURES);
+ if (p_attr != NULL) {
record->pse.supported_features = p_attr->attr_value.v.u32;
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME);
+ if (p_attr != NULL) {
record->pse.hdr.service_name_length =
SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
record->pse.hdr.service_name = (char*)p_attr->attr_value.v.array;
@@ -222,8 +225,8 @@ static void bta_create_pse_sdp_record(bluetooth_sdp_record* record,
record->pse.hdr.rfcomm_channel_number = pe.params[0];
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_GOEP_L2CAP_PSM)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_GOEP_L2CAP_PSM);
+ if (p_attr != NULL) {
record->pse.hdr.l2cap_psm = p_attr->attr_value.v.u16;
}
}
@@ -242,7 +245,8 @@ static void bta_create_ops_sdp_record(bluetooth_sdp_record* record,
record->ops.hdr.profile_version = 0;
record->ops.supported_formats_list_len = 0;
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME);
+ if (p_attr != NULL) {
record->ops.hdr.service_name_length =
SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
record->ops.hdr.service_name = (char*)p_attr->attr_value.v.array;
@@ -257,12 +261,12 @@ static void bta_create_ops_sdp_record(bluetooth_sdp_record* record,
record->ops.hdr.rfcomm_channel_number = pe.params[0];
}
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_GOEP_L2CAP_PSM)) !=
- NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_GOEP_L2CAP_PSM);
+ if (p_attr != NULL) {
record->ops.hdr.l2cap_psm = p_attr->attr_value.v.u16;
}
- if ((p_attr = SDP_FindAttributeInRec(
- p_rec, ATTR_ID_SUPPORTED_FORMATS_LIST)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SUPPORTED_FORMATS_LIST);
+ if (p_attr != NULL) {
/* Safety check - each entry should itself be a sequence */
if (SDP_DISC_ATTR_TYPE(p_attr->attr_len_type) != DATA_ELE_SEQ_DESC_TYPE) {
record->ops.supported_formats_list_len = 0;
@@ -325,7 +329,8 @@ static void bta_create_sap_sdp_record(bluetooth_sdp_record* record,
record->sap.hdr.l2cap_psm = -1;
record->sap.hdr.profile_version = 0;
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME);
+ if (p_attr != NULL) {
record->sap.hdr.service_name_length =
SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
record->sap.hdr.service_name = (char*)p_attr->attr_value.v.array;
@@ -353,7 +358,8 @@ static void bta_create_raw_sdp_record(bluetooth_sdp_record* record,
record->hdr.profile_version = -1;
/* Try to extract a service name */
- if ((p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME)) != NULL) {
+ p_attr = SDP_FindAttributeInRec(p_rec, ATTR_ID_SERVICE_NAME);
+ if (p_attr != NULL) {
record->pse.hdr.service_name_length =
SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
record->pse.hdr.service_name = (char*)p_attr->attr_value.v.array;
diff --git a/system/bta/sys/bta_sys_main.cc b/system/bta/sys/bta_sys_main.cc
index 39ba6e7811ba82b1ca55f9f48acca38d864fc142..cf8a94530436ea7ead678c3ce0488af717ee738d 100644
--- a/system/bta/sys/bta_sys_main.cc
+++ b/system/bta/sys/bta_sys_main.cc
@@ -228,7 +228,8 @@ bool bta_sys_sm_execute(BT_HDR* p_msg) {
/* execute action functions */
for (i = 0; i < BTA_SYS_ACTIONS; i++) {
- if ((action = state_table[p_msg->event & 0x00ff][i]) != BTA_SYS_IGNORE) {
+ action = state_table[p_msg->event & 0x00ff][i];
+ if (action != BTA_SYS_IGNORE) {
(*bta_sys_action[action])((tBTA_SYS_HW_MSG*)p_msg);
} else {
break;
diff --git a/system/btif/co/bta_pan_co.cc b/system/btif/co/bta_pan_co.cc
index e072b26ab7ed2afbd69c872ad3fb7bee148a82d4..ea5231a34403169eaf7d3a3ee57e001f166440e9 100644
--- a/system/btif/co/bta_pan_co.cc
+++ b/system/btif/co/bta_pan_co.cc
@@ -173,8 +173,8 @@ void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id) {
do {
/* read next data buffer from pan */
- if ((p_buf =
- bta_pan_ci_readbuf(handle, src, dst, &protocol, &ext, &forward))) {
+ p_buf = bta_pan_ci_readbuf(handle, src, dst, &protocol, &ext, &forward);
+ if (p_buf) {
bdstr_t bdstr;
BTIF_TRACE_DEBUG(
"%s, calling btapp_tap_send, "
diff --git a/system/btif/src/btif_core.cc b/system/btif/src/btif_core.cc
index 45e1bbd6e953519847f92d37ecdef7544cec644b..aeb644889ef70d8e6b205dbfe669da8c4c07faac 100644
--- a/system/btif/src/btif_core.cc
+++ b/system/btif/src/btif_core.cc
@@ -344,7 +344,8 @@ static void btif_fetch_local_bdaddr(bt_bdaddr_t* local_addr) {
BTIF_TRACE_DEBUG("%s, local bdaddr is stored in %s", __func__, val);
- if ((addr_fd = open(val, O_RDONLY)) != -1) {
+ addr_fd = open(val, O_RDONLY);
+ if (addr_fd != -1) {
memset(val, 0, sizeof(val));
read(addr_fd, val, FACTORY_BT_BDADDR_STORAGE_LEN);
/* If this is not a reserved/special bda, then use it */
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 6ec2147c7620e0f67943e6bfeed1426a8ce2d5ff..95826c07ca3f508cfcd0929b89defdb22d4fcf90 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -2740,27 +2740,32 @@ bool btif_dm_get_smp_config(tBTE_APPL_CFG* p_cfg) {
strncpy(conf, recv, 64);
conf[63] = 0; // null terminate
- if ((pch = strtok(conf, ",")) != NULL)
+ pch = strtok(conf, ",");
+ if (pch != NULL)
p_cfg->ble_auth_req = (uint8_t)strtoul(pch, &endptr, 16);
else
return false;
- if ((pch = strtok(NULL, ",")) != NULL)
+ pch = strtok(NULL, ",");
+ if (pch != NULL)
p_cfg->ble_io_cap = (uint8_t)strtoul(pch, &endptr, 16);
else
return false;
- if ((pch = strtok(NULL, ",")) != NULL)
+ pch = strtok(NULL, ",");
+ if (pch != NULL)
p_cfg->ble_init_key = (uint8_t)strtoul(pch, &endptr, 16);
else
return false;
- if ((pch = strtok(NULL, ",")) != NULL)
+ pch = strtok(NULL, ",");
+ if (pch != NULL)
p_cfg->ble_resp_key = (uint8_t)strtoul(pch, &endptr, 16);
else
return false;
- if ((pch = strtok(NULL, ",")) != NULL)
+ pch = strtok(NULL, ",");
+ if (pch != NULL)
p_cfg->ble_max_key_size = (uint8_t)strtoul(pch, &endptr, 16);
else
return false;
diff --git a/system/btif/src/btif_hl.cc b/system/btif/src/btif_hl.cc
index b631f4b08595b2c6297cd2b96d0eedf0a75f2dec..afa2112130963505966025bd192cab32bfd6543a 100644
--- a/system/btif/src/btif_hl.cc
+++ b/system/btif/src/btif_hl.cc
@@ -3986,9 +3986,8 @@ bool btif_hl_save_mdl_cfg(uint8_t mdep_id, uint8_t item_idx,
evt_param.update_mdl.app_idx = app_idx;
len = sizeof(btif_hl_update_mdl_t);
BTIF_TRACE_DEBUG("send BTIF_HL_UPDATE_MDL event app_idx=%d ", app_idx);
- if ((bt_status = btif_transfer_context(
- btif_hl_proc_cb_evt, BTIF_HL_UPDATE_MDL, (char*)&evt_param,
- len, NULL)) == BT_STATUS_SUCCESS) {
+ bt_status = btif_transfer_context(btif_hl_proc_cb_evt, BTIF_HL_UPDATE_MDL, (char *)&evt_param, len, NULL);
+ if (bt_status == BT_STATUS_SUCCESS) {
success = true;
}
ASSERTC(bt_status == BT_STATUS_SUCCESS, "context transfer failed",
@@ -4024,9 +4023,8 @@ bool btif_hl_delete_mdl_cfg(uint8_t mdep_id, uint8_t item_idx) {
evt_param.update_mdl.app_idx = app_idx;
len = sizeof(btif_hl_update_mdl_t);
BTIF_TRACE_DEBUG("send BTIF_HL_UPDATE_MDL event app_idx=%d ", app_idx);
- if ((bt_status = btif_transfer_context(
- btif_hl_proc_cb_evt, BTIF_HL_UPDATE_MDL, (char*)&evt_param, len,
- NULL)) == BT_STATUS_SUCCESS) {
+ bt_status = btif_transfer_context(btif_hl_proc_cb_evt, BTIF_HL_UPDATE_MDL, (char *)&evt_param, len, NULL);
+ if (bt_status == BT_STATUS_SUCCESS) {
success = true;
}
ASSERTC(bt_status == BT_STATUS_SUCCESS, "context transfer failed",
diff --git a/system/btif/src/btif_pan.cc b/system/btif/src/btif_pan.cc
index 70cd68bd3649b7b7372ef2a1934c582722bafa98..d0803dff6659b22c02cd466f63a4b732efb87b0e 100644
--- a/system/btif/src/btif_pan.cc
+++ b/system/btif/src/btif_pan.cc
@@ -380,7 +380,8 @@ int btpan_tap_open() {
/* open the clone device */
- if ((fd = open(clonedev, O_RDWR)) < 0) {
+ fd = open(clonedev, O_RDWR);
+ if (fd < 0) {
BTIF_TRACE_DEBUG("could not open %s, err:%d", clonedev, errno);
return fd;
}
@@ -391,7 +392,8 @@ int btpan_tap_open() {
strncpy(ifr.ifr_name, TAP_IF_NAME, IFNAMSIZ);
/* try to create the device */
- if ((err = ioctl(fd, TUNSETIFF, (void*)&ifr)) < 0) {
+ err = ioctl(fd, TUNSETIFF, (void *)&ifr);
+ if (err < 0) {
BTIF_TRACE_DEBUG("ioctl error:%d, errno:%s", err, strerror(errno));
close(fd);
return err;
diff --git a/system/btif/src/btif_sdp_server.cc b/system/btif/src/btif_sdp_server.cc
index 4830e66874119fb0835c5870a3667ca2d0359303..294cd4dae5860de7e48d8a391d504ba5d37f2826 100644
--- a/system/btif/src/btif_sdp_server.cc
+++ b/system/btif/src/btif_sdp_server.cc
@@ -385,7 +385,8 @@ static int add_maps_sdp(const bluetooth_sdp_mas_record* rec) {
APPL_TRACE_DEBUG(" msg_types: 0x%02x, feature_bits: 0x%08x",
rec->supported_message_types, rec->supported_features);
- if ((sdp_handle = SDP_CreateRecord()) == 0) {
+ sdp_handle = SDP_CreateRecord();
+ if (sdp_handle == 0) {
APPL_TRACE_ERROR("%s() - Unable to register MAPS Service", __func__);
return sdp_handle;
}
@@ -470,7 +471,8 @@ static int add_mapc_sdp(const bluetooth_sdp_mns_record* rec) {
APPL_TRACE_DEBUG(" feature_bits: 0x%08x", rec->supported_features);
- if ((sdp_handle = SDP_CreateRecord()) == 0) {
+ sdp_handle = SDP_CreateRecord();
+ if (sdp_handle == 0) {
APPL_TRACE_ERROR("%s(): Unable to register MAP Notification Service",
__func__);
return sdp_handle;
@@ -547,7 +549,8 @@ static int add_pbaps_sdp(const bluetooth_sdp_pse_record* rec) {
APPL_TRACE_DEBUG(" supported_repositories: 0x%08x, feature_bits: 0x%08x",
rec->supported_repositories, rec->supported_features);
- if ((sdp_handle = SDP_CreateRecord()) == 0) {
+ sdp_handle = SDP_CreateRecord();
+ if (sdp_handle == 0) {
APPL_TRACE_ERROR("%s(): Unable to register PBAP Server Service", __func__);
return sdp_handle;
}
@@ -633,7 +636,8 @@ static int add_opps_sdp(const bluetooth_sdp_ops_record* rec) {
APPL_TRACE_DEBUG(" supported formats count: %d",
rec->supported_formats_list_len);
- if ((sdp_handle = SDP_CreateRecord()) == 0) {
+ sdp_handle = SDP_CreateRecord();
+ if (sdp_handle == 0) {
APPL_TRACE_ERROR("%s(): Unable to register Object Push Server Service",
__func__);
return sdp_handle;
@@ -715,7 +719,8 @@ static int add_saps_sdp(const bluetooth_sdp_sap_record* rec) {
APPL_TRACE_DEBUG("%s(): scn 0x%02x, service name %s", __func__,
rec->hdr.rfcomm_channel_number, rec->hdr.service_name);
- if ((sdp_handle = SDP_CreateRecord()) == 0) {
+ sdp_handle = SDP_CreateRecord();
+ if (sdp_handle == 0) {
APPL_TRACE_ERROR("%s(): Unable to register SAPS Service", __func__);
return sdp_handle;
}
diff --git a/system/btif/src/btif_sock_thread.cc b/system/btif/src/btif_sock_thread.cc
index 1283a11560f740da06a2178f9e488e6d4cc45b39..78177d63cfa865db5941ccc2b414cd8d0f5b00bf 100644
--- a/system/btif/src/btif_sock_thread.cc
+++ b/system/btif/src/btif_sock_thread.cc
@@ -123,8 +123,8 @@ static inline int create_thread(void* (*start_routine)(void*), void* arg,
int ret = -1;
struct sched_param param;
- if ((ret = pthread_create(thread_id, &thread_attr, start_routine, arg)) !=
- 0) {
+ ret = pthread_create(thread_id, &thread_attr, start_routine, arg);
+ if (ret != 0) {
APPL_TRACE_ERROR("pthread_create : %s", strerror(errno));
return ret;
}
diff --git a/system/stack/avct/avct_api.cc b/system/stack/avct/avct_api.cc
index 5e3a465686f44524d1da89e28dcbcd6165ea358f..062508ad8598961a2200f95cfef56f5cfc850238 100644
--- a/system/stack/avct/avct_api.cc
+++ b/system/stack/avct/avct_api.cc
@@ -136,7 +136,8 @@ uint16_t AVCT_CreateConn(uint8_t *p_handle, tAVCT_CC *p_cc, BD_ADDR peer_addr)
AVCT_TRACE_API("AVCT_CreateConn: %d, control:%d", p_cc->role, p_cc->control);
/* Allocate ccb; if no ccbs, return failure */
- if ((p_ccb = avct_ccb_alloc(p_cc)) == NULL)
+ p_ccb = avct_ccb_alloc(p_cc);
+ if (p_ccb == NULL)
{
result = AVCT_NO_RESOURCES;
}
@@ -149,9 +150,11 @@ uint16_t AVCT_CreateConn(uint8_t *p_handle, tAVCT_CC *p_cc, BD_ADDR peer_addr)
if (p_cc->role == AVCT_INT)
{
/* find link; if none allocate a new one */
- if ((p_lcb = avct_lcb_by_bd(peer_addr)) == NULL)
+ p_lcb = avct_lcb_by_bd(peer_addr);
+ if (p_lcb == NULL)
{
- if ((p_lcb = avct_lcb_alloc(peer_addr)) == NULL)
+ p_lcb = avct_lcb_alloc(peer_addr);
+ if (p_lcb == NULL)
{
/* no link resources; free ccb as well */
avct_ccb_dealloc(p_ccb, AVCT_NO_EVT, 0, NULL);
@@ -198,7 +201,8 @@ uint16_t AVCT_RemoveConn(uint8_t handle)
AVCT_TRACE_API("AVCT_RemoveConn");
/* map handle to ccb */
- if ((p_ccb = avct_ccb_by_idx(handle)) == NULL)
+ p_ccb = avct_ccb_by_idx(handle);
+ if (p_ccb == NULL)
{
result = AVCT_BAD_HANDLE;
}
@@ -241,7 +245,8 @@ uint16_t AVCT_CreateBrowse (uint8_t handle, uint8_t role)
AVCT_TRACE_API("AVCT_CreateBrowse: %d", role);
/* map handle to ccb */
- if ((p_ccb = avct_ccb_by_idx(handle)) == NULL)
+ p_ccb = avct_ccb_by_idx(handle);
+ if (p_ccb == NULL)
{
return AVCT_BAD_HANDLE;
}
@@ -311,7 +316,8 @@ uint16_t AVCT_RemoveBrowse (uint8_t handle)
AVCT_TRACE_API("AVCT_RemoveBrowse");
/* map handle to ccb */
- if ((p_ccb = avct_ccb_by_idx(handle)) == NULL)
+ p_ccb = avct_ccb_by_idx(handle);
+ if (p_ccb == NULL)
{
result = AVCT_BAD_HANDLE;
}
@@ -364,7 +370,8 @@ uint16_t AVCT_GetPeerMtu (uint8_t handle)
tAVCT_CCB *p_ccb;
/* map handle to ccb */
- if ((p_ccb = avct_ccb_by_idx(handle)) != NULL)
+ p_ccb = avct_ccb_by_idx(handle);
+ if (p_ccb != NULL)
{
if (p_ccb->p_lcb)
{
@@ -412,7 +419,8 @@ uint16_t AVCT_MsgReq(uint8_t handle, uint8_t label, uint8_t cr, BT_HDR *p_msg)
AVCT_TRACE_API("%s len: %d layer_specific: %d", __func__, p_msg->len, p_msg->layer_specific);
/* map handle to ccb */
- if ((p_ccb = avct_ccb_by_idx(handle)) == NULL)
+ p_ccb = avct_ccb_by_idx(handle);
+ if (p_ccb == NULL)
{
result = AVCT_BAD_HANDLE;
osi_free(p_msg);
diff --git a/system/stack/avct/avct_l2c.cc b/system/stack/avct/avct_l2c.cc
index f7f362ef0b7ce5aa212dfdf0cbbfd416b203f815..07358eeaa038f9d47546d804672e9b61e277870a 100644
--- a/system/stack/avct/avct_l2c.cc
+++ b/system/stack/avct/avct_l2c.cc
@@ -110,10 +110,12 @@ void avct_l2c_connect_ind_cback(BD_ADDR bd_addr, uint16_t lcid,
tL2CAP_CFG_INFO cfg;
/* do we already have a channel for this peer? */
- if ((p_lcb = avct_lcb_by_bd(bd_addr)) == NULL)
+ p_lcb = avct_lcb_by_bd(bd_addr);
+ if (p_lcb == NULL)
{
/* no, allocate lcb */
- if ((p_lcb = avct_lcb_alloc(bd_addr)) == NULL)
+ p_lcb = avct_lcb_alloc(bd_addr);
+ if (p_lcb == NULL)
{
/* no ccb available, reject L2CAP connection */
result = L2CAP_CONN_NO_RESOURCES;
@@ -180,7 +182,8 @@ void avct_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result)
tL2CAP_CFG_INFO cfg;
/* look up lcb for this channel */
- if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
+ p_lcb = avct_lcb_by_lcid(lcid);
+ if (p_lcb != NULL)
{
AVCT_TRACE_DEBUG("avct_l2c_connect_cfm_cback lcid:0x%x result: %d ch_state: %d, conflict_lcid:0x%x",
lcid, result, p_lcb->ch_state, p_lcb->conflict_lcid);
@@ -240,7 +243,8 @@ void avct_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
tAVCT_LCB *p_lcb;
/* look up lcb for this channel */
- if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
+ p_lcb = avct_lcb_by_lcid(lcid);
+ if (p_lcb != NULL)
{
AVCT_TRACE_DEBUG("avct_l2c_config_cfm_cback: 0x%x, ch_state: %d, res: %d",
lcid, p_lcb->ch_state, p_cfg->result);
@@ -290,7 +294,8 @@ void avct_l2c_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
tAVCT_LCB *p_lcb;
/* look up lcb for this channel */
- if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
+ p_lcb = avct_lcb_by_lcid(lcid);
+ if (p_lcb != NULL)
{
AVCT_TRACE_DEBUG("avct_l2c_config_ind_cback: 0x%x, ch_state: %d", lcid, p_lcb->ch_state);
/* store the mtu in tbl */
@@ -341,7 +346,8 @@ void avct_l2c_disconnect_ind_cback(uint16_t lcid, bool ack_needed)
uint16_t result = AVCT_RESULT_FAIL;
/* look up lcb for this channel */
- if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
+ p_lcb = avct_lcb_by_lcid(lcid);
+ if (p_lcb != NULL)
{
AVCT_TRACE_DEBUG("avct_l2c_disconnect_ind_cback: 0x%x, ch_state: %d", lcid, p_lcb->ch_state);
if (ack_needed)
@@ -371,7 +377,8 @@ void avct_l2c_disconnect_cfm_cback(uint16_t lcid, uint16_t result)
uint16_t res;
/* look up lcb for this channel */
- if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
+ p_lcb = avct_lcb_by_lcid(lcid);
+ if (p_lcb != NULL)
{
AVCT_TRACE_DEBUG("avct_l2c_disconnect_cfm_cback: 0x%x, ch_state: %d, res: %d",
lcid, p_lcb->ch_state, result);
@@ -400,7 +407,8 @@ void avct_l2c_congestion_ind_cback(uint16_t lcid, bool is_congested)
AVCT_TRACE_DEBUG("avct_l2c_congestion_ind_cback: 0x%x", lcid);
/* look up lcb for this channel */
- if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
+ p_lcb = avct_lcb_by_lcid(lcid);
+ if (p_lcb != NULL)
{
avct_lcb_event(p_lcb, AVCT_LCB_LL_CONG_EVT, (tAVCT_LCB_EVT *) &is_congested);
}
@@ -422,7 +430,8 @@ void avct_l2c_data_ind_cback(uint16_t lcid, BT_HDR *p_buf)
AVCT_TRACE_DEBUG("avct_l2c_data_ind_cback: 0x%x", lcid);
/* look up lcb for this channel */
- if ((p_lcb = avct_lcb_by_lcid(lcid)) != NULL)
+ p_lcb = avct_lcb_by_lcid(lcid);
+ if (p_lcb != NULL)
{
avct_lcb_event(p_lcb, AVCT_LCB_LL_MSG_EVT, (tAVCT_LCB_EVT *) &p_buf);
}
diff --git a/system/stack/avct/avct_l2c_br.cc b/system/stack/avct/avct_l2c_br.cc
index adc1c5052e18a37710e3e30382e718f95cffe685..b60510d13f58d5d4f2333c7391ee3b6a9d1a1ac0 100644
--- a/system/stack/avct/avct_l2c_br.cc
+++ b/system/stack/avct/avct_l2c_br.cc
@@ -124,7 +124,8 @@ void avct_l2c_br_connect_ind_cback(BD_ADDR bd_addr, uint16_t lcid,
memset(&cfg, 0, sizeof(tL2CAP_CFG_INFO));
cfg.mtu_present = true;
- if ((p_lcb = avct_lcb_by_bd(bd_addr)) != NULL)
+ p_lcb = avct_lcb_by_bd(bd_addr);
+ if (p_lcb != NULL)
{
/* control channel exists */
p_bcb = avct_bcb_by_lcb(p_lcb);
diff --git a/system/stack/avct/avct_lcb.cc b/system/stack/avct/avct_lcb.cc
index 96704ccd43e3a9189ffc64127297cbb528841114..21f112292d8690bca0f7da3a77c9a675dd8f632d 100644
--- a/system/stack/avct/avct_lcb.cc
+++ b/system/stack/avct/avct_lcb.cc
@@ -205,7 +205,8 @@ void avct_lcb_event(tAVCT_LCB *p_lcb, uint8_t event, tAVCT_LCB_EVT *p_data)
/* execute action functions */
for (i = 0; i < AVCT_LCB_ACTIONS; i++)
{
- if ((action = state_table[event][i]) != AVCT_LCB_IGNORE)
+ action = state_table[event][i];
+ if (action != AVCT_LCB_IGNORE)
{
(*avct_lcb_action[action])(p_lcb, p_data);
}
@@ -243,7 +244,8 @@ void avct_bcb_event(tAVCT_BCB *p_bcb, uint8_t event, tAVCT_LCB_EVT *p_data)
/* execute action functions */
for (i = 0; i < AVCT_LCB_ACTIONS; i++)
{
- if ((action = state_table[event][i]) != AVCT_LCB_IGNORE)
+ action = state_table[event][i];
+ if (action != AVCT_LCB_IGNORE)
{
(*avct_bcb_action[action])(p_bcb, p_data);
}
diff --git a/system/stack/avct/avct_lcb_act.cc b/system/stack/avct/avct_lcb_act.cc
index 9fcc3230dd2b5f01bc6d2f7443f7d6c283b3bff8..6dfbb4040771927f7acbb6d76db15bd7836b55da 100644
--- a/system/stack/avct/avct_lcb_act.cc
+++ b/system/stack/avct/avct_lcb_act.cc
@@ -663,7 +663,8 @@ void avct_lcb_msg_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
p_data->p_buf->layer_specific = AVCT_DATA_CTRL;
/* reassemble message; if no message available (we received a fragment) return */
- if ((p_data->p_buf = avct_lcb_msg_asmbl(p_lcb, p_data->p_buf)) == NULL)
+ p_data->p_buf = avct_lcb_msg_asmbl(p_lcb, p_data->p_buf);
+ if (p_data->p_buf == NULL)
{
return;
}
diff --git a/system/stack/avdt/avdt_ad.cc b/system/stack/avdt/avdt_ad.cc
index 00c838c770b32ee3957bff1b7d00fefb105940ff..35e5d7c045e782066c0b49164beefba2cfc99dcb 100644
--- a/system/stack/avdt/avdt_ad.cc
+++ b/system/stack/avdt/avdt_ad.cc
@@ -540,7 +540,8 @@ void avdt_ad_open_req(uint8_t type, tAVDT_CCB *p_ccb, tAVDT_SCB *p_scb, uint8_t
tAVDT_TC_TBL *p_tbl;
uint16_t lcid;
- if((p_tbl = avdt_ad_tc_tbl_alloc(p_ccb)) == NULL)
+ p_tbl = avdt_ad_tc_tbl_alloc(p_ccb);
+ if(p_tbl == NULL)
{
AVDT_TRACE_ERROR("avdt_ad_open_req: Cannot allocate p_tbl");
return;
@@ -581,7 +582,8 @@ void avdt_ad_open_req(uint8_t type, tAVDT_CCB *p_ccb, tAVDT_SCB *p_scb, uint8_t
p_tbl->state = AVDT_AD_ST_CONN;
/* call l2cap connect req */
- if ((lcid = L2CA_ConnectReq(AVDT_PSM, p_ccb->peer_addr)) != 0)
+ lcid = L2CA_ConnectReq(AVDT_PSM, p_ccb->peer_addr);
+ if (lcid != 0)
{
/* if connect req ok, store tcid in lcid table */
avdt_cb.ad.lcid_tbl[lcid - L2CAP_BASE_APPL_CID] = avdt_ad_tc_tbl_to_idx(p_tbl);
diff --git a/system/stack/avdt/avdt_api.cc b/system/stack/avdt/avdt_api.cc
index cbc6419a9ac42fe0a2ebafb65d410a337e0a4c33..dd6bb7d833b3557a30fcbb2f6de15308aa90f7ad 100644
--- a/system/stack/avdt/avdt_api.cc
+++ b/system/stack/avdt/avdt_api.cc
@@ -178,13 +178,16 @@ uint16_t AVDT_CreateStream(uint8_t *p_handle, tAVDT_CS *p_cs)
result = AVDT_BAD_PARAMS;
}
/* Allocate scb; if no scbs, return failure */
- else if ((p_scb = avdt_scb_alloc(p_cs)) == NULL)
- {
- result = AVDT_NO_RESOURCES;
- }
- else
- {
- *p_handle = avdt_scb_to_hdl(p_scb);
+ else {
+ p_scb = avdt_scb_alloc(p_cs);
+ if (p_scb == NULL)
+ {
+ result = AVDT_NO_RESOURCES;
+ }
+ else
+ {
+ *p_handle = avdt_scb_to_hdl(p_scb);
+ }
}
return result;
}
@@ -209,7 +212,8 @@ uint16_t AVDT_RemoveStream(uint8_t handle)
tAVDT_SCB *p_scb;
/* look up scb */
- if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
}
@@ -255,9 +259,11 @@ uint16_t AVDT_DiscoverReq(BD_ADDR bd_addr, tAVDT_SEP_INFO *p_sep_info,
tAVDT_CCB_EVT evt;
/* find channel control block for this bd addr; if none, allocate one */
- if ((p_ccb = avdt_ccb_by_bd(bd_addr)) == NULL)
+ p_ccb = avdt_ccb_by_bd(bd_addr);
+ if (p_ccb == NULL)
{
- if ((p_ccb = avdt_ccb_alloc(bd_addr)) == NULL)
+ p_ccb = avdt_ccb_alloc(bd_addr);
+ if (p_ccb == NULL)
{
/* could not allocate channel control block */
result = AVDT_NO_RESOURCES;
@@ -305,12 +311,16 @@ static uint16_t avdt_get_cap_req(BD_ADDR bd_addr, tAVDT_CCB_API_GETCAP *p_evt)
result = AVDT_BAD_PARAMS;
}
/* find channel control block for this bd addr; if none, allocate one */
- else if ((p_ccb = avdt_ccb_by_bd(bd_addr)) == NULL)
- {
- if ((p_ccb = avdt_ccb_alloc(bd_addr)) == NULL)
+ else {
+ p_ccb = avdt_ccb_by_bd(bd_addr);
+ if (p_ccb == NULL)
{
+ p_ccb = avdt_ccb_alloc(bd_addr);
+ if (p_ccb == NULL)
+ {
/* could not allocate channel control block */
- result = AVDT_NO_RESOURCES;
+ result = AVDT_NO_RESOURCES;
+ }
}
}
@@ -418,7 +428,8 @@ uint16_t AVDT_DelayReport(uint8_t handle, uint8_t seid, uint16_t delay)
tAVDT_SCB_EVT evt;
/* map handle to scb */
- if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
}
@@ -459,17 +470,24 @@ uint16_t AVDT_OpenReq(uint8_t handle, BD_ADDR bd_addr, uint8_t seid, tAVDT_CFG *
result = AVDT_BAD_PARAMS;
}
/* map handle to scb */
- else if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
- {
- result = AVDT_BAD_HANDLE;
- }
- /* find channel control block for this bd addr; if none, allocate one */
- else if ((p_ccb = avdt_ccb_by_bd(bd_addr)) == NULL)
- {
- if ((p_ccb = avdt_ccb_alloc(bd_addr)) == NULL)
+ else {
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
+ result = AVDT_BAD_HANDLE;
+ }
+ /* find channel control block for this bd addr; if none, allocate one */
+ else {
+ p_ccb = avdt_ccb_by_bd(bd_addr);
+ if (p_ccb == NULL)
+ {
+ p_ccb = avdt_ccb_alloc(bd_addr);
+ if (p_ccb == NULL)
+ {
/* could not allocate channel control block */
- result = AVDT_NO_RESOURCES;
+ result = AVDT_NO_RESOURCES;
+ }
+ }
}
}
@@ -505,7 +523,8 @@ uint16_t AVDT_ConfigRsp(uint8_t handle, uint8_t label, uint8_t error_code, uint8
uint8_t event_code;
/* map handle to scb */
- if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
}
@@ -566,7 +585,8 @@ uint16_t AVDT_StartReq(uint8_t *p_handles, uint8_t num_handles)
/* verify handles */
for (i = 0; i < num_handles; i++)
{
- if ((p_scb = avdt_scb_by_hdl(p_handles[i])) == NULL)
+ p_scb = avdt_scb_by_hdl(p_handles[i]);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
break;
@@ -622,7 +642,8 @@ uint16_t AVDT_SuspendReq(uint8_t *p_handles, uint8_t num_handles)
/* verify handles */
for (i = 0; i < num_handles; i++)
{
- if ((p_scb = avdt_scb_by_hdl(p_handles[i])) == NULL)
+ p_scb = avdt_scb_by_hdl(p_handles[i]);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
break;
@@ -668,7 +689,8 @@ uint16_t AVDT_CloseReq(uint8_t handle)
uint16_t result = AVDT_SUCCESS;
/* map handle to scb */
- if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
}
@@ -704,7 +726,8 @@ uint16_t AVDT_ReconfigReq(uint8_t handle, tAVDT_CFG *p_cfg)
tAVDT_SCB_EVT evt;
/* map handle to scb */
- if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
}
@@ -739,7 +762,8 @@ uint16_t AVDT_ReconfigRsp(uint8_t handle, uint8_t label, uint8_t error_code, uin
uint16_t result = AVDT_SUCCESS;
/* map handle to scb */
- if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
}
@@ -776,7 +800,8 @@ uint16_t AVDT_SecurityReq(uint8_t handle, uint8_t *p_data, uint16_t len)
tAVDT_SCB_EVT evt;
/* map handle to scb */
- if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
}
@@ -812,7 +837,8 @@ uint16_t AVDT_SecurityRsp(uint8_t handle, uint8_t label, uint8_t error_code,
tAVDT_SCB_EVT evt;
/* map handle to scb */
- if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
}
@@ -871,7 +897,8 @@ uint16_t AVDT_WriteReqOpt(uint8_t handle, BT_HDR *p_pkt, uint32_t time_stamp, ui
uint16_t result = AVDT_SUCCESS;
/* map handle to scb */
- if ((p_scb = avdt_scb_by_hdl(handle)) == NULL)
+ p_scb = avdt_scb_by_hdl(handle);
+ if (p_scb == NULL)
{
result = AVDT_BAD_HANDLE;
}
@@ -947,9 +974,11 @@ uint16_t AVDT_ConnectReq(BD_ADDR bd_addr, uint8_t sec_mask, tAVDT_CTRL_CBACK *p_
tAVDT_CCB_EVT evt;
/* find channel control block for this bd addr; if none, allocate one */
- if ((p_ccb = avdt_ccb_by_bd(bd_addr)) == NULL)
+ p_ccb = avdt_ccb_by_bd(bd_addr);
+ if (p_ccb == NULL)
{
- if ((p_ccb = avdt_ccb_alloc(bd_addr)) == NULL)
+ p_ccb = avdt_ccb_alloc(bd_addr);
+ if (p_ccb == NULL)
{
/* could not allocate channel control block */
result = AVDT_NO_RESOURCES;
@@ -992,7 +1021,8 @@ uint16_t AVDT_DisconnectReq(BD_ADDR bd_addr, tAVDT_CTRL_CBACK *p_cback)
tAVDT_CCB_EVT evt;
/* find channel control block for this bd addr; if none, error */
- if ((p_ccb = avdt_ccb_by_bd(bd_addr)) == NULL)
+ p_ccb = avdt_ccb_by_bd(bd_addr);
+ if (p_ccb == NULL)
{
result = AVDT_BAD_PARAMS;
}
@@ -1057,9 +1087,12 @@ uint16_t AVDT_GetSignalChannel(uint8_t handle, BD_ADDR bd_addr)
{
lcid = avdt_cb.ad.rt_tbl[avdt_ccb_to_idx(p_ccb)][tcid].lcid;
}
- else if ((p_ccb = avdt_ccb_by_bd(bd_addr)) != NULL)
- {
- lcid = avdt_cb.ad.rt_tbl[avdt_ccb_to_idx(p_ccb)][tcid].lcid;
+ else {
+ p_ccb = avdt_ccb_by_bd(bd_addr);
+ if (p_ccb != NULL)
+ {
+ lcid = avdt_cb.ad.rt_tbl[avdt_ccb_to_idx(p_ccb)][tcid].lcid;
+ }
}
return (lcid);
diff --git a/system/stack/avdt/avdt_ccb.cc b/system/stack/avdt/avdt_ccb.cc
index e5f135f0416a6a7fd380aac882c5ea8506c6e7d9..2c4c317b7117429babad69da826001ffd521e7f4 100644
--- a/system/stack/avdt/avdt_ccb.cc
+++ b/system/stack/avdt/avdt_ccb.cc
@@ -317,7 +317,8 @@ void avdt_ccb_event(tAVDT_CCB *p_ccb, uint8_t event, tAVDT_CCB_EVT *p_data)
/* execute action functions */
for (i = 0; i < AVDT_CCB_ACTIONS; i++)
{
- if ((action = state_table[event][i]) != AVDT_CCB_IGNORE)
+ action = state_table[event][i];
+ if (action != AVDT_CCB_IGNORE)
{
(*avdt_cb.p_ccb_act[action])(p_ccb, p_data);
}
diff --git a/system/stack/avdt/avdt_ccb_act.cc b/system/stack/avdt/avdt_ccb_act.cc
index 2ed2294391c56640878a461ad304ce2afbe838ba..c228e96a6cfea4006450d27ad6001ff00d00bc4d 100644
--- a/system/stack/avdt/avdt_ccb_act.cc
+++ b/system/stack/avdt/avdt_ccb_act.cc
@@ -313,7 +313,8 @@ void avdt_ccb_hdl_start_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data)
/* little trick here; length of current command equals number of streams */
for (i = 0; i < p_ccb->p_curr_cmd->len; i++)
{
- if ((p_scb = avdt_scb_by_hdl(p[i])) != NULL)
+ p_scb = avdt_scb_by_hdl(p[i]);
+ if (p_scb != NULL)
{
avdt_scb_event(p_scb, event, (tAVDT_SCB_EVT *) &p_data->msg);
}
@@ -387,7 +388,8 @@ void avdt_ccb_hdl_suspend_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data)
/* little trick here; length of current command equals number of streams */
for (i = 0; i < p_ccb->p_curr_cmd->len; i++)
{
- if ((p_scb = avdt_scb_by_hdl(p[i])) != NULL)
+ p_scb = avdt_scb_by_hdl(p[i]);
+ if (p_scb != NULL)
{
avdt_scb_event(p_scb, event, (tAVDT_SCB_EVT *) &p_data->msg);
}
@@ -517,8 +519,8 @@ void avdt_ccb_snd_start_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data)
memcpy(seid_list, p_data->msg.multi.seid_list, p_data->msg.multi.num_seps);
/* verify all streams in the right state */
- if ((avdt_msg.hdr.err_param = avdt_scb_verify(p_ccb, AVDT_VERIFY_OPEN, p_data->msg.multi.seid_list,
- p_data->msg.multi.num_seps, &avdt_msg.hdr.err_code)) == 0)
+ avdt_msg.hdr.err_param = avdt_scb_verify(p_ccb, AVDT_VERIFY_OPEN, p_data->msg.multi.seid_list, p_data->msg.multi.num_seps, &avdt_msg.hdr.err_code);
+ if (avdt_msg.hdr.err_param == 0)
{
/* set peer seid list in messsage */
avdt_scb_peer_seid_list(&p_data->msg.multi);
@@ -531,7 +533,8 @@ void avdt_ccb_snd_start_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data)
/* failed; send ourselves a reject for each stream */
for (i = 0; i < p_data->msg.multi.num_seps; i++)
{
- if ((p_scb = avdt_scb_by_hdl(seid_list[i])) != NULL)
+ p_scb = avdt_scb_by_hdl(seid_list[i]);
+ if (p_scb != NULL)
{
avdt_scb_event(p_scb, AVDT_SCB_MSG_START_REJ_EVT, (tAVDT_SCB_EVT *) &avdt_msg.hdr);
}
@@ -563,7 +566,8 @@ void avdt_ccb_snd_start_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data)
/* send start event to each scb */
for (i = 0; i < p_data->msg.multi.num_seps; i++)
{
- if ((p_scb = avdt_scb_by_hdl(p_data->msg.multi.seid_list[i])) != NULL)
+ p_scb = avdt_scb_by_hdl(p_data->msg.multi.seid_list[i]);
+ if (p_scb != NULL)
{
avdt_scb_event(p_scb, AVDT_SCB_MSG_START_CMD_EVT, NULL);
}
@@ -595,8 +599,8 @@ void avdt_ccb_snd_suspend_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data)
memcpy(seid_list, p_data->msg.multi.seid_list, p_data->msg.multi.num_seps);
/* verify all streams in the right state */
- if ((avdt_msg.hdr.err_param = avdt_scb_verify(p_ccb, AVDT_VERIFY_STREAMING, p_data->msg.multi.seid_list,
- p_data->msg.multi.num_seps, &avdt_msg.hdr.err_code)) == 0)
+ avdt_msg.hdr.err_param = avdt_scb_verify(p_ccb, AVDT_VERIFY_STREAMING, p_data->msg.multi.seid_list, p_data->msg.multi.num_seps, &avdt_msg.hdr.err_code);
+ if (avdt_msg.hdr.err_param == 0)
{
/* set peer seid list in messsage */
avdt_scb_peer_seid_list(&p_data->msg.multi);
@@ -609,7 +613,8 @@ void avdt_ccb_snd_suspend_cmd(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data)
/* failed; send ourselves a reject for each stream */
for (i = 0; i < p_data->msg.multi.num_seps; i++)
{
- if ((p_scb = avdt_scb_by_hdl(seid_list[i])) != NULL)
+ p_scb = avdt_scb_by_hdl(seid_list[i]);
+ if (p_scb != NULL)
{
avdt_scb_event(p_scb, AVDT_SCB_MSG_SUSPEND_REJ_EVT, (tAVDT_SCB_EVT *) &avdt_msg.hdr);
}
@@ -641,7 +646,8 @@ void avdt_ccb_snd_suspend_rsp(tAVDT_CCB *p_ccb, tAVDT_CCB_EVT *p_data)
/* send start event to each scb */
for (i = 0; i < p_data->msg.multi.num_seps; i++)
{
- if ((p_scb = avdt_scb_by_hdl(p_data->msg.multi.seid_list[i])) != NULL)
+ p_scb = avdt_scb_by_hdl(p_data->msg.multi.seid_list[i]);
+ if (p_scb != NULL)
{
avdt_scb_event(p_scb, AVDT_SCB_MSG_SUSPEND_CMD_EVT, NULL);
}
@@ -845,7 +851,8 @@ void avdt_ccb_snd_cmd(tAVDT_CCB *p_ccb,
*/
if ((!p_ccb->cong) && (p_ccb->p_curr_msg == NULL) && (p_ccb->p_curr_cmd == NULL))
{
- if ((p_msg = (BT_HDR *) fixed_queue_try_dequeue(p_ccb->cmd_q)) != NULL)
+ p_msg = (BT_HDR *)fixed_queue_try_dequeue(p_ccb->cmd_q);
+ if (p_msg != NULL)
{
/* make a copy of buffer in p_curr_cmd */
p_ccb->p_curr_cmd = (BT_HDR *)osi_malloc(AVDT_CMD_BUF_SIZE);
diff --git a/system/stack/avdt/avdt_l2c.cc b/system/stack/avdt/avdt_l2c.cc
index 6d29d060b1b4cff7f76c8f31a86d0cb0e6478e68..1321093906afb66df0c0453e565eff34624a3c59 100644
--- a/system/stack/avdt/avdt_l2c.cc
+++ b/system/stack/avdt/avdt_l2c.cc
@@ -182,10 +182,12 @@ void avdt_l2c_connect_ind_cback(BD_ADDR bd_addr, uint16_t lcid,
tBTM_STATUS rc;
/* do we already have a control channel for this peer? */
- if ((p_ccb = avdt_ccb_by_bd(bd_addr)) == NULL)
+ p_ccb = avdt_ccb_by_bd(bd_addr);
+ if (p_ccb == NULL)
{
/* no, allocate ccb */
- if ((p_ccb = avdt_ccb_alloc(bd_addr)) == NULL)
+ p_ccb = avdt_ccb_alloc(bd_addr);
+ if (p_ccb == NULL)
{
/* no ccb available, reject L2CAP connection */
result = L2CAP_CONN_NO_RESOURCES;
@@ -224,33 +226,38 @@ void avdt_l2c_connect_ind_cback(BD_ADDR bd_addr, uint16_t lcid,
}
}
/* deal with simultaneous control channel connect case */
- else if ((p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_SIG, p_ccb, AVDT_AD_ST_CONN)) != NULL)
- {
- /* reject their connection */
- result = L2CAP_CONN_NO_RESOURCES;
- }
- /* this must be a traffic channel; are we accepting a traffic channel
- ** for this ccb?
- */
- else if ((p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_MEDIA, p_ccb, AVDT_AD_ST_ACP)) != NULL)
- {
- /* yes; proceed with connection */
- result = L2CAP_CONN_OK;
- }
+ else {
+ p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_SIG, p_ccb, AVDT_AD_ST_CONN);
+ if (p_tbl != NULL) {
+ /* reject their connection */
+ result = L2CAP_CONN_NO_RESOURCES;
+ }
+ /* this must be a traffic channel; are we accepting a traffic channel
+ ** for this ccb?
+ */
+ else {
+ p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_MEDIA, p_ccb, AVDT_AD_ST_ACP);
+ if (p_tbl != NULL) {
+ /* yes; proceed with connection */
+ result = L2CAP_CONN_OK;
+ }
#if (AVDT_REPORTING == TRUE)
- /* this must be a reporting channel; are we accepting a reporting channel
- ** for this ccb?
- */
- else if ((p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_REPORT, p_ccb, AVDT_AD_ST_ACP)) != NULL)
- {
- /* yes; proceed with connection */
- result = L2CAP_CONN_OK;
- }
+ /* this must be a reporting channel; are we accepting a reporting channel
+ ** for this ccb?
+ */
+ else {
+ p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_REPORT, p_ccb, AVDT_AD_ST_ACP);
+ if (p_tbl != NULL) {
+ /* yes; proceed with connection */
+ result = L2CAP_CONN_OK;
+ }
#endif
- /* else we're not listening for traffic channel; reject */
- else
- {
- result = L2CAP_CONN_NO_PSM;
+ /* else we're not listening for traffic channel; reject */
+ else {
+ result = L2CAP_CONN_NO_PSM;
+ }
+ }
+ }
}
/* Send L2CAP connect rsp */
@@ -295,7 +302,8 @@ void avdt_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result)
AVDT_TRACE_DEBUG("avdt_l2c_connect_cfm_cback lcid: %d, result: %d",
lcid, result);
/* look up info for this channel */
- if ((p_tbl = avdt_ad_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
/* if in correct state */
if (p_tbl->state == AVDT_AD_ST_CONN)
@@ -372,7 +380,8 @@ void avdt_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
tAVDT_TC_TBL *p_tbl;
/* look up info for this channel */
- if ((p_tbl = avdt_ad_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
p_tbl->lcid = lcid;
@@ -416,7 +425,8 @@ void avdt_l2c_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
tAVDT_TC_TBL *p_tbl;
/* look up info for this channel */
- if ((p_tbl = avdt_ad_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
/* store the mtu in tbl */
if (p_cfg->mtu_present)
@@ -466,7 +476,8 @@ void avdt_l2c_disconnect_ind_cback(uint16_t lcid, bool ack_needed)
AVDT_TRACE_DEBUG("avdt_l2c_disconnect_ind_cback lcid: %d, ack_needed: %d",
lcid, ack_needed);
/* look up info for this channel */
- if ((p_tbl = avdt_ad_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
if (ack_needed)
{
@@ -495,7 +506,8 @@ void avdt_l2c_disconnect_cfm_cback(uint16_t lcid, uint16_t result)
AVDT_TRACE_DEBUG("avdt_l2c_disconnect_cfm_cback lcid: %d, result: %d",
lcid, result);
/* look up info for this channel */
- if ((p_tbl = avdt_ad_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
avdt_ad_tc_close_ind(p_tbl, result);
}
@@ -516,7 +528,8 @@ void avdt_l2c_congestion_ind_cback(uint16_t lcid, bool is_congested)
tAVDT_TC_TBL *p_tbl;
/* look up info for this channel */
- if ((p_tbl = avdt_ad_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
avdt_ad_tc_cong_ind(p_tbl, is_congested);
}
@@ -537,7 +550,8 @@ void avdt_l2c_data_ind_cback(uint16_t lcid, BT_HDR *p_buf)
tAVDT_TC_TBL *p_tbl;
/* look up info for this channel */
- if ((p_tbl = avdt_ad_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
avdt_ad_tc_data_ind(p_tbl, p_buf);
}
diff --git a/system/stack/avdt/avdt_msg.cc b/system/stack/avdt/avdt_msg.cc
index dc9549edfadccd3a8628a8ba9144376f59ff39ff..d9e6dccced0d303536a87cf397ee2fda038a4807 100644
--- a/system/stack/avdt/avdt_msg.cc
+++ b/system/stack/avdt/avdt_msg.cc
@@ -1603,7 +1603,8 @@ void avdt_msg_ind(tAVDT_CCB *p_ccb, BT_HDR *p_buf)
uint8_t scb_hdl;
/* reassemble message; if no message available (we received a fragment) return */
- if ((p_buf = avdt_msg_asmbl(p_ccb, p_buf)) == NULL)
+ p_buf = avdt_msg_asmbl(p_ccb, p_buf);
+ if (p_buf == NULL)
{
return;
}
diff --git a/system/stack/avdt/avdt_scb.cc b/system/stack/avdt/avdt_scb.cc
index 82807598113b94c662beda1b4c7744193ccdda64..be2e17d36457517217a6f74c348316e5d5815dc5 100644
--- a/system/stack/avdt/avdt_scb.cc
+++ b/system/stack/avdt/avdt_scb.cc
@@ -546,7 +546,8 @@ void avdt_scb_event(tAVDT_SCB *p_scb, uint8_t event, tAVDT_SCB_EVT *p_data)
/* execute action functions */
for (i = 0; i < AVDT_SCB_ACTIONS; i++)
{
- if ((action = state_table[event][i]) != AVDT_SCB_IGNORE)
+ action = state_table[event][i];
+ if (action != AVDT_SCB_IGNORE)
{
(*avdt_cb.p_scb_act[action])(p_scb, p_data);
}
@@ -713,7 +714,8 @@ uint8_t avdt_scb_verify(tAVDT_CCB *p_ccb, uint8_t state, uint8_t *p_seid, uint16
/* verify every scb */
for (i = 0, *p_err_code = 0; (i < num_seid) && (*p_err_code == 0) && (i < AVDT_NUM_SEPS); i++)
{
- if ((p_scb = avdt_scb_by_hdl(p_seid[i])) == NULL)
+ p_scb = avdt_scb_by_hdl(p_seid[i]);
+ if (p_scb == NULL)
*p_err_code = AVDT_ERR_BAD_STATE;
else if (p_scb->p_ccb != p_ccb)
*p_err_code = AVDT_ERR_BAD_STATE;
@@ -761,7 +763,8 @@ void avdt_scb_peer_seid_list(tAVDT_MULTI *p_multi)
for (i = 0; i < p_multi->num_seps; i++)
{
- if ((p_scb = avdt_scb_by_hdl(p_multi->seid_list[i])) != NULL)
+ p_scb = avdt_scb_by_hdl(p_multi->seid_list[i]);
+ if (p_scb != NULL)
{
p_multi->seid_list[i] = p_scb->peer_seid;
}
diff --git a/system/stack/avdt/avdt_scb_act.cc b/system/stack/avdt/avdt_scb_act.cc
index cd36517f3601d94726aff83b6606a08bfe1ecb78..5bf52da5edd36785fff07dd63b1fff9320ab9c73 100644
--- a/system/stack/avdt/avdt_scb_act.cc
+++ b/system/stack/avdt/avdt_scb_act.cc
@@ -1485,7 +1485,8 @@ void avdt_scb_clr_pkt(tAVDT_SCB *p_scb,
avdt_ctrl.hdr.err_code = AVDT_ERR_BAD_STATE;
avdt_ctrl.hdr.err_param = 0;
/* flush the media data queued at L2CAP */
- if((p_ccb = p_scb->p_ccb) != NULL)
+ p_ccb = p_scb->p_ccb;
+ if(p_ccb != NULL)
{
/* get tcid from type, scb */
tcid = avdt_ad_type_to_tcid(AVDT_CHAN_MEDIA, p_scb);
diff --git a/system/stack/avrc/avrc_bld_ct.cc b/system/stack/avrc/avrc_bld_ct.cc
index d2f321bc5c4a5b20b9d1a438faee6a003cf415b0..4edbc64f832cdd631b3b11ade42fb1cb0a8d5894 100644
--- a/system/stack/avrc/avrc_bld_ct.cc
+++ b/system/stack/avrc/avrc_bld_ct.cc
@@ -580,7 +580,8 @@ tAVRC_STS AVRC_BldCommand( tAVRC_COMMAND *p_cmd, BT_HDR **pp_pkt)
if (*pp_pkt == NULL)
{
- if ((*pp_pkt = avrc_bld_init_cmd_buffer(p_cmd)) == NULL)
+ *pp_pkt = avrc_bld_init_cmd_buffer(p_cmd);
+ if (*pp_pkt == NULL)
{
AVRC_TRACE_API("AVRC_BldCommand: Failed to initialize command buffer");
return AVRC_STS_INTERNAL_ERR;
diff --git a/system/stack/avrc/avrc_bld_tg.cc b/system/stack/avrc/avrc_bld_tg.cc
index 53a179754407ecaa9f03c98755591cbb91e90b40..1a1b47725aefce99ba7b34d2bb77e5e2fae01d8d 100644
--- a/system/stack/avrc/avrc_bld_tg.cc
+++ b/system/stack/avrc/avrc_bld_tg.cc
@@ -1400,7 +1400,8 @@ tAVRC_STS AVRC_BldResponse( uint8_t handle, tAVRC_RESPONSE *p_rsp, BT_HDR **pp_p
if (*pp_pkt == NULL)
{
- if ((*pp_pkt = avrc_bld_init_rsp_buffer(p_rsp)) == NULL)
+ *pp_pkt = avrc_bld_init_rsp_buffer(p_rsp);
+ if (*pp_pkt == NULL)
{
AVRC_TRACE_API("%s Failed to initialize response buffer", __func__);
return AVRC_STS_INTERNAL_ERR;
diff --git a/system/stack/bnep/bnep_api.cc b/system/stack/bnep/bnep_api.cc
index a54ab1eb32da0dc1299104af3c5a4c918f430782..78f197ce6a372c384936323e2fe56d279357f26c 100644
--- a/system/stack/bnep/bnep_api.cc
+++ b/system/stack/bnep/bnep_api.cc
@@ -152,7 +152,8 @@ tBNEP_RESULT BNEP_Connect (BD_ADDR p_rem_bda,
if (!p_bcb)
{
- if ((p_bcb = bnepu_allocate_bcb (p_rem_bda)) == NULL)
+ p_bcb = bnepu_allocate_bcb(p_rem_bda);
+ if (p_bcb == NULL)
return (BNEP_NO_RESOURCES);
}
else if (p_bcb->con_state != BNEP_STATE_CONNECTED)
@@ -193,7 +194,8 @@ tBNEP_RESULT BNEP_Connect (BD_ADDR p_rem_bda,
/* Transition to the next appropriate state, waiting for connection confirm. */
p_bcb->con_state = BNEP_STATE_CONN_START;
- if ((cid = L2CA_ConnectReq (BT_PSM_BNEP, p_bcb->rem_bda)) != 0)
+ cid = L2CA_ConnectReq(BT_PSM_BNEP, p_bcb->rem_bda);
+ if (cid != 0)
{
p_bcb->l2cap_cid = cid;
diff --git a/system/stack/bnep/bnep_main.cc b/system/stack/bnep/bnep_main.cc
index 37c5bc5abddc787a4f0d94be21054671b21072a0..210d59b610d51764b5ee9dac9adc2b61e5198ee4 100644
--- a/system/stack/bnep/bnep_main.cc
+++ b/system/stack/bnep/bnep_main.cc
@@ -171,7 +171,8 @@ static void bnep_connect_cfm (uint16_t l2cap_cid, uint16_t result)
tBNEP_CONN *p_bcb;
/* Find CCB based on CID */
- if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
+ p_bcb = bnepu_find_bcb_by_cid(l2cap_cid);
+ if (p_bcb == NULL)
{
BNEP_TRACE_WARNING ("BNEP - Rcvd conn cnf for unknown CID 0x%x", l2cap_cid);
return;
@@ -224,7 +225,8 @@ static void bnep_config_ind (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
uint16_t result, mtu = 0;
/* Find CCB based on CID */
- if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
+ p_bcb = bnepu_find_bcb_by_cid(l2cap_cid);
+ if (p_bcb == NULL)
{
BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
@@ -301,7 +303,8 @@ static void bnep_config_cfm (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
BNEP_TRACE_EVENT ("BNEP - Rcvd cfg cfm, CID: 0x%x Result: %d", l2cap_cid, p_cfg->result);
/* Find CCB based on CID */
- if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
+ p_bcb = bnepu_find_bcb_by_cid(l2cap_cid);
+ if (p_bcb == NULL)
{
BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
@@ -363,7 +366,8 @@ static void bnep_disconnect_ind (uint16_t l2cap_cid, bool ack_needed)
L2CA_DisconnectRsp (l2cap_cid);
/* Find CCB based on CID */
- if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
+ p_bcb = bnepu_find_bcb_by_cid(l2cap_cid);
+ if (p_bcb == NULL)
{
BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP disc, unknown CID: 0x%x", l2cap_cid);
return;
@@ -418,7 +422,8 @@ static void bnep_congestion_ind (uint16_t l2cap_cid, bool is_congested)
tBNEP_CONN *p_bcb;
/* Find BCB based on CID */
- if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
+ p_bcb = bnepu_find_bcb_by_cid(l2cap_cid);
+ if (p_bcb == NULL)
{
BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP cong, unknown CID: 0x%x", l2cap_cid);
return;
@@ -483,7 +488,8 @@ static void bnep_data_ind (uint16_t l2cap_cid, BT_HDR *p_buf)
/* Find CCB based on CID */
- if ((p_bcb = bnepu_find_bcb_by_cid (l2cap_cid)) == NULL)
+ p_bcb = bnepu_find_bcb_by_cid(l2cap_cid);
+ if (p_bcb == NULL)
{
BNEP_TRACE_WARNING ("BNEP - Rcvd L2CAP data, unknown CID: 0x%x", l2cap_cid);
osi_free(p_buf);
diff --git a/system/stack/btm/btm_acl.cc b/system/stack/btm/btm_acl.cc
index 99208e58ce2de4aab47a1c86cb21daf6d22315b5..7bdd9853301ff699cc1767b8379a374e602b5d84 100644
--- a/system/stack/btm/btm_acl.cc
+++ b/system/stack/btm/btm_acl.cc
@@ -543,7 +543,8 @@ tBTM_STATUS BTM_GetRole (BD_ADDR remote_bd_addr, uint8_t *p_role)
{
tACL_CONN *p;
BTM_TRACE_DEBUG ("BTM_GetRole");
- if ((p = btm_bda_to_acl(remote_bd_addr, BT_TRANSPORT_BR_EDR)) == NULL)
+ p = btm_bda_to_acl(remote_bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p == NULL)
{
*p_role = BTM_ROLE_UNDEFINED;
return(BTM_UNKNOWN_ADDR);
@@ -600,7 +601,8 @@ tBTM_STATUS BTM_SwitchRole (BD_ADDR remote_bd_addr, uint8_t new_role, tBTM_CMPL_
return(BTM_BUSY);
}
- if ((p = btm_bda_to_acl(remote_bd_addr, BT_TRANSPORT_BR_EDR)) == NULL)
+ p = btm_bda_to_acl(remote_bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p == NULL)
return(BTM_UNKNOWN_ADDR);
/* Finished if already in desired role */
@@ -623,7 +625,8 @@ tBTM_STATUS BTM_SwitchRole (BD_ADDR remote_bd_addr, uint8_t new_role, tBTM_CMPL_
return(BTM_BUSY);
}
- if ((status = BTM_ReadPowerMode(p->remote_addr, &pwr_mode)) != BTM_SUCCESS)
+ status = BTM_ReadPowerMode(p->remote_addr, &pwr_mode);
+ if (status != BTM_SUCCESS)
return(status);
/* Wake up the link if in sniff or park before attempting switch */
@@ -724,8 +727,8 @@ void btm_acl_encrypt_change (uint16_t handle, uint8_t status, uint8_t encr_enabl
btsnd_hcic_switch_role(p->remote_addr, (uint8_t)!p->link_role);
#if (BTM_DISC_DURING_RS == TRUE)
- if ((p_dev_rec = btm_find_dev (p->remote_addr)) != NULL)
- p_dev_rec->rs_disc_pending = BTM_SEC_RS_PENDING;
+ p_dev_rec = btm_find_dev(p->remote_addr);
+ if (p_dev_rec != NULL) p_dev_rec->rs_disc_pending = BTM_SEC_RS_PENDING;
#endif
}
@@ -751,7 +754,8 @@ void btm_acl_encrypt_change (uint16_t handle, uint8_t status, uint8_t encr_enabl
#if (BTM_DISC_DURING_RS == TRUE)
/* If a disconnect is pending, issue it now that role switch has completed */
- if ((p_dev_rec = btm_find_dev (p->remote_addr)) != NULL)
+ p_dev_rec = btm_find_dev(p->remote_addr);
+ if (p_dev_rec != NULL)
{
if (p_dev_rec->rs_disc_pending == BTM_SEC_DISC_PENDING)
{
@@ -806,7 +810,8 @@ tBTM_STATUS BTM_SetLinkPolicy (BD_ADDR remote_bda, uint16_t *settings)
}
}
- if ((p = btm_bda_to_acl(remote_bda, BT_TRANSPORT_BR_EDR)) != NULL) {
+ p = btm_bda_to_acl(remote_bda, BT_TRANSPORT_BR_EDR);
+ if (p != NULL) {
btsnd_hcic_write_policy_set(p->hci_handle, *settings);
return BTM_CMD_STARTED;
}
@@ -1010,7 +1015,8 @@ void btm_read_remote_features (uint16_t handle)
BTM_TRACE_DEBUG("btm_read_remote_features() handle: %d", handle);
- if ((acl_idx = btm_handle_to_acl_index(handle)) >= MAX_L2CAP_LINKS)
+ acl_idx = btm_handle_to_acl_index(handle);
+ if (acl_idx >= MAX_L2CAP_LINKS)
{
BTM_TRACE_ERROR("btm_read_remote_features handle=%d invalid", handle);
return;
@@ -1071,7 +1077,8 @@ void btm_read_remote_features_complete (uint8_t *p)
STREAM_TO_UINT16 (handle, p);
- if ((acl_idx = btm_handle_to_acl_index(handle)) >= MAX_L2CAP_LINKS)
+ acl_idx = btm_handle_to_acl_index(handle);
+ if (acl_idx >= MAX_L2CAP_LINKS)
{
BTM_TRACE_ERROR("btm_read_remote_features_complete handle=%d invalid", handle);
return;
@@ -1127,7 +1134,8 @@ void btm_read_remote_ext_features_complete (uint8_t *p)
STREAM_TO_UINT8 (max_page, p);
/* Validate parameters */
- if ((acl_idx = btm_handle_to_acl_index(handle)) >= MAX_L2CAP_LINKS)
+ acl_idx = btm_handle_to_acl_index(handle);
+ if (acl_idx >= MAX_L2CAP_LINKS)
{
BTM_TRACE_ERROR("btm_read_remote_ext_features_complete handle=%d invalid", handle);
return;
@@ -1182,7 +1190,8 @@ void btm_read_remote_ext_features_failed (uint8_t status, uint16_t handle)
BTM_TRACE_WARNING ("btm_read_remote_ext_features_failed (status 0x%02x) for handle %d",
status, handle);
- if ((acl_idx = btm_handle_to_acl_index(handle)) >= MAX_L2CAP_LINKS)
+ acl_idx = btm_handle_to_acl_index(handle);
+ if (acl_idx >= MAX_L2CAP_LINKS)
{
BTM_TRACE_ERROR("btm_read_remote_ext_features_failed handle=%d invalid", handle);
return;
@@ -1425,7 +1434,8 @@ void btm_process_clk_off_comp_evt (uint16_t hci_handle, uint16_t clock_offset)
uint8_t xx;
BTM_TRACE_DEBUG ("btm_process_clk_off_comp_evt");
/* Look up the connection by handle and set the current mode */
- if ((xx = btm_handle_to_acl_index(hci_handle)) < MAX_L2CAP_LINKS)
+ xx = btm_handle_to_acl_index(hci_handle);
+ if (xx < MAX_L2CAP_LINKS)
btm_cb.acl_db[xx].clock_offset = clock_offset;
}
@@ -1521,7 +1531,8 @@ void btm_acl_role_changed (uint8_t hci_status, BD_ADDR bd_addr, uint8_t new_role
#if (BTM_DISC_DURING_RS == TRUE)
/* If a disconnect is pending, issue it now that role switch has completed */
- if ((p_dev_rec = btm_find_dev (p_bda)) != NULL)
+ p_dev_rec = btm_find_dev(p_bda);
+ if (p_dev_rec != NULL)
{
if (p_dev_rec->rs_disc_pending == BTM_SEC_DISC_PENDING)
{
@@ -1866,7 +1877,8 @@ tBTM_STATUS BTM_SetQoS (BD_ADDR bd, FLOW_SPEC *p_flow, tBTM_CMPL_CB *p_cb)
if (btm_cb.devcb.p_qos_setup_cmpl_cb)
return(BTM_BUSY);
- if ( (p = btm_bda_to_acl(bd, BT_TRANSPORT_BR_EDR)) != NULL)
+ p = btm_bda_to_acl(bd, BT_TRANSPORT_BR_EDR);
+ if (p != NULL)
{
btm_cb.devcb.p_qos_setup_cmpl_cb = p_cb;
alarm_set_on_queue(btm_cb.devcb.qos_setup_timer,
@@ -2416,7 +2428,8 @@ void btm_acl_resubmit_page (void)
BD_ADDR bda;
BTM_TRACE_DEBUG ("btm_acl_resubmit_page");
/* If there were other page request schedule can start the next one */
- if ((p_buf = (BT_HDR *)fixed_queue_try_dequeue(btm_cb.page_queue)) != NULL)
+ p_buf = (BT_HDR *)fixed_queue_try_dequeue(btm_cb.page_queue);
+ if (p_buf != NULL)
{
/* skip 3 (2 bytes opcode and 1 byte len) to get to the bd_addr
* for both create_conn and rmt_name */
diff --git a/system/stack/btm/btm_ble.cc b/system/stack/btm/btm_ble.cc
index 275c1875d66a2bf04e46940ae4a4d16d11b09325..d8c16041609415f763b1abc059906258481061ca 100644
--- a/system/stack/btm/btm_ble.cc
+++ b/system/stack/btm/btm_ble.cc
@@ -794,18 +794,17 @@ bool BTM_UseLeLink (BD_ADDR bd_addr)
tBLE_ADDR_TYPE addr_type;
bool use_le = false;
- if ((p = btm_bda_to_acl(bd_addr, BT_TRANSPORT_BR_EDR)) != NULL)
- {
+ p = btm_bda_to_acl(bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p != NULL) {
return use_le;
- }
- else if ((p = btm_bda_to_acl(bd_addr, BT_TRANSPORT_LE)) != NULL)
- {
- use_le = true;
- }
- else
- {
- BTM_ReadDevInfo(bd_addr, &dev_type, &addr_type);
- use_le = (dev_type == BT_DEVICE_TYPE_BLE);
+ } else {
+ p = btm_bda_to_acl(bd_addr, BT_TRANSPORT_LE);
+ if (p != NULL) {
+ use_le = true;
+ } else {
+ BTM_ReadDevInfo(bd_addr, &dev_type, &addr_type);
+ use_le = (dev_type == BT_DEVICE_TYPE_BLE);
+ }
}
return use_le;
}
@@ -1074,7 +1073,8 @@ void btm_ble_increment_sign_ctr(BD_ADDR bd_addr, bool is_local )
BTM_TRACE_DEBUG ("btm_ble_increment_sign_ctr is_local=%d", is_local);
- if ((p_dev_rec = btm_find_dev (bd_addr)) != NULL)
+ p_dev_rec = btm_find_dev(bd_addr);
+ if (p_dev_rec != NULL)
{
if (is_local)
p_dev_rec->ble.keys.local_counter++;
@@ -1103,7 +1103,8 @@ bool btm_ble_get_enc_key_type(BD_ADDR bd_addr, uint8_t *p_key_types)
BTM_TRACE_DEBUG ("btm_ble_get_enc_key_type");
- if ((p_dev_rec = btm_find_dev (bd_addr)) != NULL)
+ p_dev_rec = btm_find_dev(bd_addr);
+ if (p_dev_rec != NULL)
{
*p_key_types = p_dev_rec->ble.key_type;
return true;
@@ -1305,7 +1306,8 @@ void btm_ble_update_sec_key_size(BD_ADDR bd_addr, uint8_t enc_key_size)
BTM_TRACE_DEBUG("btm_ble_update_sec_key_size enc_key_size = %d", enc_key_size);
- if ((p_rec = btm_find_dev (bd_addr)) != NULL )
+ p_rec = btm_find_dev(bd_addr);
+ if (p_rec != NULL )
{
p_rec->enc_key_size = enc_key_size;
}
@@ -1324,7 +1326,8 @@ uint8_t btm_ble_read_sec_key_size(BD_ADDR bd_addr)
{
tBTM_SEC_DEV_REC *p_rec;
- if ((p_rec = btm_find_dev (bd_addr)) != NULL )
+ p_rec = btm_find_dev(bd_addr);
+ if (p_rec != NULL )
{
return p_rec->enc_key_size;
}
@@ -1861,7 +1864,8 @@ void btm_ble_connected (uint8_t *bda, uint16_t handle, uint8_t enc_mode, uint8_t
if (!p_dev_rec)
{
/* There is no device record for new connection. Allocate one */
- if ((p_dev_rec = btm_sec_alloc_dev (bda)) == NULL)
+ p_dev_rec = btm_sec_alloc_dev(bda);
+ if (p_dev_rec == NULL)
return;
}
else /* Update the timestamp for this device */
@@ -2171,8 +2175,8 @@ bool BTM_BleDataSignature (BD_ADDR bd_addr, uint8_t *p_text, uint16_t len,
UINT32_TO_STREAM(pp, p_rec->ble.keys.local_counter);
UINT32_TO_STREAM(p_mac, p_rec->ble.keys.local_counter);
- if ((ret = aes_cipher_msg_auth_code(p_rec->ble.keys.lcsrk, p_buf, (uint16_t)(len + 4),
- BTM_CMAC_TLEN_SIZE, p_mac)) == true) {
+ ret = aes_cipher_msg_auth_code(p_rec->ble.keys.lcsrk, p_buf, (uint16_t)(len + 4), BTM_CMAC_TLEN_SIZE, p_mac);
+ if (ret == true) {
btm_ble_increment_sign_ctr(bd_addr, true);
}
@@ -2255,7 +2259,8 @@ bool BTM_GetLeSecurityState (BD_ADDR bd_addr, uint8_t *p_le_dev_sec_flags, ui
*p_le_dev_sec_flags = 0;
*p_le_key_size = 0;
- if ((p_dev_rec = btm_find_dev (bd_addr)) == NULL)
+ p_dev_rec = btm_find_dev(bd_addr);
+ if (p_dev_rec == NULL)
{
BTM_TRACE_ERROR ("%s fails", __func__);
return (false);
diff --git a/system/stack/btm/btm_ble_gap.cc b/system/stack/btm/btm_ble_gap.cc
index 743d53b57bd87f6a15ea7bf8891f6679f096ef44..878063dd3b031f42de6321e6ecb30fe72cc07a5c 100644
--- a/system/stack/btm/btm_ble_gap.cc
+++ b/system/stack/btm/btm_ble_gap.cc
@@ -1779,8 +1779,8 @@ uint8_t btm_ble_is_discoverable(BD_ADDR bda, uint8_t evt_type,
if (p_le_inq_cb->adv_len != 0)
{
- if ((p_flag = BTM_CheckAdvData(p_le_inq_cb->adv_data_cache,
- BTM_BLE_AD_TYPE_FLAG, &data_len)) != NULL)
+ p_flag = BTM_CheckAdvData(p_le_inq_cb->adv_data_cache, BTM_BLE_AD_TYPE_FLAG, &data_len);
+ if (p_flag != NULL)
{
flag = * p_flag;
@@ -1993,7 +1993,8 @@ bool btm_ble_update_inq_result(tINQ_DB_ENT *p_i, uint8_t addr_type, uint8_t e
if (p_le_inq_cb->adv_len != 0)
{
- if ((p_flag = BTM_CheckAdvData(p_le_inq_cb->adv_data_cache, BTM_BLE_AD_TYPE_FLAG, &len)) != NULL)
+ p_flag = BTM_CheckAdvData(p_le_inq_cb->adv_data_cache, BTM_BLE_AD_TYPE_FLAG, &len);
+ if (p_flag != NULL)
p_cur->flag = * p_flag;
}
@@ -2010,8 +2011,8 @@ bool btm_ble_update_inq_result(tINQ_DB_ENT *p_i, uint8_t addr_type, uint8_t e
}
else
{
- if ((p_uuid16 = BTM_CheckAdvData(p_le_inq_cb->adv_data_cache,
- BTM_BLE_AD_TYPE_16SRV_CMPL, &len)) != NULL)
+ p_uuid16 = BTM_CheckAdvData(p_le_inq_cb->adv_data_cache, BTM_BLE_AD_TYPE_16SRV_CMPL, &len);
+ if (p_uuid16 != NULL)
{
uint8_t i;
for (i = 0; i + 2 <= len; i = i + 2)
@@ -2226,7 +2227,8 @@ static void btm_ble_process_adv_pkt_cont(BD_ADDR bda, uint8_t addr_type, uint8_t
/* If existing entry, use that, else get a new one (possibly reusing the oldest) */
if (p_i == NULL)
{
- if ((p_i = btm_inq_db_new (bda)) != NULL)
+ p_i = btm_inq_db_new(bda);
+ if (p_i != NULL)
{
p_inq->inq_cmpl_info.num_resp++;
}
@@ -2241,7 +2243,8 @@ static void btm_ble_process_adv_pkt_cont(BD_ADDR bda, uint8_t addr_type, uint8_t
if (!btm_ble_update_inq_result(p_i, addr_type, evt_type, p))
return;
- if ((result = btm_ble_is_discoverable(bda, evt_type, p)) == 0)
+ result = btm_ble_is_discoverable(bda, evt_type, p);
+ if (result == 0)
{
LOG_WARN(LOG_TAG, "%s device is no longer discoverable so discarding advertising packet pkt",
__func__);
diff --git a/system/stack/btm/btm_dev.cc b/system/stack/btm/btm_dev.cc
index f4918a6120d1614a13eb7657c5f208472d0f09e4..b66b3e0f1941e928b87149d8d03f0892cfcf74c0 100644
--- a/system/stack/btm/btm_dev.cc
+++ b/system/stack/btm/btm_dev.cc
@@ -220,7 +220,8 @@ char *BTM_SecReadDevName (BD_ADDR bd_addr)
char *p_name = NULL;
tBTM_SEC_DEV_REC *p_srec;
- if ((p_srec = btm_find_dev(bd_addr)) != NULL)
+ p_srec = btm_find_dev(bd_addr);
+ if (p_srec != NULL)
p_name = (char *)p_srec->sec_bd_name;
return(p_name);
@@ -256,7 +257,8 @@ tBTM_SEC_DEV_REC *btm_sec_alloc_dev (BD_ADDR bd_addr)
/* Check with the BT manager if details about remote device are known */
/* outgoing connection */
- if ((p_inq_info = BTM_InqDbRead(bd_addr)) != NULL)
+ p_inq_info = BTM_InqDbRead(bd_addr);
+ if (p_inq_info != NULL)
{
memcpy (p_dev_rec->dev_class, p_inq_info->results.dev_class, DEV_CLASS_LEN);
@@ -487,7 +489,8 @@ tBTM_SEC_DEV_REC *btm_find_or_alloc_dev (BD_ADDR bd_addr)
{
tBTM_SEC_DEV_REC *p_dev_rec;
BTM_TRACE_EVENT ("btm_find_or_alloc_dev");
- if ((p_dev_rec = btm_find_dev (bd_addr)) == NULL)
+ p_dev_rec = btm_find_dev(bd_addr);
+ if (p_dev_rec == NULL)
{
/* Allocate a new device record or reuse the oldest one */
diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc
index 89c8479c9939c62ead8236ea76fc774d2092aba4..e8999bd99bf3e87e5b981ab4dbac122d9dcf6524 100644
--- a/system/stack/btm/btm_inq.cc
+++ b/system/stack/btm/btm_inq.cc
@@ -506,7 +506,8 @@ tBTM_STATUS BTM_SetPeriodicInquiryMode (tBTM_INQ_PARMS *p_inqparms, uint16_t max
p_inq->state = BTM_INQ_SET_FILT_STATE;
/* Before beginning the inquiry the current filter must be cleared, so initiate the command */
- if ((status = btm_set_inq_event_filter (p_inqparms->filter_cond_type, &p_inqparms->filter_cond)) != BTM_CMD_STARTED)
+ status = btm_set_inq_event_filter(p_inqparms->filter_cond_type, &p_inqparms->filter_cond);
+ if (status != BTM_CMD_STARTED)
{
/* If set filter command is not succesful reset the state */
p_inq->p_inq_results_cb = NULL;
@@ -892,11 +893,13 @@ tBTM_STATUS BTM_StartInquiry (tBTM_INQ_PARMS *p_inqparms, tBTM_INQ_RESULTS_CB *p
status = BTM_ILLEGAL_VALUE;
}
/* BLE for now does not support filter condition for inquiry */
- else if ((status = btm_ble_start_inquiry((uint8_t)(p_inqparms->mode & BTM_BLE_INQUIRY_MASK),
- p_inqparms->duration)) != BTM_CMD_STARTED)
- {
- BTM_TRACE_ERROR("Err Starting LE Inquiry.");
- p_inq->inqparms.mode &= ~ BTM_BLE_INQUIRY_MASK;
+ else {
+ status = btm_ble_start_inquiry((uint8_t)(p_inqparms->mode & BTM_BLE_INQUIRY_MASK), p_inqparms->duration);
+ if (status != BTM_CMD_STARTED)
+ {
+ BTM_TRACE_ERROR("Err Starting LE Inquiry.");
+ p_inq->inqparms.mode &= ~ BTM_BLE_INQUIRY_MASK;
+ }
}
#if (BTA_HOST_INTERLEAVE_SEARCH == FALSE)
p_inqparms->mode &= ~BTM_BLE_INQUIRY_MASK;
@@ -960,8 +963,8 @@ tBTM_STATUS BTM_StartInquiry (tBTM_INQ_PARMS *p_inqparms, tBTM_INQ_RESULTS_CB *p
}
/* Before beginning the inquiry the current filter must be cleared, so initiate the command */
- if ((status = btm_set_inq_event_filter (p_inqparms->filter_cond_type,
- &p_inqparms->filter_cond)) != BTM_CMD_STARTED)
+ status = btm_set_inq_event_filter(p_inqparms->filter_cond_type, &p_inqparms->filter_cond);
+ if (status != BTM_CMD_STARTED)
p_inq->state = BTM_INQ_INACTIVE_STATE;
#if (BTA_HOST_INTERLEAVE_SEARCH == TRUE)
@@ -1022,7 +1025,8 @@ tBTM_STATUS BTM_ReadRemoteDeviceName (BD_ADDR remote_bda, tBTM_CMPL_CB *p_cb
remote_bda[3], remote_bda[4], remote_bda[5]);
/* Use the remote device's clock offset if it is in the local inquiry database */
- if ((p_i = btm_inq_db_find (remote_bda)) != NULL)
+ p_i = btm_inq_db_find(remote_bda);
+ if (p_i != NULL)
{
p_cur = &p_i->inq_info;
if ((p_cur->results.ble_evt_type == BTM_BLE_EVT_NON_CONN_ADV) &&
@@ -1694,7 +1698,8 @@ void btm_event_filter_complete (uint8_t *p)
/* Check to see if a new filter needs to be set up */
if (p_inq->state == BTM_INQ_CLR_FILT_STATE)
{
- if ((status = btm_set_inq_event_filter (p_inq->inqparms.filter_cond_type, &p_inq->inqparms.filter_cond)) == BTM_CMD_STARTED)
+ status = btm_set_inq_event_filter(p_inq->inqparms.filter_cond_type, &p_inq->inqparms.filter_cond);
+ if (status == BTM_CMD_STARTED)
{
p_inq->state = BTM_INQ_SET_FILT_STATE;
}
diff --git a/system/stack/btm/btm_pm.cc b/system/stack/btm/btm_pm.cc
index 54510f9e6cfefb0e26069fb6209198199de9dfb0..2cde8e975a370e20ed72e7c75fbdf14a52a0afcc 100644
--- a/system/stack/btm/btm_pm.cc
+++ b/system/stack/btm/btm_pm.cc
@@ -286,7 +286,8 @@ tBTM_STATUS BTM_ReadPowerMode (BD_ADDR remote_bda, tBTM_PM_MODE *p_mode)
{
int acl_ind;
- if( (acl_ind = btm_pm_find_acl_ind(remote_bda)) == MAX_L2CAP_LINKS)
+ acl_ind = btm_pm_find_acl_ind(remote_bda);
+ if(acl_ind == MAX_L2CAP_LINKS)
return (BTM_UNKNOWN_ADDR);
*p_mode = btm_cb.pm_mode_db[acl_ind].state;
@@ -350,7 +351,8 @@ tBTM_STATUS BTM_SetSsrParams (BD_ADDR remote_bda, uint16_t max_lat,
int acl_ind;
tBTM_PM_MCB *p_cb;
- if( (acl_ind = btm_pm_find_acl_ind(remote_bda)) == MAX_L2CAP_LINKS)
+ acl_ind = btm_pm_find_acl_ind(remote_bda);
+ if(acl_ind == MAX_L2CAP_LINKS)
return (BTM_UNKNOWN_ADDR);
if(BTM_PM_STS_ACTIVE == btm_cb.pm_mode_db[acl_ind].state ||
@@ -805,7 +807,8 @@ void btm_pm_proc_mode_change (uint8_t hci_status, uint16_t hci_handle, uint8_t m
tL2C_LCB *p_lcb;
/* get the index to acl_db */
- if ((xx = btm_handle_to_acl_index(hci_handle)) >= MAX_L2CAP_LINKS)
+ xx = btm_handle_to_acl_index(hci_handle);
+ if (xx >= MAX_L2CAP_LINKS)
return;
p = &btm_cb.acl_db[xx];
@@ -819,7 +822,8 @@ void btm_pm_proc_mode_change (uint8_t hci_status, uint16_t hci_handle, uint8_t m
BTM_TRACE_DEBUG("%s switched from %s to %s.", __func__,
mode_to_string(old_state), mode_to_string(p_cb->state));
- if ((p_lcb = l2cu_find_lcb_by_bd_addr(p->remote_addr, BT_TRANSPORT_BR_EDR)) != NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(p->remote_addr, BT_TRANSPORT_BR_EDR);
+ if (p_lcb != NULL)
{
if ((p_cb->state == BTM_PM_ST_ACTIVE) || (p_cb->state == BTM_PM_ST_SNIFF))
{
@@ -903,7 +907,8 @@ void btm_pm_proc_ssr_evt (uint8_t *p,
STREAM_TO_UINT16 (handle, p);
/* get the index to acl_db */
- if ((xx = btm_handle_to_acl_index(handle)) >= MAX_L2CAP_LINKS)
+ xx = btm_handle_to_acl_index(handle);
+ if (xx >= MAX_L2CAP_LINKS)
return;
p += 2;
diff --git a/system/stack/btm/btm_sco.cc b/system/stack/btm/btm_sco.cc
index 73049dbba840319c62624c9f66774c234f4cb44c..10330cefbac572fc9e5810ddcd57b96ad7132825 100644
--- a/system/stack/btm/btm_sco.cc
+++ b/system/stack/btm/btm_sco.cc
@@ -270,10 +270,11 @@ void btm_route_sco_data(BT_HDR *p_msg)
STREAM_TO_UINT8 (pkt_size, p);
- if ((sco_inx = btm_find_scb_by_handle(handle)) != BTM_MAX_SCO_LINKS )
+ sco_inx = btm_find_scb_by_handle(handle);
+ if (sco_inx != BTM_MAX_SCO_LINKS)
{
/* send data callback */
- if (!btm_cb.sco_cb.p_data_cb )
+ if (!btm_cb.sco_cb.p_data_cb)
/* if no data callback registered, just free the buffer */
osi_free(p_msg);
else
@@ -406,7 +407,8 @@ static tBTM_STATUS btm_send_connect_request(uint16_t acl_handle,
/* Finally, remove EDR eSCO if the remote device doesn't support it */
/* UPF25: Only SCO was brought up in this case */
btm_handle_to_acl_index(acl_handle);
- if ((xx = btm_handle_to_acl_index(acl_handle)) < MAX_L2CAP_LINKS)
+ xx = btm_handle_to_acl_index(acl_handle);
+ if (xx < MAX_L2CAP_LINKS)
{
p_acl = &btm_cb.acl_db[xx];
if (!HCI_EDR_ESCO_2MPS_SUPPORTED(p_acl->peer_lmp_features[HCI_EXT_FEATURES_PAGE_0]))
diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc
index f484b64f051c29a61ef3fd90913eafa3638572cf..b46d4ed780a0843538d1ee4a37b0b61e00befac6 100644
--- a/system/stack/btm/btm_sec.cc
+++ b/system/stack/btm/btm_sec.cc
@@ -332,7 +332,8 @@ bool BTM_GetSecurityFlags (BD_ADDR bd_addr, uint8_t * p_sec_flags)
{
tBTM_SEC_DEV_REC *p_dev_rec;
- if ((p_dev_rec = btm_find_dev (bd_addr)) != NULL)
+ p_dev_rec = btm_find_dev(bd_addr);
+ if (p_dev_rec != NULL)
{
*p_sec_flags = (uint8_t) p_dev_rec->sec_flags;
return(true);
@@ -355,7 +356,8 @@ bool BTM_GetSecurityFlagsByTransport (BD_ADDR bd_addr, uint8_t * p_sec_flags,
{
tBTM_SEC_DEV_REC *p_dev_rec;
- if ((p_dev_rec = btm_find_dev (bd_addr)) != NULL)
+ p_dev_rec = btm_find_dev(bd_addr);
+ if (p_dev_rec != NULL)
{
if (transport == BT_TRANSPORT_BR_EDR)
*p_sec_flags = (uint8_t) p_dev_rec->sec_flags;
@@ -805,7 +807,8 @@ void btm_sec_clr_temp_auth_service (BD_ADDR bda)
{
tBTM_SEC_DEV_REC *p_dev_rec;
- if ((p_dev_rec = btm_find_dev (bda)) == NULL)
+ p_dev_rec = btm_find_dev(bda);
+ if (p_dev_rec == NULL)
{
BTM_TRACE_WARNING ("btm_sec_clr_temp_auth_service() - no dev CB");
return;
@@ -855,7 +858,8 @@ void BTM_PINCodeReply (BD_ADDR bd_addr, uint8_t res, uint8_t pin_len, uint8_t *p
return;
}
- if ((p_dev_rec = btm_find_dev (bd_addr)) == NULL)
+ p_dev_rec = btm_find_dev(bd_addr);
+ if (p_dev_rec == NULL)
{
BTM_TRACE_ERROR ("BTM_PINCodeReply() - no dev CB");
return;
@@ -974,7 +978,8 @@ tBTM_STATUS btm_sec_bond_by_transport (BD_ADDR bd_addr, tBT_TRANSPORT transport,
return(BTM_WRONG_MODE);
}
- if ((p_dev_rec = btm_find_or_alloc_dev (bd_addr)) == NULL)
+ p_dev_rec = btm_find_or_alloc_dev(bd_addr);
+ if (p_dev_rec == NULL)
{
return(BTM_NO_RESOURCES);
}
@@ -1510,7 +1515,8 @@ void BTM_ConfirmReqReply(tBTM_STATUS res, BD_ADDR bd_addr)
if (res == BTM_SUCCESS)
{
- if ((p_dev_rec = btm_find_dev (bd_addr)) != NULL) {
+ p_dev_rec = btm_find_dev(bd_addr);
+ if (p_dev_rec != NULL) {
p_dev_rec->sec_flags |= BTM_SEC_LINK_KEY_AUTHED;
p_dev_rec->sec_flags |= BTM_SEC_16_DIGIT_PIN_AUTHED;
}
@@ -1824,7 +1830,8 @@ bool BTM_PeerSupportsSecureConnections(BD_ADDR bd_addr)
{
tBTM_SEC_DEV_REC *p_dev_rec;
- if ((p_dev_rec = btm_find_dev(bd_addr)) == NULL)
+ p_dev_rec = btm_find_dev(bd_addr);
+ if (p_dev_rec == NULL)
{
BTM_TRACE_WARNING("%s: unknown BDA: %08x%04x", __func__,
(bd_addr[0]<<24) + (bd_addr[1]<<16) + (bd_addr[2]<<8) + bd_addr[3],
@@ -2416,7 +2423,8 @@ tBTM_STATUS btm_sec_l2cap_access_req (BD_ADDR bd_addr, uint16_t psm, uint16_t ha
__func__, psm, handle, p_dev_rec->sec_state, p_dev_rec->sec_flags,
p_dev_rec->security_required, p_dev_rec->p_cur_service->service_id);
- if ((rc = btm_sec_execute_procedure (p_dev_rec)) != BTM_CMD_STARTED)
+ rc = btm_sec_execute_procedure(p_dev_rec);
+ if (rc != BTM_CMD_STARTED)
{
p_dev_rec->p_callback = NULL;
(*p_callback) (bd_addr, transport, p_dev_rec->p_ref_data, (uint8_t)rc);
@@ -2642,7 +2650,8 @@ tBTM_STATUS btm_sec_mx_access_request (BD_ADDR bd_addr, uint16_t psm, bool is
__func__, mx_proto_id, mx_chan_id, p_dev_rec->sec_state, p_dev_rec->sec_flags,
p_dev_rec->security_required, p_dev_rec->p_cur_service->service_id);
- if ((rc = btm_sec_execute_procedure (p_dev_rec)) != BTM_CMD_STARTED)
+ rc = btm_sec_execute_procedure(p_dev_rec);
+ if (rc != BTM_CMD_STARTED)
{
if (p_callback)
{
@@ -2759,7 +2768,8 @@ static void btm_sec_bond_cancel_complete (void)
* However, this function may clean out the security related flags and btm_sec_connected would not know
* this function also needs to do proper clean up.
*/
- if ((p_dev_rec = btm_find_dev (btm_cb.pairing_bda)) != NULL)
+ p_dev_rec = btm_find_dev(btm_cb.pairing_bda);
+ if (p_dev_rec != NULL)
p_dev_rec->security_required = BTM_SEC_NONE;
btm_sec_change_pairing_state (BTM_PAIR_STATE_IDLE);
@@ -3748,7 +3758,8 @@ void btm_simple_pair_complete (uint8_t *p)
status = *p++;
STREAM_TO_BDADDR (evt_data.bd_addr, p);
- if ((p_dev_rec = btm_find_dev (evt_data.bd_addr)) == NULL)
+ p_dev_rec = btm_find_dev(evt_data.bd_addr);
+ if (p_dev_rec == NULL)
{
BTM_TRACE_ERROR ("btm_simple_pair_complete() with unknown BDA: %08x%04x",
(evt_data.bd_addr[0]<<24) + (evt_data.bd_addr[1]<<16) + (evt_data.bd_addr[2]<<8) + evt_data.bd_addr[3],
@@ -3905,7 +3916,8 @@ static void btm_sec_auth_collision (uint16_t handle)
{
if (handle == BTM_SEC_INVALID_HANDLE)
{
- if ((p_dev_rec = btm_sec_find_dev_by_sec_state (BTM_SEC_STATE_AUTHENTICATING)) == NULL)
+ p_dev_rec = btm_sec_find_dev_by_sec_state(BTM_SEC_STATE_AUTHENTICATING);
+ if (p_dev_rec == NULL)
p_dev_rec = btm_sec_find_dev_by_sec_state (BTM_SEC_STATE_ENCRYPTING);
}
else
@@ -4629,7 +4641,8 @@ void btm_sec_connected (uint8_t *bda, uint16_t handle, uint8_t status, uint8_t e
BTM_TRACE_DEBUG ("is_originator:%d ", p_dev_rec->is_originator);
if (!(p_dev_rec->sec_flags & BTM_SEC_NAME_KNOWN) || p_dev_rec->is_originator)
{
- if ((res = btm_sec_execute_procedure (p_dev_rec)) != BTM_CMD_STARTED)
+ res = btm_sec_execute_procedure(p_dev_rec);
+ if (res != BTM_CMD_STARTED)
btm_sec_dev_rec_cback_event (p_dev_rec, res, false);
}
return;
@@ -5226,12 +5239,14 @@ void btm_sec_update_clock_offset (uint16_t handle, uint16_t clock_offset)
tBTM_SEC_DEV_REC *p_dev_rec;
tBTM_INQ_INFO *p_inq_info;
- if ((p_dev_rec = btm_find_dev_by_handle (handle)) == NULL)
+ p_dev_rec = btm_find_dev_by_handle(handle);
+ if (p_dev_rec == NULL)
return;
p_dev_rec->clock_offset = clock_offset | BTM_CLOCK_OFFSET_VALID;
- if ((p_inq_info = BTM_InqDbRead(p_dev_rec->bd_addr)) == NULL)
+ p_inq_info = BTM_InqDbRead(p_dev_rec->bd_addr);
+ if (p_inq_info == NULL)
return;
p_inq_info->results.clock_offset = clock_offset | BTM_CLOCK_OFFSET_VALID;
diff --git a/system/stack/gap/gap_ble.cc b/system/stack/gap/gap_ble.cc
index 0058f118939fbef3bf9c004be02a52a87ea4078f..7acde464e8fbdd56c72f91802f7e531c1746cc6d 100644
--- a/system/stack/gap/gap_ble.cc
+++ b/system/stack/gap/gap_ble.cc
@@ -674,9 +674,11 @@ bool gap_ble_accept_cl_operation(BD_ADDR peer_bda, uint16_t uuid, tGAP_BLE_CM
if (p_cback == NULL && uuid != GATT_UUID_GAP_PREF_CONN_PARAM)
return(started);
- if ((p_clcb = gap_find_clcb_by_bd_addr (peer_bda)) == NULL)
+ p_clcb = gap_find_clcb_by_bd_addr(peer_bda);
+ if (p_clcb == NULL)
{
- if ((p_clcb = gap_clcb_alloc(peer_bda)) == NULL)
+ p_clcb = gap_clcb_alloc(peer_bda);
+ if (p_clcb == NULL)
{
GAP_TRACE_ERROR("gap_ble_accept_cl_operation max connection reached");
return started;
diff --git a/system/stack/gap/gap_conn.cc b/system/stack/gap/gap_conn.cc
index b63fca7207542e9707269f262b58dc9c93b6c5bb..365644411910f24daf3f6f3c1534b2817acea442 100644
--- a/system/stack/gap/gap_conn.cc
+++ b/system/stack/gap/gap_conn.cc
@@ -135,7 +135,8 @@ uint16_t GAP_ConnOpen(const char *p_serv_name, uint8_t service_id, bool is_serve
GAP_TRACE_EVENT ("GAP_CONN - Open Request");
/* Allocate a new CCB. Return if none available. */
- if ((p_ccb = gap_allocate_ccb()) == NULL)
+ p_ccb = gap_allocate_ccb();
+ if (p_ccb == NULL)
return (GAP_INVALID_HANDLE);
/* update the transport */
@@ -599,7 +600,8 @@ uint16_t GAP_ConnSetIdleTimeout (uint16_t gap_handle, uint16_t timeout)
{
tGAP_CCB *p_ccb;
- if ((p_ccb = gap_find_ccb_by_handle (gap_handle)) == NULL)
+ p_ccb = gap_find_ccb_by_handle(gap_handle);
+ if (p_ccb == NULL)
return (GAP_ERR_BAD_HANDLE);
if (L2CA_SetIdleTimeout (p_ccb->connection_id, timeout, false))
@@ -659,7 +661,8 @@ uint16_t GAP_ConnGetRemMtuSize (uint16_t gap_handle)
{
tGAP_CCB *p_ccb;
- if ((p_ccb = gap_find_ccb_by_handle (gap_handle)) == NULL)
+ p_ccb = gap_find_ccb_by_handle(gap_handle);
+ if (p_ccb == NULL)
return (0);
return (p_ccb->rem_mtu_size);
@@ -681,7 +684,8 @@ uint16_t GAP_ConnGetL2CAPCid (uint16_t gap_handle)
{
tGAP_CCB *p_ccb;
- if ((p_ccb = gap_find_ccb_by_handle (gap_handle)) == NULL)
+ p_ccb = gap_find_ccb_by_handle(gap_handle);
+ if (p_ccb == NULL)
return (0);
return (p_ccb->connection_id);
@@ -850,7 +854,8 @@ static void gap_connect_cfm (uint16_t l2cap_cid, uint16_t result)
tGAP_CCB *p_ccb;
/* Find CCB based on CID */
- if ((p_ccb = gap_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = gap_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
return;
/* initiate security process, if needed */
@@ -911,7 +916,8 @@ static void gap_config_ind (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
uint16_t local_mtu_size;
/* Find CCB based on CID */
- if ((p_ccb = gap_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = gap_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
return;
/* Remember the remote MTU size */
@@ -960,7 +966,8 @@ static void gap_config_cfm (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
tGAP_CCB *p_ccb;
/* Find CCB based on CID */
- if ((p_ccb = gap_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = gap_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
return;
if (p_cfg->result == L2CAP_CFG_OK)
@@ -1000,7 +1007,8 @@ static void gap_disconnect_ind (uint16_t l2cap_cid, bool ack_needed)
GAP_TRACE_EVENT ("GAP_CONN - Rcvd L2CAP disc, CID: 0x%x", l2cap_cid);
/* Find CCB based on CID */
- if ((p_ccb = gap_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = gap_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
return;
if (ack_needed)
@@ -1025,7 +1033,8 @@ static void gap_data_ind (uint16_t l2cap_cid, BT_HDR *p_msg)
tGAP_CCB *p_ccb;
/* Find CCB based on CID */
- if ((p_ccb = gap_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = gap_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
{
osi_free(p_msg);
return;
@@ -1069,7 +1078,8 @@ static void gap_congestion_ind (uint16_t lcid, bool is_congested)
is_congested, lcid);
/* Find CCB based on CID */
- if ((p_ccb = gap_find_ccb_by_cid (lcid)) == NULL)
+ p_ccb = gap_find_ccb_by_cid(lcid);
+ if (p_ccb == NULL)
return;
p_ccb->is_congested = is_congested;
diff --git a/system/stack/gatt/gatt_api.cc b/system/stack/gatt/gatt_api.cc
index 66765c33255e562170628769f2a4350c41a0d94b..ec0da3635e60882a6b81de5c645ac5109078af0a 100644
--- a/system/stack/gatt/gatt_api.cc
+++ b/system/stack/gatt/gatt_api.cc
@@ -82,7 +82,8 @@ bool GATTS_AddHandleRange(tGATTS_HNDL_RANGE *p_hndl_range)
tGATT_HDL_LIST_ELEM *p_buf;
bool status= false;
- if ((p_buf = gatt_alloc_hdl_buffer()) != NULL)
+ p_buf = gatt_alloc_hdl_buffer();
+ if (p_buf != NULL)
{
p_buf->asgn_range = *p_hndl_range;
status = gatt_add_an_item_to_list(&gatt_cb.hdl_list_info, p_buf);
@@ -249,7 +250,8 @@ uint16_t GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t *service, int co
return GATT_INTERNAL_ERROR;
}
- if ( (p_list = gatt_alloc_hdl_buffer()) == NULL) {
+ p_list = gatt_alloc_hdl_buffer();
+ if (p_list == NULL) {
/* No free entry */
GATT_TRACE_ERROR ("GATTS_ReserveHandles: no free handle blocks");
return GATT_INTERNAL_ERROR;
@@ -306,7 +308,8 @@ uint16_t GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t *service, int co
el->attribute_handle = gatts_add_char_descr(&p_list->svc_db, el->permissions, &uuid);
} else if (el->type == BTGATT_DB_INCLUDED_SERVICE) {
tGATT_HDL_LIST_ELEM *p_incl_decl;
- if ((p_incl_decl = gatt_find_hdl_buffer_by_handle(el->attribute_handle)) == NULL) {
+ p_incl_decl = gatt_find_hdl_buffer_by_handle(el->attribute_handle);
+ if (p_incl_decl == NULL) {
GATT_TRACE_DEBUG("Included Service not created");
return GATT_INTERNAL_ERROR;
}
@@ -325,7 +328,8 @@ uint16_t GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t *service, int co
GATT_TRACE_API("%s: service parsed correctly, now starting", __func__);
/*this is a new application servoce start */
- if ((i_sreg = gatt_sr_alloc_rcb(p_list)) == GATT_MAX_SR_PROFILES) {
+ i_sreg = gatt_sr_alloc_rcb(p_list);
+ if (i_sreg == GATT_MAX_SR_PROFILES) {
GATT_TRACE_ERROR ("%s: no free server registration block", __func__);
return GATT_NO_RESOURCES;
}
@@ -385,7 +389,8 @@ bool GATTS_DeleteService (tGATT_IF gatt_if, tBT_UUID *p_svc_uuid, uint16_t sv
}
p_app_uuid128 = &p_reg->app_uuid128;
- if ((p_list = gatt_find_hdl_buffer_by_app_id(p_app_uuid128, p_svc_uuid, svc_inst)) == NULL)
+ p_list = gatt_find_hdl_buffer_by_app_id(p_app_uuid128, p_svc_uuid, svc_inst);
+ if (p_list == NULL)
{
GATT_TRACE_ERROR ("No Service found");
return false;
@@ -393,9 +398,8 @@ bool GATTS_DeleteService (tGATT_IF gatt_if, tBT_UUID *p_svc_uuid, uint16_t sv
gatt_proc_srv_chg();
- if ((i_sreg = gatt_sr_find_i_rcb_by_app_id (p_app_uuid128,
- p_svc_uuid,
- svc_inst)) != GATT_MAX_SR_PROFILES)
+ i_sreg = gatt_sr_find_i_rcb_by_app_id(p_app_uuid128, p_svc_uuid, svc_inst);
+ if (i_sreg != GATT_MAX_SR_PROFILES)
{
GATTS_StopService(gatt_cb.sr_reg[i_sreg].s_hdl);
}
@@ -492,7 +496,8 @@ tGATT_STATUS GATTS_HandleValueIndication (uint16_t conn_id, uint16_t attr_handl
if (GATT_HANDLE_IS_VALID(p_tcb->indicate_handle))
{
GATT_TRACE_DEBUG ("Add a pending indication");
- if ((p_buf = gatt_add_pending_ind(p_tcb, &indication)) !=NULL)
+ p_buf = gatt_add_pending_ind(p_tcb, &indication);
+ if (p_buf !=NULL)
{
cmd_status = GATT_SUCCESS;
}
@@ -504,7 +509,8 @@ tGATT_STATUS GATTS_HandleValueIndication (uint16_t conn_id, uint16_t attr_handl
else
{
- if ( (p_msg = attp_build_sr_msg (p_tcb, GATT_HANDLE_VALUE_IND, (tGATT_SR_MSG *)&indication)) != NULL)
+ p_msg = attp_build_sr_msg(p_tcb, GATT_HANDLE_VALUE_IND, (tGATT_SR_MSG *)&indication);
+ if (p_msg != NULL)
{
cmd_status = attp_send_sr_msg (p_tcb, p_msg);
@@ -558,8 +564,8 @@ tGATT_STATUS GATTS_HandleValueNotification (uint16_t conn_id, uint16_t attr_hand
memcpy (notif.value, p_val, val_len);
notif.auth_req = GATT_AUTH_REQ_NONE;;
- if ((p_buf = attp_build_sr_msg (p_tcb, GATT_HANDLE_VALUE_NOTIF, (tGATT_SR_MSG *)¬if))
- != NULL)
+ p_buf = attp_build_sr_msg(p_tcb, GATT_HANDLE_VALUE_NOTIF, (tGATT_SR_MSG *)¬if);
+ if (p_buf != NULL)
{
cmd_sent = attp_send_sr_msg (p_tcb, p_buf);
}
@@ -666,7 +672,8 @@ tGATT_STATUS GATTC_ConfigureMTU (uint16_t conn_id, uint16_t mtu)
return GATT_BUSY;
}
- if ((p_clcb = gatt_clcb_alloc(conn_id)) != NULL)
+ p_clcb = gatt_clcb_alloc(conn_id);
+ if (p_clcb != NULL)
{
p_clcb->p_tcb->payload_size = mtu;
p_clcb->operation = GATTC_OPTYPE_CONFIG;
@@ -718,7 +725,8 @@ tGATT_STATUS GATTC_Discover (uint16_t conn_id, tGATT_DISC_TYPE disc_type,
}
- if ((p_clcb = gatt_clcb_alloc(conn_id)) != NULL )
+ p_clcb = gatt_clcb_alloc(conn_id);
+ if (p_clcb != NULL)
{
if (!GATT_HANDLE_IS_VALID(p_param->s_handle) ||
!GATT_HANDLE_IS_VALID(p_param->e_handle) ||
@@ -783,7 +791,8 @@ tGATT_STATUS GATTC_Read (uint16_t conn_id, tGATT_READ_TYPE type, tGATT_READ_PARA
return GATT_BUSY;
}
- if ( (p_clcb = gatt_clcb_alloc(conn_id)) != NULL )
+ p_clcb = gatt_clcb_alloc(conn_id);
+ if (p_clcb != NULL)
{
p_clcb->operation = GATTC_OPTYPE_READ;
p_clcb->op_subtype = type;
@@ -873,7 +882,8 @@ tGATT_STATUS GATTC_Write (uint16_t conn_id, tGATT_WRITE_TYPE type, tGATT_VALUE *
return GATT_BUSY;
}
- if ((p_clcb = gatt_clcb_alloc(conn_id)) != NULL )
+ p_clcb = gatt_clcb_alloc(conn_id);
+ if (p_clcb != NULL)
{
p_clcb->operation = GATTC_OPTYPE_WRITE;
p_clcb->op_subtype = type;
@@ -938,7 +948,8 @@ tGATT_STATUS GATTC_ExecuteWrite (uint16_t conn_id, bool is_execute)
return GATT_BUSY;
}
- if ((p_clcb = gatt_clcb_alloc(conn_id)) != NULL)
+ p_clcb = gatt_clcb_alloc(conn_id);
+ if (p_clcb != NULL)
{
p_clcb->operation = GATTC_OPTYPE_EXE_WRITE;
flag = is_execute ? GATT_PREP_WRITE_EXEC : GATT_PREP_WRITE_CANCEL;
@@ -1022,7 +1033,8 @@ void GATT_SetIdleTimeout (BD_ADDR bd_addr, uint16_t idle_tout, tBT_TRANSPORT tra
tGATT_TCB *p_tcb;
bool status = false;
- if ((p_tcb = gatt_find_tcb_by_addr (bd_addr, transport)) != NULL)
+ p_tcb = gatt_find_tcb_by_addr(bd_addr, transport);
+ if (p_tcb != NULL)
{
if (p_tcb->att_lcid == L2CAP_ATT_CID)
{
@@ -1194,7 +1206,8 @@ void GATT_StartIf (tGATT_IF gatt_if)
tGATT_TRANSPORT transport ;
GATT_TRACE_API ("GATT_StartIf gatt_if=%d", gatt_if);
- if ((p_reg = gatt_get_regcb(gatt_if)) != NULL)
+ p_reg = gatt_get_regcb(gatt_if);
+ if (p_reg != NULL)
{
start_idx = 0;
while (gatt_find_the_connected_bda(start_idx, bda, &found_idx, &transport))
@@ -1234,7 +1247,8 @@ bool GATT_Connect (tGATT_IF gatt_if, BD_ADDR bd_addr, bool is_direct,
GATT_TRACE_API ("GATT_Connect gatt_if=%d", gatt_if);
/* Make sure app is registered */
- if ((p_reg = gatt_get_regcb(gatt_if)) == NULL)
+ p_reg = gatt_get_regcb(gatt_if);
+ if (p_reg == NULL)
{
GATT_TRACE_ERROR("GATT_Connect - gatt_if =%d is not registered", gatt_if);
return(false);
diff --git a/system/stack/gatt/gatt_auth.cc b/system/stack/gatt/gatt_auth.cc
index 32142f5ae03c8839ca8c0170e249092f1e3ffba4..da779371f6fd5748412f0e26b95c3a3de45bdce0 100644
--- a/system/stack/gatt/gatt_auth.cc
+++ b/system/stack/gatt/gatt_auth.cc
@@ -165,7 +165,8 @@ void gatt_enc_cmpl_cback(BD_ADDR bd_addr, tBT_TRANSPORT transport,
bool status = false;
GATT_TRACE_DEBUG("gatt_enc_cmpl_cback");
- if ((p_tcb = gatt_find_tcb_by_addr(bd_addr, transport)) != NULL)
+ p_tcb = gatt_find_tcb_by_addr(bd_addr, transport);
+ if (p_tcb != NULL)
{
if (gatt_get_sec_act(p_tcb) == GATT_SEC_ENC_PENDING)
return;
@@ -232,7 +233,8 @@ void gatt_notify_enc_cmpl(BD_ADDR bd_addr)
tGATT_TCB *p_tcb;
uint8_t i = 0;
- if ((p_tcb = gatt_find_tcb_by_addr(bd_addr, BT_TRANSPORT_LE)) != NULL)
+ p_tcb = gatt_find_tcb_by_addr(bd_addr, BT_TRANSPORT_LE);
+ if (p_tcb != NULL)
{
for (i = 0; i < GATT_MAX_APPS; i++)
{
diff --git a/system/stack/gatt/gatt_db.cc b/system/stack/gatt/gatt_db.cc
index 2338d43e1540ccaf1cee198809b882fdf94163e8..090964d32d6976559a2d71a4c179976970596205 100644
--- a/system/stack/gatt/gatt_db.cc
+++ b/system/stack/gatt/gatt_db.cc
@@ -423,8 +423,8 @@ tGATT_STATUS gatts_db_read_attr_value_by_type (tGATT_TCB *p_tcb,
** Returns Status of the operation.
**
*******************************************************************************/
-uint16_t gatts_add_included_service (tGATT_SVC_DB *p_db, uint16_t s_handle, uint16_t e_handle,
- tBT_UUID service)
+uint16_t gatts_add_included_service (tGATT_SVC_DB *p_db, uint16_t s_handle,
+ uint16_t e_handle, tBT_UUID service)
{
tGATT_ATTR *p_attr;
tBT_UUID uuid = {LEN_UUID_16, {GATT_UUID_INCLUDE_SERVICE}};
@@ -438,7 +438,8 @@ uint16_t gatts_add_included_service (tGATT_SVC_DB *p_db, uint16_t s_handle, uint
return 0;
}
- if ((p_attr = (tGATT_ATTR *) allocate_attr_in_db(p_db, &uuid, GATT_PERM_READ)) != NULL)
+ p_attr = (tGATT_ATTR *)allocate_attr_in_db(p_db, &uuid, GATT_PERM_READ);
+ if (p_attr != NULL)
{
if (copy_extra_byte_in_db(p_db, (void **)&p_attr->p_value, sizeof(tGATT_INCL_SRVC)))
{
@@ -481,7 +482,8 @@ uint16_t gatts_add_characteristic (tGATT_SVC_DB *p_db, tGATT_PERM perm,
GATT_TRACE_DEBUG("%s: perm=0x%0x property=0x%0x", __func__, perm, property);
- if ((p_char_decl = (tGATT_ATTR *)allocate_attr_in_db(p_db, &uuid, GATT_PERM_READ)) != NULL)
+ p_char_decl = (tGATT_ATTR *)allocate_attr_in_db(p_db, &uuid, GATT_PERM_READ);
+ if (p_char_decl != NULL)
{
if (!copy_extra_byte_in_db(p_db, (void **)&p_char_decl->p_value, sizeof(tGATT_CHAR_DECL)))
{
@@ -575,10 +577,8 @@ uint16_t gatts_add_char_descr (tGATT_SVC_DB *p_db, tGATT_PERM perm,
GATT_TRACE_DEBUG("gatts_add_char_descr uuid=0x%04x", p_descr_uuid->uu.uuid16);
/* Add characteristic descriptors */
- if ((p_char_dscptr = (tGATT_ATTR *)allocate_attr_in_db(p_db,
- p_descr_uuid,
- perm))
- == NULL)
+ p_char_dscptr = (tGATT_ATTR *)allocate_attr_in_db(p_db, p_descr_uuid, perm);
+ if (p_char_dscptr == NULL)
{
GATT_TRACE_DEBUG("gatts_add_char_descr Fail for adding char descriptors.");
return 0;
@@ -1157,7 +1157,8 @@ static bool gatts_db_add_service_declaration(tGATT_SVC_DB *p_db, tBT_UUID *p_ser
uuid.uu.uuid16 = GATT_UUID_SEC_SERVICE;
/* add service declration record */
- if ((p_attr = (tGATT_ATTR *)(allocate_attr_in_db(p_db, &uuid, GATT_PERM_READ))) != NULL)
+ p_attr = (tGATT_ATTR *)(allocate_attr_in_db(p_db, &uuid, GATT_PERM_READ));
+ if (p_attr != NULL)
{
if (copy_extra_byte_in_db (p_db, (void **)&p_attr->p_value, sizeof(tBT_UUID)))
{
diff --git a/system/stack/gatt/gatt_main.cc b/system/stack/gatt/gatt_main.cc
index 94b0d7d10b2075ce9436116e6761c556bd0e6910..e9a6f14c66f1a8d65aa37771285f7e644118cbfa 100644
--- a/system/stack/gatt/gatt_main.cc
+++ b/system/stack/gatt/gatt_main.cc
@@ -201,7 +201,8 @@ bool gatt_connect (BD_ADDR rem_bda, tGATT_TCB *p_tcb, tBT_TRANSPORT transport
}
else
{
- if ((p_tcb->att_lcid = L2CA_ConnectReq(BT_PSM_ATT, rem_bda)) != 0)
+ p_tcb->att_lcid = L2CA_ConnectReq(BT_PSM_ATT, rem_bda);
+ if (p_tcb->att_lcid != 0)
gatt_ret = true;
}
@@ -230,7 +231,8 @@ bool gatt_disconnect (tGATT_TCB *p_tcb)
if (p_tcb != NULL)
{
ret = true;
- if ( (ch_state = gatt_get_ch_state(p_tcb)) != GATT_CH_CLOSING )
+ ch_state = gatt_get_ch_state(p_tcb);
+ if (ch_state != GATT_CH_CLOSING)
{
if (p_tcb->att_lcid == L2CAP_ATT_CID)
{
@@ -352,7 +354,8 @@ bool gatt_act_connect (tGATT_REG *p_reg, BD_ADDR bd_addr,
tGATT_TCB *p_tcb;
uint8_t st;
- if ((p_tcb = gatt_find_tcb_by_addr(bd_addr, transport)) != NULL)
+ p_tcb = gatt_find_tcb_by_addr(bd_addr, transport);
+ if (p_tcb != NULL)
{
ret = true;
st = gatt_get_ch_state(p_tcb);
@@ -372,7 +375,8 @@ bool gatt_act_connect (tGATT_REG *p_reg, BD_ADDR bd_addr,
}
else
{
- if ((p_tcb = gatt_allocate_tcb_by_bdaddr(bd_addr, transport)) != NULL)
+ p_tcb = gatt_allocate_tcb_by_bdaddr(bd_addr, transport);
+ if (p_tcb != NULL)
{
if (!gatt_connect(bd_addr, p_tcb, transport))
{
@@ -428,7 +432,8 @@ static void gatt_le_connect_cback (uint16_t chan, BD_ADDR bd_addr, bool conne
(bd_addr[0]<<24)+(bd_addr[1]<<16)+(bd_addr[2]<<8)+bd_addr[3],
(bd_addr[4]<<8)+bd_addr[5], (connected) ? "connected" : "disconnected");
- if ((p_srv_chg_clt = gatt_is_bda_in_the_srv_chg_clt_list(bd_addr)) != NULL)
+ p_srv_chg_clt = gatt_is_bda_in_the_srv_chg_clt_list(bd_addr);
+ if (p_srv_chg_clt != NULL)
{
check_srv_chg = true;
}
@@ -459,7 +464,8 @@ static void gatt_le_connect_cback (uint16_t chan, BD_ADDR bd_addr, bool conne
else
{
- if ((p_tcb = gatt_allocate_tcb_by_bdaddr(bd_addr, BT_TRANSPORT_LE)) != NULL)
+ p_tcb = gatt_allocate_tcb_by_bdaddr(bd_addr, BT_TRANSPORT_LE);
+ if (p_tcb != NULL)
{
p_tcb->att_lcid = L2CAP_ATT_CID;
@@ -603,7 +609,8 @@ static void gatt_l2cif_connect_ind_cback (BD_ADDR bd_addr, uint16_t lcid,
if (p_tcb == NULL)
{
/* allocate tcb */
- if ((p_tcb = gatt_allocate_tcb_by_bdaddr(bd_addr, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_tcb = gatt_allocate_tcb_by_bdaddr(bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p_tcb == NULL)
{
/* no tcb available, reject L2CAP connection */
result = L2CAP_CONN_NO_RESOURCES;
@@ -651,7 +658,8 @@ static void gatt_l2cif_connect_cfm_cback(uint16_t lcid, uint16_t result)
tL2CAP_CFG_INFO cfg;
/* look up clcb for this channel */
- if ((p_tcb = gatt_find_tcb_by_cid(lcid)) != NULL)
+ p_tcb = gatt_find_tcb_by_cid(lcid);
+ if (p_tcb != NULL)
{
GATT_TRACE_DEBUG("gatt_l2c_connect_cfm_cback result: %d ch_state: %d, lcid:0x%x", result, gatt_get_ch_state(p_tcb), p_tcb->att_lcid);
@@ -703,7 +711,8 @@ void gatt_l2cif_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
tGATTS_SRV_CHG *p_srv_chg_clt=NULL;
/* look up clcb for this channel */
- if ((p_tcb = gatt_find_tcb_by_cid(lcid)) != NULL)
+ p_tcb = gatt_find_tcb_by_cid(lcid);
+ if (p_tcb != NULL)
{
/* if in correct state */
if ( gatt_get_ch_state(p_tcb) == GATT_CH_CFG)
@@ -719,7 +728,8 @@ void gatt_l2cif_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
{
gatt_set_ch_state(p_tcb, GATT_CH_OPEN);
- if ((p_srv_chg_clt = gatt_is_bda_in_the_srv_chg_clt_list(p_tcb->peer_bda)) != NULL)
+ p_srv_chg_clt = gatt_is_bda_in_the_srv_chg_clt_list(p_tcb->peer_bda);
+ if (p_srv_chg_clt != NULL)
{
gatt_chk_srv_chg(p_srv_chg_clt);
}
@@ -758,7 +768,8 @@ void gatt_l2cif_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
tGATT_TCB *p_tcb;
tGATTS_SRV_CHG *p_srv_chg_clt=NULL;
/* look up clcb for this channel */
- if ((p_tcb = gatt_find_tcb_by_cid(lcid)) != NULL)
+ p_tcb = gatt_find_tcb_by_cid(lcid);
+ if (p_tcb != NULL)
{
/* GATT uses the smaller of our MTU and peer's MTU */
if ( p_cfg->mtu_present &&
@@ -782,7 +793,8 @@ void gatt_l2cif_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
if (p_tcb->ch_flags & GATT_L2C_CFG_CFM_DONE)
{
gatt_set_ch_state(p_tcb, GATT_CH_OPEN);
- if ((p_srv_chg_clt = gatt_is_bda_in_the_srv_chg_clt_list(p_tcb->peer_bda)) != NULL)
+ p_srv_chg_clt = gatt_is_bda_in_the_srv_chg_clt_list(p_tcb->peer_bda);
+ if (p_srv_chg_clt != NULL)
{
gatt_chk_srv_chg(p_srv_chg_clt);
}
@@ -815,7 +827,8 @@ void gatt_l2cif_disconnect_ind_cback(uint16_t lcid, bool ack_needed)
uint16_t reason;
/* look up clcb for this channel */
- if ((p_tcb = gatt_find_tcb_by_cid(lcid)) != NULL)
+ p_tcb = gatt_find_tcb_by_cid(lcid);
+ if (p_tcb != NULL)
{
if (ack_needed)
{
@@ -828,7 +841,8 @@ void gatt_l2cif_disconnect_ind_cback(uint16_t lcid, bool ack_needed)
gatt_add_a_bonded_dev_for_srv_chg(p_tcb->peer_bda);
}
/* if ACL link is still up, no reason is logged, l2cap is disconnect from peer */
- if ((reason = L2CA_GetDisconnectReason(p_tcb->peer_bda, p_tcb->transport)) == 0)
+ reason = L2CA_GetDisconnectReason(p_tcb->peer_bda, p_tcb->transport);
+ if (reason == 0)
reason = GATT_CONN_TERMINATE_PEER_USER;
/* send disconnect callback */
@@ -853,7 +867,8 @@ static void gatt_l2cif_disconnect_cfm_cback(uint16_t lcid,
uint16_t reason;
/* look up clcb for this channel */
- if ((p_tcb = gatt_find_tcb_by_cid(lcid)) != NULL)
+ p_tcb = gatt_find_tcb_by_cid(lcid);
+ if (p_tcb != NULL)
{
/* If the device is not in the service changed client list, add it... */
if (gatt_is_bda_in_the_srv_chg_clt_list(p_tcb->peer_bda) == NULL)
@@ -864,7 +879,8 @@ static void gatt_l2cif_disconnect_cfm_cback(uint16_t lcid,
/* send disconnect callback */
/* if ACL link is still up, no reason is logged, l2cap is disconnect from peer */
- if ((reason = L2CA_GetDisconnectReason(p_tcb->peer_bda, p_tcb->transport)) == 0)
+ reason = L2CA_GetDisconnectReason(p_tcb->peer_bda, p_tcb->transport);
+ if (reason == 0)
reason = GATT_CONN_TERMINATE_LOCAL_HOST;
gatt_cleanup_upon_disc(p_tcb->peer_bda, reason, GATT_TRANSPORT_BR_EDR);
@@ -1061,7 +1077,8 @@ void gatt_send_srv_chg_ind (BD_ADDR peer_bda)
if (gatt_cb.handle_of_h_r)
{
- if ((conn_id = gatt_profile_find_conn_id_by_bd_addr(peer_bda)) != GATT_INVALID_CONN_ID)
+ conn_id = gatt_profile_find_conn_id_by_bd_addr(peer_bda);
+ if (conn_id != GATT_INVALID_CONN_ID)
{
UINT16_TO_STREAM (p, 1);
UINT16_TO_STREAM (p, 0xFFFF);
@@ -1130,7 +1147,8 @@ void gatt_init_srv_chg (void)
while ((i <= num_clients) && status)
{
req.client_read_index = i;
- if ((status = (*gatt_cb.cb_info.p_srv_chg_callback)(GATTS_SRV_CHG_CMD_READ_CLENT, &req, &rsp)) == true)
+ status = (*gatt_cb.cb_info.p_srv_chg_callback)(GATTS_SRV_CHG_CMD_READ_CLENT, &req, &rsp);
+ if (status == true)
{
memcpy(&srv_chg_clt, &rsp.srv_chg ,sizeof(tGATTS_SRV_CHG));
if (gatt_add_srv_chg_clt(&srv_chg_clt) == NULL)
diff --git a/system/stack/gatt/gatt_sr.cc b/system/stack/gatt/gatt_sr.cc
index baf25587b502562174bd8a3ccaece2f2dc92d686..54684dc24f60367a71a3004e3f1abd7da646be66 100644
--- a/system/stack/gatt/gatt_sr.cc
+++ b/system/stack/gatt/gatt_sr.cc
@@ -418,17 +418,15 @@ void gatt_process_read_multi_req (tGATT_TCB *p_tcb, uint8_t op_code, uint16_t le
{
STREAM_TO_UINT16(handle, p);
- if ((i_rcb = gatt_sr_find_i_rcb_by_handle(handle)) < GATT_MAX_SR_PROFILES)
+ i_rcb = gatt_sr_find_i_rcb_by_handle(handle);
+ if (i_rcb < GATT_MAX_SR_PROFILES)
{
p_tcb->sr_cmd.multi_req.handles[p_tcb->sr_cmd.multi_req.num_handles++] = handle;
/* check read permission */
- if ((err = gatts_read_attr_perm_check( gatt_cb.sr_reg[i_rcb].p_db,
- false,
- handle,
- sec_flag,
- key_size))
- != GATT_SUCCESS)
+ err = gatts_read_attr_perm_check(gatt_cb.sr_reg[i_rcb].p_db,
+ false, handle, sec_flag, key_size);
+ if (err != GATT_SUCCESS)
{
GATT_TRACE_DEBUG("read permission denied : 0x%02x", err);
break;
@@ -453,7 +451,8 @@ void gatt_process_read_multi_req (tGATT_TCB *p_tcb, uint8_t op_code, uint16_t le
if (err == GATT_SUCCESS)
{
- if ((trans_id = gatt_sr_enqueue_cmd (p_tcb, op_code, p_tcb->sr_cmd.multi_req.handles[0])) != 0)
+ trans_id = gatt_sr_enqueue_cmd(p_tcb, op_code, p_tcb->sr_cmd.multi_req.handles[0]);
+ if (trans_id != 0)
{
gatt_sr_reset_cback_cnt(p_tcb); /* read multiple use multi_rsp_q's count*/
@@ -526,7 +525,8 @@ static tGATT_STATUS gatt_build_primary_service_rsp (BT_HDR *p_msg, tGATT_TCB *p_
p_rcb->s_hdl <= e_hdl &&
p_rcb->type == GATT_UUID_PRI_SERVICE)
{
- if ((p_uuid = gatts_get_service_uuid (p_rcb->p_db)) != NULL)
+ p_uuid = gatts_get_service_uuid(p_rcb->p_db);
+ if (p_uuid != NULL)
{
if (op_code == GATT_REQ_READ_BY_GRP_TYPE)
handle_len = 4 + p_uuid->len;
@@ -899,7 +899,9 @@ static void gatts_process_mtu_req (tGATT_TCB *p_tcb, uint16_t len, uint8_t *p_da
l2cble_set_fixed_channel_tx_data_length(p_tcb->peer_bda, L2CAP_ATT_CID, p_tcb->payload_size);
- if ((p_buf = attp_build_sr_msg(p_tcb, GATT_RSP_MTU, (tGATT_SR_MSG *) &p_tcb->payload_size)) != NULL)
+ p_buf = attp_build_sr_msg(p_tcb, GATT_RSP_MTU,
+ (tGATT_SR_MSG *)&p_tcb->payload_size);
+ if (p_buf != NULL)
{
attp_send_sr_msg (p_tcb, p_buf);
@@ -1095,7 +1097,8 @@ void gatts_process_write_req (tGATT_TCB *p_tcb, uint8_t i_rcb, uint16_t handle,
if (status == GATT_SUCCESS)
{
- if ((trans_id = gatt_sr_enqueue_cmd(p_tcb, op_code, handle)) != 0)
+ trans_id = gatt_sr_enqueue_cmd(p_tcb, op_code, handle);
+ if (trans_id != 0)
{
p_sreg = &gatt_cb.sr_reg[i_rcb];
conn_id = GATT_CREATE_CONN_ID(p_tcb->tcb_idx, p_sreg->gatt_if);
@@ -1291,7 +1294,8 @@ static void gatts_proc_srv_chg_ind_ack(tGATT_TCB *p_tcb )
GATT_TRACE_DEBUG("gatts_proc_srv_chg_ind_ack");
- if ((p_buf = gatt_is_bda_in_the_srv_chg_clt_list(p_tcb->peer_bda)) != NULL)
+ p_buf = gatt_is_bda_in_the_srv_chg_clt_list(p_tcb->peer_bda);
+ if (p_buf != NULL)
{
GATT_TRACE_DEBUG("NV update set srv chg = false");
p_buf->srv_changed = false;
diff --git a/system/stack/gatt/gatt_utils.cc b/system/stack/gatt/gatt_utils.cc
index f788cb55046e38ec018399e1231f9e64caae3f92..0c2fba9b4154a86273ab566a7f0f18a555d95651 100644
--- a/system/stack/gatt/gatt_utils.cc
+++ b/system/stack/gatt/gatt_utils.cc
@@ -852,7 +852,8 @@ tGATT_TCB * gatt_find_tcb_by_addr(BD_ADDR bda, tBT_TRANSPORT transport)
tGATT_TCB *p_tcb = NULL;
uint8_t i = 0;
- if ((i = gatt_find_i_tcb_by_addr(bda, transport)) != GATT_INDEX_INVALID)
+ i = gatt_find_i_tcb_by_addr(bda, transport);
+ if (i != GATT_INDEX_INVALID)
p_tcb = &gatt_cb.tcb[i];
return p_tcb;
@@ -1442,7 +1443,8 @@ tGATT_STATUS gatt_send_error_rsp (tGATT_TCB *p_tcb, uint8_t err_code, uint8_t op
error.reason = err_code;
error.handle =handle;
- if ((p_buf = attp_build_sr_msg(p_tcb, GATT_RSP_ERROR, (tGATT_SR_MSG *)&error)) != NULL)
+ p_buf = attp_build_sr_msg(p_tcb, GATT_RSP_ERROR, (tGATT_SR_MSG *)&error);
+ if (p_buf != NULL)
{
status = attp_send_sr_msg (p_tcb, p_buf);
}
@@ -1475,7 +1477,8 @@ uint32_t gatt_add_sdp_record (tBT_UUID *p_uuid, uint16_t start_hdl, uint16_t end
GATT_TRACE_DEBUG("gatt_add_sdp_record s_hdl=0x%x s_hdl=0x%x",start_hdl, end_hdl);
- if ((sdp_handle = SDP_CreateRecord()) == 0)
+ sdp_handle = SDP_CreateRecord();
+ if (sdp_handle == 0)
return 0;
switch (p_uuid->len)
@@ -2200,7 +2203,8 @@ void gatt_cleanup_upon_disc(BD_ADDR bda, uint16_t reason, tBT_TRANSPORT transpor
GATT_TRACE_DEBUG ("gatt_cleanup_upon_disc ");
- if ((p_tcb = gatt_find_tcb_by_addr(bda, transport)) != NULL)
+ p_tcb = gatt_find_tcb_by_addr(bda, transport);
+ if (p_tcb != NULL)
{
GATT_TRACE_DEBUG ("found p_tcb ");
gatt_set_ch_state(p_tcb, GATT_CH_CLOSE);
@@ -2404,7 +2408,8 @@ bool gatt_add_bg_dev_list(tGATT_REG *p_reg, BD_ADDR bd_addr)
uint8_t i;
bool ret = false;
- if ((p_dev = gatt_find_bg_dev(bd_addr)) == NULL)
+ p_dev = gatt_find_bg_dev(bd_addr);
+ if (p_dev == NULL)
{
p_dev = gatt_alloc_bg_dev(bd_addr);
}
@@ -2473,7 +2478,8 @@ uint8_t gatt_get_num_apps_for_bg_dev(BD_ADDR bd_addr)
uint8_t i;
uint8_t cnt = 0;
- if ((p_dev = gatt_find_bg_dev(bd_addr)) != NULL)
+ p_dev = gatt_find_bg_dev(bd_addr);
+ if (p_dev != NULL)
{
for (i = 0; i < GATT_MAX_APPS; i ++)
{
@@ -2499,7 +2505,8 @@ bool gatt_find_app_for_bg_dev(BD_ADDR bd_addr, tGATT_IF *p_gatt_if)
uint8_t i;
bool ret = false;
- if ((p_dev = gatt_find_bg_dev(bd_addr)) == NULL)
+ p_dev = gatt_find_bg_dev(bd_addr);
+ if (p_dev == NULL)
{
return ret;
}
@@ -2534,7 +2541,8 @@ bool gatt_remove_bg_dev_from_list(tGATT_REG *p_reg, BD_ADDR bd_addr)
uint8_t i, j;
bool ret = false;
- if ((p_dev = gatt_find_bg_dev(bd_addr)) == NULL)
+ p_dev = gatt_find_bg_dev(bd_addr);
+ if (p_dev == NULL)
{
return ret;
}
@@ -2638,7 +2646,8 @@ bool gatt_update_auto_connect_dev (tGATT_IF gatt_if, bool add, BD_ADDR bd_
GATT_TRACE_API ("gatt_update_auto_connect_dev ");
/* Make sure app is registered */
- if ((p_reg = gatt_get_regcb(gatt_if)) == NULL)
+ p_reg = gatt_get_regcb(gatt_if);
+ if (p_reg == NULL)
{
GATT_TRACE_ERROR("gatt_update_auto_connect_dev - gatt_if is not registered", gatt_if);
return(false);
diff --git a/system/stack/hid/hidh_api.cc b/system/stack/hid/hidh_api.cc
index bc4d77f161eb5ea996577646c73635e0130bb577..984333c15cf556584ba492b563cb3f39d7284e3a 100644
--- a/system/stack/hid/hidh_api.cc
+++ b/system/stack/hid/hidh_api.cc
@@ -77,9 +77,11 @@ void hidh_get_str_attr( tSDP_DISC_REC *p_rec, uint16_t attr_id, uint16_t max_len
tSDP_DISC_ATTR *p_attr;
uint16_t name_len;
- if ((p_attr = SDP_FindAttributeInRec(p_rec, attr_id)) != NULL)
+ p_attr = SDP_FindAttributeInRec(p_rec, attr_id);
+ if (p_attr != NULL)
{
- if((name_len = SDP_DISC_ATTR_LEN(p_attr->attr_len_type)) < max_len )
+ name_len = SDP_DISC_ATTR_LEN(p_attr->attr_len_type);
+ if(name_len < max_len)
{
memcpy( str, (char *) p_attr->attr_value.v.array, name_len );
str[name_len] = '\0';
@@ -115,7 +117,8 @@ static void hidh_search_callback (uint16_t sdp_result)
return;
}
- if ((p_rec = SDP_FindServiceUUIDInDb (p_db, &hid_uuid, NULL)) == NULL)
+ p_rec = SDP_FindServiceUUIDInDb(p_db, &hid_uuid, NULL);
+ if (p_rec == NULL)
{
hh_cb.sdp_cback(HID_SDP_NO_SERV_UUID, 0, NULL);
return;
@@ -136,7 +139,8 @@ static void hidh_search_callback (uint16_t sdp_result)
return;
}
- if ((p_nvi->dscp_info.dl_len = SDP_DISC_ATTR_LEN(p_repdesc->attr_len_type)) != 0)
+ p_nvi->dscp_info.dl_len = SDP_DISC_ATTR_LEN(p_repdesc->attr_len_type);
+ if (p_nvi->dscp_info.dl_len != 0)
p_nvi->dscp_info.dsc_list = (uint8_t *) &p_repdesc->attr_value;
if (((p_attr = SDP_FindAttributeInRec (p_rec, ATTR_ID_HID_VIRTUAL_CABLE)) != NULL) &&
@@ -289,7 +293,8 @@ tHID_STATUS HID_HostRegister (tHID_HOST_DEV_CALLBACK *dev_cback)
return HID_ERR_INVALID_PARAM;
/* Register with L2CAP */
- if( (st = hidh_conn_reg()) != HID_SUCCESS )
+ st = hidh_conn_reg();
+ if(st != HID_SUCCESS)
{
return st;
}
diff --git a/system/stack/hid/hidh_conn.cc b/system/stack/hid/hidh_conn.cc
index dc03c6756e086a25c377c379d1899fd6f20d4a21..9a8ae040c5fd532ebb405978682fbf5543c9db30 100644
--- a/system/stack/hid/hidh_conn.cc
+++ b/system/stack/hid/hidh_conn.cc
@@ -390,7 +390,8 @@ static void hidh_l2cif_connect_cfm (uint16_t l2cap_cid, uint16_t result)
tHID_HOST_DEV_CTB *p_dev = NULL;
/* Find CCB based on CID, and verify we are in a state to accept this message */
- if( (dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES )
+ dhandle = find_conn_by_cid(l2cap_cid);
+ if(dhandle < HID_HOST_MAX_DEVICES)
{
p_dev = &hh_cb.devices[dhandle];
p_hcon = &hh_cb.devices[dhandle].conn;
@@ -470,7 +471,8 @@ static void hidh_l2cif_config_ind (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
uint32_t reason;
/* Find CCB based on CID */
- if( (dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES )
+ dhandle = find_conn_by_cid(l2cap_cid);
+ if(dhandle < HID_HOST_MAX_DEVICES)
{
p_hcon = &hh_cb.devices[dhandle].conn;
}
@@ -504,7 +506,8 @@ static void hidh_l2cif_config_ind (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
{
/* Connect interrupt channel */
p_hcon->disc_reason = HID_L2CAP_CONN_FAIL; /* Reset initial reason for CLOSE_EVT: Connection Attempt was made but failed */
- if ((p_hcon->intr_cid = L2CA_ConnectReq (HID_PSM_INTERRUPT, hh_cb.devices[dhandle].addr)) == 0)
+ p_hcon->intr_cid = L2CA_ConnectReq(HID_PSM_INTERRUPT, hh_cb.devices[dhandle].addr);
+ if (p_hcon->intr_cid == 0)
{
HIDH_TRACE_WARNING ("HID-Host INTR Originate failed");
reason = HID_L2CAP_REQ_FAIL ;
@@ -556,7 +559,8 @@ static void hidh_l2cif_config_cfm (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
HIDH_TRACE_EVENT ("HID-Host Rcvd cfg cfm, CID: 0x%x Result: %d", l2cap_cid, p_cfg->result);
/* Find CCB based on CID */
- if( (dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES )
+ dhandle = find_conn_by_cid(l2cap_cid);
+ if(dhandle < HID_HOST_MAX_DEVICES )
p_hcon = &hh_cb.devices[dhandle].conn;
if (p_hcon == NULL)
@@ -582,7 +586,8 @@ static void hidh_l2cif_config_cfm (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
{
/* Connect interrupt channel */
p_hcon->disc_reason = HID_L2CAP_CONN_FAIL; /* Reset initial reason for CLOSE_EVT: Connection Attempt was made but failed */
- if ((p_hcon->intr_cid = L2CA_ConnectReq (HID_PSM_INTERRUPT, hh_cb.devices[dhandle].addr)) == 0)
+ p_hcon->intr_cid = L2CA_ConnectReq(HID_PSM_INTERRUPT, hh_cb.devices[dhandle].addr);
+ if (p_hcon->intr_cid == 0)
{
HIDH_TRACE_WARNING ("HID-Host INTR Originate failed");
reason = HID_L2CAP_REQ_FAIL ;
@@ -633,7 +638,8 @@ static void hidh_l2cif_disconnect_ind (uint16_t l2cap_cid, bool ack_needed)
uint16_t hid_close_evt_reason;
/* Find CCB based on CID */
- if( (dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES )
+ dhandle = find_conn_by_cid(l2cap_cid);
+ if(dhandle < HID_HOST_MAX_DEVICES )
p_hcon = &hh_cb.devices[dhandle].conn;
if (p_hcon == NULL)
@@ -715,7 +721,8 @@ static void hidh_l2cif_disconnect_cfm (uint16_t l2cap_cid,
tHID_CONN *p_hcon = NULL;
/* Find CCB based on CID */
- if( (dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES )
+ dhandle = find_conn_by_cid(l2cap_cid);
+ if(dhandle < HID_HOST_MAX_DEVICES )
p_hcon = &hh_cb.devices[dhandle].conn;
if (p_hcon == NULL)
@@ -762,7 +769,8 @@ static void hidh_l2cif_cong_ind (uint16_t l2cap_cid, bool congested)
tHID_CONN *p_hcon = NULL;
/* Find CCB based on CID */
- if( (dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES )
+ dhandle = find_conn_by_cid(l2cap_cid);
+ if(dhandle < HID_HOST_MAX_DEVICES )
p_hcon = &hh_cb.devices[dhandle].conn;
if (p_hcon == NULL)
@@ -808,7 +816,8 @@ static void hidh_l2cif_data_ind (uint16_t l2cap_cid, BT_HDR *p_msg)
HIDH_TRACE_DEBUG ("HID-Host hidh_l2cif_data_ind [l2cap_cid=0x%04x]", l2cap_cid);
/* Find CCB based on CID */
- if ((dhandle = find_conn_by_cid(l2cap_cid)) < HID_HOST_MAX_DEVICES)
+ dhandle = find_conn_by_cid(l2cap_cid);
+ if (dhandle < HID_HOST_MAX_DEVICES)
p_hcon = &hh_cb.devices[dhandle].conn;
if (p_hcon == NULL)
@@ -1039,7 +1048,8 @@ tHID_STATUS hidh_conn_initiate (uint8_t dhandle)
BTM_SetOutService (p_dev->addr, service_id, mx_chan_id);
/* Check if L2CAP started the connection process */
- if ((p_dev->conn.ctrl_cid = L2CA_ConnectReq (HID_PSM_CONTROL, p_dev->addr)) == 0)
+ p_dev->conn.ctrl_cid = L2CA_ConnectReq(HID_PSM_CONTROL, p_dev->addr);
+ if (p_dev->conn.ctrl_cid == 0)
{
HIDH_TRACE_WARNING ("HID-Host Originate failed");
hh_cb.callback( dhandle, hh_cb.devices[dhandle].addr, HID_HDEV_EVT_CLOSE,
diff --git a/system/stack/l2cap/l2c_api.cc b/system/stack/l2cap/l2c_api.cc
index 69bcce47d44ecb474024608f40faa6ea28aafa3e..65fd913650d8d73c0c0227db668b0cb5b10425b7 100644
--- a/system/stack/l2cap/l2c_api.cc
+++ b/system/stack/l2cap/l2c_api.cc
@@ -91,7 +91,8 @@ uint16_t L2CA_Register (uint16_t psm, tL2CAP_APPL_INFO *p_cb_info)
{
for (vpsm = 0x1002; vpsm < 0x8000; vpsm += 2)
{
- if ((p_rcb = l2cu_find_rcb_by_psm (vpsm)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(vpsm);
+ if (p_rcb == NULL)
break;
}
@@ -99,9 +100,11 @@ uint16_t L2CA_Register (uint16_t psm, tL2CAP_APPL_INFO *p_cb_info)
}
/* If registration block already there, just overwrite it */
- if ((p_rcb = l2cu_find_rcb_by_psm (vpsm)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(vpsm);
+ if (p_rcb == NULL)
{
- if ((p_rcb = l2cu_allocate_rcb (vpsm)) == NULL)
+ p_rcb = l2cu_allocate_rcb(vpsm);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no RCB available, PSM: 0x%04x vPSM: 0x%04x", psm, vpsm);
return (0);
@@ -133,7 +136,8 @@ void L2CA_Deregister (uint16_t psm)
L2CAP_TRACE_API ("L2CAP - L2CA_Deregister() called for PSM: 0x%04x", psm);
- if ((p_rcb = l2cu_find_rcb_by_psm (psm)) != NULL)
+ p_rcb = l2cu_find_rcb_by_psm(psm);
+ if (p_rcb != NULL)
{
p_lcb = &l2cb.lcb_pool[0];
for (ii = 0; ii < MAX_L2CAP_LINKS; ii++, p_lcb++)
@@ -255,7 +259,8 @@ uint16_t L2CA_ErtmConnectReq (uint16_t psm, BD_ADDR p_bd_addr, tL2CAP_ERTM_INFO
return (0);
}
/* Fail if the PSM is not registered */
- if ((p_rcb = l2cu_find_rcb_by_psm (psm)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(psm);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no RCB for L2CA_conn_req, PSM: 0x%04x", psm);
return (0);
@@ -263,7 +268,8 @@ uint16_t L2CA_ErtmConnectReq (uint16_t psm, BD_ADDR p_bd_addr, tL2CAP_ERTM_INFO
/* First, see if we already have a link to the remote */
/* assume all ERTM l2cap connection is going over BR/EDR for now */
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (p_bd_addr, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(p_bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
/* No link. Get an LCB and start link establishment */
if ( ((p_lcb = l2cu_allocate_lcb (p_bd_addr, false, BT_TRANSPORT_BR_EDR)) == NULL)
@@ -276,7 +282,8 @@ uint16_t L2CA_ErtmConnectReq (uint16_t psm, BD_ADDR p_bd_addr, tL2CAP_ERTM_INFO
}
/* Allocate a channel control block */
- if ((p_ccb = l2cu_allocate_ccb (p_lcb, 0)) == NULL)
+ p_ccb = l2cu_allocate_ccb(p_lcb, 0);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_conn_req, PSM: 0x%04x", psm);
return (0);
@@ -709,7 +716,8 @@ bool L2CA_ErtmConnectRsp (BD_ADDR p_bd_addr, uint8_t id, uint16_t lcid, uint1
(p_bd_addr[4]<<8)+p_bd_addr[5], p_ertm_info);
/* First, find the link control block */
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (p_bd_addr, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(p_bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
/* No link. Get an LCB and start link establishment */
L2CAP_TRACE_WARNING ("L2CAP - no LCB for L2CA_conn_rsp");
@@ -717,7 +725,8 @@ bool L2CA_ErtmConnectRsp (BD_ADDR p_bd_addr, uint8_t id, uint16_t lcid, uint1
}
/* Now, find the channel control block */
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, lcid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, lcid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_conn_rsp");
return (false);
@@ -790,7 +799,8 @@ bool L2CA_ConfigReq (uint16_t cid, tL2CAP_CFG_INFO *p_cfg)
cid, p_cfg->fcr_present, p_cfg->fcr.mode, p_cfg->mtu_present, p_cfg->mtu);
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_cfg_req, CID: %d", cid);
return (false);
@@ -840,7 +850,8 @@ bool L2CA_ConfigRsp (uint16_t cid, tL2CAP_CFG_INFO *p_cfg)
cid, p_cfg->result, p_cfg->mtu_present, p_cfg->flush_to_present, p_cfg->fcr_present, p_cfg->fcs_present);
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_cfg_rsp, CID: %d", cid);
return (false);
@@ -882,7 +893,8 @@ bool L2CA_DisconnectReq (uint16_t cid)
L2CAP_TRACE_API ("L2CA_DisconnectReq() CID: 0x%04x", cid);
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_disc_req, CID: %d", cid);
return (false);
@@ -910,7 +922,8 @@ bool L2CA_DisconnectRsp (uint16_t cid)
L2CAP_TRACE_API ("L2CA_DisconnectRsp() CID: 0x%04x", cid);
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_disc_rsp, CID: %d", cid);
return (false);
@@ -942,10 +955,12 @@ bool L2CA_Ping (BD_ADDR p_bd_addr, tL2CA_ECHO_RSP_CB *p_callback)
return (false);
/* First, see if we already have a link to the remote */
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (p_bd_addr, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(p_bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
/* No link. Get an LCB and start link establishment */
- if ((p_lcb = l2cu_allocate_lcb (p_bd_addr, false, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_allocate_lcb(p_bd_addr, false, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no LCB for L2CA_ping");
return (false);
@@ -1021,7 +1036,8 @@ bool L2CA_Echo (BD_ADDR p_bd_addr, BT_HDR *p_data, tL2CA_ECHO_DATA_CB *p_cal
}
/* We assume the upper layer will call this function only when the link is established. */
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (p_bd_addr, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(p_bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
L2CAP_TRACE_ERROR ("L2CA_Echo ERROR : link not established");
return false;
@@ -1089,7 +1105,8 @@ bool L2CA_SetIdleTimeout (uint16_t cid, uint16_t timeout, bool is_global)
else
{
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_SetIdleTimeout, CID: %d", cid);
return (false);
@@ -1245,13 +1262,15 @@ uint16_t L2CA_LocalLoopbackReq (uint16_t psm, uint16_t handle, BD_ADDR p_bd_addr
}
/* Fail if the PSM is not registered */
- if ((p_rcb = l2cu_find_rcb_by_psm (psm)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(psm);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no RCB for L2CA_conn_req, PSM: %d", psm);
return (0);
}
- if ((p_lcb = l2cu_allocate_lcb (p_bd_addr, false, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_allocate_lcb(p_bd_addr, false, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no LCB for L2CA_conn_req");
return (0);
@@ -1261,7 +1280,8 @@ uint16_t L2CA_LocalLoopbackReq (uint16_t psm, uint16_t handle, BD_ADDR p_bd_addr
p_lcb->handle = handle;
/* Allocate a channel control block */
- if ((p_ccb = l2cu_allocate_ccb (p_lcb, 0)) == NULL)
+ p_ccb = l2cu_allocate_ccb(p_lcb, 0);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_conn_req");
return (0);
@@ -1316,7 +1336,8 @@ bool L2CA_FlowControl (uint16_t cid, bool data_enabled)
L2CAP_TRACE_API ("L2CA_FlowControl(%d) CID: 0x%04x", on_off, cid);
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_FlowControl, CID: 0x%04x data_enabled: %d", cid, data_enabled);
return (false);
@@ -1359,7 +1380,8 @@ bool L2CA_SendTestSFrame (uint16_t cid, uint8_t sup_type, uint8_t back_track)
L2CAP_TRACE_API ("L2CA_SendTestSFrame() CID: 0x%04x Type: 0x%02x back_track: %u", cid, sup_type, back_track);
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_SendTestSFrame, CID: %d", cid);
return (false);
@@ -1391,7 +1413,8 @@ bool L2CA_SetTxPriority (uint16_t cid, tL2CAP_CHNL_PRIORITY priority)
L2CAP_TRACE_API ("L2CA_SetTxPriority() CID: 0x%04x, priority:%d", cid, priority);
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_SetTxPriority, CID: %d", cid);
return (false);
@@ -1419,7 +1442,8 @@ bool L2CA_SetChnlDataRate (uint16_t cid, tL2CAP_CHNL_DATA_RATE tx, tL2CAP_CHN
L2CAP_TRACE_API ("L2CA_SetChnlDataRate() CID: 0x%04x, tx:%d, rx:%d", cid, tx, rx);
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_SetChnlDataRate, CID: %d", cid);
return (false);
@@ -1563,7 +1587,8 @@ bool L2CA_GetPeerFeatures (BD_ADDR bd_addr, uint32_t *p_ext_feat, uint8_t *p_
tL2C_LCB *p_lcb;
/* We must already have a link to the remote */
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (bd_addr, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CA_GetPeerFeatures() No BDA: %08x%04x",
(bd_addr[0]<<24)+(bd_addr[1]<<16)+(bd_addr[2]<<8)+bd_addr[3],
@@ -1701,7 +1726,8 @@ bool L2CA_ConnectFixedChnl (uint16_t fixed_cid, BD_ADDR rem_bda)
tL2C_BLE_FIXED_CHNLS_MASK peer_channel_mask;
// If we already have a link to the remote, check if it supports that CID
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (rem_bda, transport)) != NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(rem_bda, transport);
+ if (p_lcb != NULL)
{
// Fixed channels are mandatory on LE transports so ignore the received
// channel mask and use the locally cached LE channel mask.
@@ -1743,7 +1769,8 @@ bool L2CA_ConnectFixedChnl (uint16_t fixed_cid, BD_ADDR rem_bda)
}
// No link. Get an LCB and start link establishment
- if ((p_lcb = l2cu_allocate_lcb (rem_bda, false, transport)) == NULL)
+ p_lcb = l2cu_allocate_lcb(rem_bda, false, transport);
+ if (p_lcb == NULL)
{
L2CAP_TRACE_WARNING ("%s(0x%04x) - no LCB", __func__, fixed_cid);
return false;
@@ -2132,7 +2159,8 @@ bool L2CA_SetChnlFlushability (uint16_t cid, bool is_flushable)
tL2C_CCB *p_ccb;
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_SetChnlFlushability, CID: %d", cid);
return (false);
diff --git a/system/stack/l2cap/l2c_ble.cc b/system/stack/l2cap/l2c_ble.cc
index 696937f005a2bb279076db93b31114b18faebe90..b1f8d1443feaad1009dc9ffdd2a6dda0d108e574 100644
--- a/system/stack/l2cap/l2c_ble.cc
+++ b/system/stack/l2cap/l2c_ble.cc
@@ -202,7 +202,8 @@ uint8_t L2CA_GetBleConnRole (BD_ADDR bd_addr)
tL2C_LCB *p_lcb;
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (bd_addr, BT_TRANSPORT_LE)) != NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(bd_addr, BT_TRANSPORT_LE);
+ if (p_lcb != NULL)
role = p_lcb->link_role;
return role;
@@ -221,7 +222,8 @@ uint16_t L2CA_GetDisconnectReason (BD_ADDR remote_bda, tBT_TRANSPORT transport)
tL2C_LCB *p_lcb;
uint16_t reason = 0;
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (remote_bda, transport)) != NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(remote_bda, transport);
+ if (p_lcb != NULL)
reason = p_lcb->disc_reason;
L2CAP_TRACE_DEBUG ("L2CA_GetDisconnectReason=%d ",reason);
@@ -671,7 +673,8 @@ void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
"mps = %d, "
"initial credit = %d", mtu, mps, initial_credit);
- if ((p_rcb = l2cu_find_ble_rcb_by_psm (con_info.psm)) == NULL)
+ p_rcb = l2cu_find_ble_rcb_by_psm(con_info.psm);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - rcvd conn req for unknown PSM: 0x%04x", con_info.psm);
l2cu_reject_ble_connection (p_lcb, id, L2CAP_LE_NO_PSM);
@@ -688,7 +691,8 @@ void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
}
/* Allocate a ccb for this.*/
- if ((p_ccb = l2cu_allocate_ccb (p_lcb, 0)) == NULL)
+ p_ccb = l2cu_allocate_ccb(p_lcb, 0);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_ERROR ("L2CAP - unable to allocate CCB");
l2cu_reject_ble_connection (p_lcb, id, L2CAP_CONN_NO_RESOURCES);
@@ -781,7 +785,8 @@ void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
case L2CAP_CMD_BLE_FLOW_CTRL_CREDIT:
STREAM_TO_UINT16(lcid, p);
- if((p_ccb = l2cu_find_ccb_by_remote_cid(p_lcb, lcid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_remote_cid(p_lcb, lcid);
+ if(p_ccb == NULL)
{
L2CAP_TRACE_DEBUG ("%s Credit received for unknown channel id %d", __func__, lcid);
break;
@@ -796,7 +801,8 @@ void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
STREAM_TO_UINT16 (lcid, p);
STREAM_TO_UINT16 (rcid, p);
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, lcid)) != NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, lcid);
+ if (p_ccb != NULL)
{
if (p_ccb->remote_cid == rcid)
{
@@ -813,7 +819,8 @@ void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
STREAM_TO_UINT16 (rcid, p);
STREAM_TO_UINT16 (lcid, p);
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, lcid)) != NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, lcid);
+ if (p_ccb != NULL)
{
if ((p_ccb->remote_cid == rcid) && (p_ccb->local_id == id))
l2c_csm_execute (p_ccb, L2CEVT_L2CAP_DISCONNECT_RSP, NULL);
diff --git a/system/stack/l2cap/l2c_csm.cc b/system/stack/l2cap/l2c_csm.cc
index a0b46aeedbc59b927e1de633333f9fbade1f82a9..a76913173a95ec8c91e0e380f380f562ef33f6f2 100644
--- a/system/stack/l2cap/l2c_csm.cc
+++ b/system/stack/l2cap/l2c_csm.cc
@@ -817,7 +817,8 @@ static void l2c_csm_config (tL2C_CCB *p_ccb, uint16_t event, void *p_data)
case L2CEVT_L2CAP_CONFIG_REQ: /* Peer config request */
- if ((cfg_result = l2cu_process_peer_cfg_req (p_ccb, p_cfg)) == L2CAP_PEER_CFG_OK)
+ cfg_result = l2cu_process_peer_cfg_req(p_ccb, p_cfg);
+ if (cfg_result == L2CAP_PEER_CFG_OK)
{
L2CAP_TRACE_EVENT ("L2CAP - Calling Config_Req_Cb(), CID: 0x%04x, C-bit %d",
p_ccb->local_cid, (p_cfg->flags & L2CAP_CFG_FLAGS_MASK_CONT));
@@ -1097,7 +1098,8 @@ static void l2c_csm_open (tL2C_CCB *p_ccb, uint16_t event, void *p_data)
l2c_ccb_timer_timeout, p_ccb,
btu_general_alarm_queue);
- if ((cfg_result = l2cu_process_peer_cfg_req (p_ccb, p_cfg)) == L2CAP_PEER_CFG_OK)
+ cfg_result = l2cu_process_peer_cfg_req(p_ccb, p_cfg);
+ if (cfg_result == L2CAP_PEER_CFG_OK)
{
(*p_ccb->p_rcb->api.pL2CA_ConfigInd_Cb)(p_ccb->local_cid, p_cfg);
}
diff --git a/system/stack/l2cap/l2c_fcr.cc b/system/stack/l2cap/l2c_fcr.cc
index fa222b1dc5ab67f546b00d9b512648dcc4035ff9..f29ab2eeff46879f2294f6af894a8b0984bfa878 100644
--- a/system/stack/l2cap/l2c_fcr.cc
+++ b/system/stack/l2cap/l2c_fcr.cc
@@ -841,7 +841,8 @@ void l2c_lcc_proc_pdu(tL2C_CCB *p_ccb, BT_HDR *p_buf)
}
- if ((p_data = (BT_HDR *) osi_malloc(L2CAP_MAX_BUF_SIZE)) == NULL)
+ p_data = (BT_HDR *)osi_malloc(L2CAP_MAX_BUF_SIZE);
+ if (p_data == NULL)
{
osi_free(p_buf);
return;
diff --git a/system/stack/l2cap/l2c_link.cc b/system/stack/l2cap/l2c_link.cc
index c2d89be75e9744f98e243da71bbc132b7f9a7f72..618b1661a5215a4f51d150c5ef2ab7264d04dd17 100644
--- a/system/stack/l2cap/l2c_link.cc
+++ b/system/stack/l2cap/l2c_link.cc
@@ -201,7 +201,8 @@ bool l2c_link_hci_conn_comp (uint8_t status, uint16_t handle, BD_ADDR p_bda)
l2cu_send_peer_info_req (p_lcb, L2CAP_EXTENDED_FEATURES_INFO_TYPE);
/* Tell BTM Acl management about the link */
- if ((p_dev_info = btm_find_dev (p_bda)) != NULL)
+ p_dev_info = btm_find_dev(p_bda);
+ if (p_dev_info != NULL)
btm_acl_created (ci.bd_addr, p_dev_info->dev_class,
p_dev_info->sec_bd_name, handle,
p_lcb->link_role, BT_TRANSPORT_BR_EDR);
@@ -1128,9 +1129,12 @@ void l2c_link_check_send_pkts (tL2C_LCB *p_lcb, tL2C_CCB *p_ccb, BT_HDR *p_buf)
break;
}
/* If nothing on the link queue, check the channel queue */
- else if ((p_buf = l2cu_get_next_buffer_to_send (p_lcb)) != NULL)
- {
- l2c_link_send_to_lower (p_lcb, p_buf);
+ else {
+ p_buf = l2cu_get_next_buffer_to_send(p_lcb);
+ if (p_buf != NULL)
+ {
+ l2c_link_send_to_lower (p_lcb, p_buf);
+ }
}
}
@@ -1174,7 +1178,8 @@ void l2c_link_check_send_pkts (tL2C_LCB *p_lcb, tL2C_CCB *p_ccb, BT_HDR *p_buf)
(l2cb.controller_le_xmit_window != 0 && (p_lcb->transport == BT_TRANSPORT_LE)))
&& (p_lcb->sent_not_acked < p_lcb->link_xmit_quota))
{
- if ((p_buf = l2cu_get_next_buffer_to_send (p_lcb)) == NULL)
+ p_buf = l2cu_get_next_buffer_to_send(p_lcb);
+ if (p_buf == NULL)
break;
if (!l2c_link_send_to_lower (p_lcb, p_buf))
@@ -1466,7 +1471,8 @@ void l2c_link_segments_xmitted (BT_HDR *p_msg)
handle = HCID_GET_HANDLE (handle);
/* Find the LCB based on the handle */
- if ((p_lcb = l2cu_find_lcb_by_handle (handle)) == NULL)
+ p_lcb = l2cu_find_lcb_by_handle(handle);
+ if (p_lcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - rcvd segment complete, unknown handle: %d", handle);
osi_free(p_msg);
diff --git a/system/stack/l2cap/l2c_main.cc b/system/stack/l2cap/l2c_main.cc
index bf51908eb9dfe9798ee7e506ff4b417e8d447f81..9f7a6ca5a21dbdd80c231462f47ecbaee0feab06 100644
--- a/system/stack/l2cap/l2c_main.cc
+++ b/system/stack/l2cap/l2c_main.cc
@@ -83,7 +83,8 @@ void l2c_rcv_acl_data (BT_HDR *p_msg)
if (pkt_type != L2CAP_PKT_CONTINUE)
{
/* Find the LCB based on the handle */
- if ((p_lcb = l2cu_find_lcb_by_handle (handle)) == NULL)
+ p_lcb = l2cu_find_lcb_by_handle(handle);
+ if (p_lcb == NULL)
{
uint8_t cmd_code;
@@ -143,7 +144,8 @@ void l2c_rcv_acl_data (BT_HDR *p_msg)
/* Find the CCB for this CID */
if (rcv_cid >= L2CAP_BASE_APPL_CID)
{
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, rcv_cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, rcv_cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - unknown CID: 0x%04x", rcv_cid);
osi_free(p_msg);
@@ -376,7 +378,8 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
case L2CAP_CMD_CONN_REQ:
STREAM_TO_UINT16 (con_info.psm, p);
STREAM_TO_UINT16 (rcid, p);
- if ((p_rcb = l2cu_find_rcb_by_psm (con_info.psm)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(con_info.psm);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - rcvd conn req for unknown PSM: %d", con_info.psm);
l2cu_reject_connection (p_lcb, rcid, id, L2CAP_CONN_NO_PSM);
@@ -391,7 +394,8 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
break;
}
}
- if ((p_ccb = l2cu_allocate_ccb (p_lcb, 0)) == NULL)
+ p_ccb = l2cu_allocate_ccb(p_lcb, 0);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_ERROR ("L2CAP - unable to allocate CCB");
l2cu_reject_connection (p_lcb, rcid, id, L2CAP_CONN_NO_RESOURCES);
@@ -410,7 +414,8 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
STREAM_TO_UINT16 (con_info.l2cap_result, p);
STREAM_TO_UINT16 (con_info.l2cap_status, p);
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, lcid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, lcid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for conn rsp, LCID: %d RCID: %d",
lcid, con_info.remote_cid);
@@ -519,7 +524,8 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
}
}
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, lcid)) != NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, lcid);
+ if (p_ccb != NULL)
{
p_ccb->remote_id = id;
if (cfg_rej)
@@ -602,7 +608,8 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
}
}
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, lcid)) != NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, lcid);
+ if (p_ccb != NULL)
{
if (p_ccb->local_id != id)
{
@@ -625,7 +632,8 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
STREAM_TO_UINT16 (lcid, p);
STREAM_TO_UINT16 (rcid, p);
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, lcid)) != NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, lcid);
+ if (p_ccb != NULL)
{
if (p_ccb->remote_cid == rcid)
{
@@ -642,7 +650,8 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len)
STREAM_TO_UINT16 (rcid, p);
STREAM_TO_UINT16 (lcid, p);
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, lcid)) != NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, lcid);
+ if (p_ccb != NULL)
{
if ((p_ccb->remote_cid == rcid) && (p_ccb->local_id == id))
{
@@ -895,7 +904,8 @@ uint8_t l2c_data_write (uint16_t cid, BT_HDR *p_data, uint16_t flags)
tL2C_CCB *p_ccb;
/* Find the channel control block. We don't know the link it is on. */
- if ((p_ccb = l2cu_find_ccb_by_cid (NULL, cid)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(NULL, cid);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_DataWrite, CID: %d", cid);
osi_free(p_data);
diff --git a/system/stack/l2cap/l2c_ucd.cc b/system/stack/l2cap/l2c_ucd.cc
index 9407da55615d2c2f1752fbe14c4c8dc3aa687182..8d85be001963d3fc5a0804020f34421fb4995847 100644
--- a/system/stack/l2cap/l2c_ucd.cc
+++ b/system/stack/l2cap/l2c_ucd.cc
@@ -104,7 +104,8 @@ static void l2c_ucd_data_ind_cback (BD_ADDR rem_bda, BT_HDR *p_buf)
p_buf->offset += L2CAP_UCD_OVERHEAD;
p_buf->len -= L2CAP_UCD_OVERHEAD;
- if ((p_rcb = l2cu_find_rcb_by_psm (psm)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(psm);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_ERROR ("L2CAP - no RCB for l2c_ucd_data_ind_cback, PSM: 0x%04x", psm);
osi_free(p_buf);
@@ -215,7 +216,8 @@ bool L2CA_UcdRegister ( uint16_t psm, tL2CAP_UCD_CB_INFO *p_cb_info )
return (false);
}
- if ((p_rcb = l2cu_find_rcb_by_psm (psm)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(psm);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_ERROR ("L2CAP - no RCB for L2CA_UcdRegister, PSM: 0x%04x", psm);
return (false);
@@ -225,9 +227,11 @@ bool L2CA_UcdRegister ( uint16_t psm, tL2CAP_UCD_CB_INFO *p_cb_info )
p_rcb->ucd.cb_info = *p_cb_info;
/* check if master rcb is created for UCD */
- if ((p_rcb = l2cu_find_rcb_by_psm (L2C_UCD_RCB_ID)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(L2C_UCD_RCB_ID);
+ if (p_rcb == NULL)
{
- if ((p_rcb = l2cu_allocate_rcb (L2C_UCD_RCB_ID)) == NULL)
+ p_rcb = l2cu_allocate_rcb(L2C_UCD_RCB_ID);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_ERROR ("L2CAP - no RCB available for L2CA_UcdRegister");
return (false);
@@ -273,7 +277,8 @@ bool L2CA_UcdDeregister ( uint16_t psm )
L2CAP_TRACE_API ("L2CA_UcdDeregister() PSM: 0x%04x", psm);
- if ((p_rcb = l2cu_find_rcb_by_psm (psm)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(psm);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_ERROR ("L2CAP - no RCB for L2CA_UcdDeregister, PSM: 0x%04x", psm);
return (false);
@@ -291,7 +296,8 @@ bool L2CA_UcdDeregister ( uint16_t psm )
}
/* delete master rcb for UCD */
- if ((p_rcb = l2cu_find_rcb_by_psm (L2C_UCD_RCB_ID)) != NULL)
+ p_rcb = l2cu_find_rcb_by_psm(L2C_UCD_RCB_ID);
+ if (p_rcb != NULL)
{
l2cu_release_rcb (p_rcb);
}
@@ -525,14 +531,16 @@ bool L2CA_UCDSetTxPriority ( BD_ADDR rem_bda, tL2CAP_CHNL_PRIORITY priority )
(rem_bda[0]<<24)+(rem_bda[1]<<16)+(rem_bda[2]<<8)+rem_bda[3],
(rem_bda[4]<<8)+rem_bda[5]);
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (rem_bda, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(rem_bda, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no LCB for L2CA_UCDSetTxPriority");
return (false);
}
/* Find the channel control block */
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, L2CAP_CONNECTIONLESS_CID)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, L2CAP_CONNECTIONLESS_CID);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for L2CA_UCDSetTxPriority");
return (false);
@@ -573,7 +581,8 @@ static bool l2c_ucd_connect ( BD_ADDR rem_bda )
}
/* First, see if we already have a link to the remote */
- if ((p_lcb = l2cu_find_lcb_by_bd_addr (rem_bda, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(rem_bda, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
/* No link. Get an LCB and start link establishment */
if ( ((p_lcb = l2cu_allocate_lcb (rem_bda, false, BT_TRANSPORT_BR_EDR)) == NULL)
@@ -593,10 +602,12 @@ static bool l2c_ucd_connect ( BD_ADDR rem_bda )
}
/* Find the channel control block. */
- if ((p_ccb = l2cu_find_ccb_by_cid (p_lcb, L2CAP_CONNECTIONLESS_CID)) == NULL)
+ p_ccb = l2cu_find_ccb_by_cid(p_lcb, L2CAP_CONNECTIONLESS_CID);
+ if (p_ccb == NULL)
{
/* Allocate a channel control block */
- if ((p_ccb = l2cu_allocate_ccb (p_lcb, 0)) == NULL)
+ p_ccb = l2cu_allocate_ccb(p_lcb, 0);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for l2c_ucd_connect");
return (false);
@@ -613,7 +624,8 @@ static bool l2c_ucd_connect ( BD_ADDR rem_bda )
/* Set the default channel priority value to use */
l2cu_change_pri_ccb (p_ccb, L2CAP_UCD_CH_PRIORITY);
- if ((p_rcb = l2cu_find_rcb_by_psm (L2C_UCD_RCB_ID)) == NULL)
+ p_rcb = l2cu_find_rcb_by_psm(L2C_UCD_RCB_ID);
+ if (p_rcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no UCD registered, l2c_ucd_connect");
return (false);
@@ -901,7 +913,8 @@ bool l2c_ucd_check_rx_pkts(tL2C_LCB *p_lcb, BT_HDR *p_msg)
if (p_ccb == NULL)
{
/* Allocate a channel control block */
- if ((p_ccb = l2cu_allocate_ccb (p_lcb, 0)) == NULL)
+ p_ccb = l2cu_allocate_ccb(p_lcb, 0);
+ if (p_ccb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no CCB for UCD reception");
osi_free(p_msg);
diff --git a/system/stack/l2cap/l2c_utils.cc b/system/stack/l2cap/l2c_utils.cc
index 37e0a8609b4f18e83d61410dc4e4acaa2a4f361d..bbd6c497e2b0210e017e53d33e8e79aca153489f 100644
--- a/system/stack/l2cap/l2c_utils.cc
+++ b/system/stack/l2cap/l2c_utils.cc
@@ -431,7 +431,8 @@ void l2cu_send_peer_cmd_reject (tL2C_LCB *p_lcb, uint16_t reason, uint8_t rem_id
else
param_len = 0;
- if ((p_buf = l2cu_build_header (p_lcb, (uint16_t) (L2CAP_CMD_REJECT_LEN + param_len), L2CAP_CMD_REJECT, rem_id)) == NULL )
+ p_buf = l2cu_build_header(p_lcb, (uint16_t)(L2CAP_CMD_REJECT_LEN + param_len), L2CAP_CMD_REJECT, rem_id);
+ if (p_buf == NULL )
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer cmd_rej");
return;
@@ -473,8 +474,9 @@ void l2cu_send_peer_connect_req (tL2C_CCB *p_ccb)
p_ccb->local_id = p_ccb->p_lcb->id;
- if ((p_buf = l2cu_build_header (p_ccb->p_lcb, L2CAP_CONN_REQ_LEN, L2CAP_CMD_CONN_REQ,
- p_ccb->local_id)) == NULL)
+ p_buf = l2cu_build_header(p_ccb->p_lcb, L2CAP_CONN_REQ_LEN,
+ L2CAP_CMD_CONN_REQ, p_ccb->local_id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for conn_req");
return;
@@ -514,7 +516,8 @@ void l2cu_send_peer_connect_rsp (tL2C_CCB *p_ccb, uint16_t result, uint16_t stat
p_ccb->flags |= CCB_FLAG_SENT_PENDING;
}
- if ((p_buf=l2cu_build_header(p_ccb->p_lcb, L2CAP_CONN_RSP_LEN, L2CAP_CMD_CONN_RSP, p_ccb->remote_id)) == NULL)
+ p_buf = l2cu_build_header(p_ccb->p_lcb, L2CAP_CONN_RSP_LEN, L2CAP_CMD_CONN_RSP, p_ccb->remote_id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for conn_rsp");
return;
@@ -548,7 +551,8 @@ void l2cu_reject_connection (tL2C_LCB *p_lcb, uint16_t remote_cid, uint8_t rem_i
BT_HDR *p_buf;
uint8_t *p;
- if ((p_buf = l2cu_build_header(p_lcb, L2CAP_CONN_RSP_LEN, L2CAP_CMD_CONN_RSP, rem_id)) == NULL )
+ p_buf = l2cu_build_header(p_lcb, L2CAP_CONN_RSP_LEN, L2CAP_CMD_CONN_RSP, rem_id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for conn_req");
return;
@@ -599,8 +603,8 @@ void l2cu_send_peer_config_req (tL2C_CCB *p_ccb, tL2CAP_CFG_INFO *p_cfg)
if (p_cfg->ext_flow_spec_present)
cfg_len += L2CAP_CFG_EXT_FLOW_OPTION_LEN + L2CAP_CFG_OPTION_OVERHEAD;
- if ((p_buf = l2cu_build_header (p_ccb->p_lcb, (uint16_t) (L2CAP_CONFIG_REQ_LEN + cfg_len),
- L2CAP_CMD_CONFIG_REQ, p_ccb->local_id)) == NULL )
+ p_buf = l2cu_build_header(p_ccb->p_lcb, (uint16_t)(L2CAP_CONFIG_REQ_LEN + cfg_len), L2CAP_CMD_CONFIG_REQ, p_ccb->local_id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for conn_req");
return;
@@ -699,8 +703,8 @@ void l2cu_send_peer_config_rsp (tL2C_CCB *p_ccb, tL2CAP_CFG_INFO *p_cfg)
if (p_cfg->ext_flow_spec_present)
cfg_len += L2CAP_CFG_EXT_FLOW_OPTION_LEN + L2CAP_CFG_OPTION_OVERHEAD;
- if ((p_buf = l2cu_build_header (p_ccb->p_lcb, (uint16_t)(L2CAP_CONFIG_RSP_LEN + cfg_len),
- L2CAP_CMD_CONFIG_RSP, p_ccb->remote_id)) == NULL )
+ p_buf = l2cu_build_header(p_ccb->p_lcb, (uint16_t)(L2CAP_CONFIG_RSP_LEN + cfg_len), L2CAP_CMD_CONFIG_RSP, p_ccb->remote_id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for conn_req");
return;
@@ -912,7 +916,8 @@ void l2cu_send_peer_disc_req (tL2C_CCB *p_ccb)
p_ccb->local_id = p_ccb->p_lcb->id;
- if ((p_buf = l2cu_build_header(p_ccb->p_lcb, L2CAP_DISC_REQ_LEN, L2CAP_CMD_DISC_REQ, p_ccb->local_id)) == NULL)
+ p_buf = l2cu_build_header(p_ccb->p_lcb, L2CAP_DISC_REQ_LEN, L2CAP_CMD_DISC_REQ, p_ccb->local_id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for disc_req");
return;
@@ -959,7 +964,8 @@ void l2cu_send_peer_disc_rsp (tL2C_LCB *p_lcb, uint8_t remote_id, uint16_t local
BT_HDR *p_buf;
uint8_t *p;
- if ((p_buf=l2cu_build_header(p_lcb, L2CAP_DISC_RSP_LEN, L2CAP_CMD_DISC_RSP, remote_id)) == NULL)
+ p_buf = l2cu_build_header(p_lcb, L2CAP_DISC_RSP_LEN, L2CAP_CMD_DISC_RSP, remote_id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for disc_rsp");
return;
@@ -993,7 +999,8 @@ void l2cu_send_peer_echo_req (tL2C_LCB *p_lcb, uint8_t *p_data, uint16_t data_le
p_lcb->id++;
l2cu_adj_id(p_lcb, L2CAP_ADJ_ZERO_ID); /* check for wrap to '0' */
- if ((p_buf = l2cu_build_header(p_lcb, (uint16_t) (L2CAP_ECHO_REQ_LEN + data_len), L2CAP_CMD_ECHO_REQ, p_lcb->id)) == NULL)
+ p_buf = l2cu_build_header(p_lcb, (uint16_t)(L2CAP_ECHO_REQ_LEN + data_len), L2CAP_CMD_ECHO_REQ, p_lcb->id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for echo_req");
return;
@@ -1046,7 +1053,8 @@ void l2cu_send_peer_echo_rsp (tL2C_LCB *p_lcb, uint8_t id, uint8_t *p_data, uint
if (data_len > maxlen)
data_len = 0;
- if ((p_buf = l2cu_build_header (p_lcb, (uint16_t)(L2CAP_ECHO_RSP_LEN + data_len), L2CAP_CMD_ECHO_RSP, id)) == NULL)
+ p_buf = l2cu_build_header(p_lcb, (uint16_t)(L2CAP_ECHO_RSP_LEN + data_len), L2CAP_CMD_ECHO_RSP, id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for echo_rsp");
return;
@@ -1081,7 +1089,8 @@ void l2cu_send_peer_info_req (tL2C_LCB *p_lcb, uint16_t info_type)
p_lcb->id++;
l2cu_adj_id(p_lcb, L2CAP_ADJ_ID);
- if ((p_buf = l2cu_build_header(p_lcb, 2, L2CAP_CMD_INFO_REQ, p_lcb->id)) == NULL)
+ p_buf = l2cu_build_header(p_lcb, 2, L2CAP_CMD_INFO_REQ, p_lcb->id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for info_req");
return;
@@ -1143,7 +1152,8 @@ void l2cu_send_peer_info_rsp (tL2C_LCB *p_lcb, uint8_t remote_id, uint16_t info_
len += L2CAP_CONNLESS_MTU_INFO_SIZE;
}
- if ((p_buf = l2cu_build_header(p_lcb, len, L2CAP_CMD_INFO_RSP, remote_id)) == NULL)
+ p_buf = l2cu_build_header(p_lcb, len, L2CAP_CMD_INFO_RSP, remote_id);
+ if (p_buf == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no buffer for info_rsp");
return;
@@ -2029,7 +2039,8 @@ uint8_t l2cu_process_peer_cfg_req (tL2C_CCB *p_ccb, tL2CAP_CFG_INFO *p_cfg)
p_cfg->qos = p_ccb->peer_cfg.qos;
}
- if ((fcr_status = l2c_fcr_process_peer_cfg_req (p_ccb, p_cfg)) == L2CAP_PEER_CFG_DISCONNECT)
+ fcr_status = l2c_fcr_process_peer_cfg_req(p_ccb, p_cfg);
+ if (fcr_status == L2CAP_PEER_CFG_DISCONNECT)
{
/* Notify caller to disconnect the channel (incompatible modes) */
p_cfg->result = L2CAP_CFG_FAILED_NO_REASON;
@@ -2390,7 +2401,8 @@ bool l2cu_create_conn_after_switch (tL2C_LCB *p_lcb)
p_lcb->link_state = LST_CONNECTING;
/* Check with the BT manager if details about remote device are known */
- if ((p_inq_info = BTM_InqDbRead(p_lcb->remote_bd_addr)) != NULL)
+ p_inq_info = BTM_InqDbRead(p_lcb->remote_bd_addr);
+ if (p_inq_info != NULL)
{
page_scan_rep_mode = p_inq_info->results.page_scan_rep_mode;
page_scan_mode = p_inq_info->results.page_scan_mode;
@@ -2525,7 +2537,8 @@ bool l2cu_set_acl_priority (BD_ADDR bd_addr, uint8_t priority, bool reset_
APPL_TRACE_EVENT("SET ACL PRIORITY %d", priority);
/* Find the link control block for the acl channel */
- if ((p_lcb = l2cu_find_lcb_by_bd_addr(bd_addr, BT_TRANSPORT_BR_EDR)) == NULL)
+ p_lcb = l2cu_find_lcb_by_bd_addr(bd_addr, BT_TRANSPORT_BR_EDR);
+ if (p_lcb == NULL)
{
L2CAP_TRACE_WARNING ("L2CAP - no LCB for L2CA_SetAclPriority");
return (false);
@@ -2720,7 +2733,8 @@ bool l2cu_initialize_fixed_ccb (tL2C_LCB *p_lcb, uint16_t fixed_cid, tL2CAP_F
return (true);
}
- if ((p_ccb = l2cu_allocate_ccb (NULL, 0)) == NULL)
+ p_ccb = l2cu_allocate_ccb(NULL, 0);
+ if (p_ccb == NULL)
return (false);
alarm_cancel(p_lcb->l2c_lcb_timer);
@@ -2954,8 +2968,8 @@ void l2cu_send_peer_ble_par_req (tL2C_LCB *p_lcb, uint16_t min_int, uint16_t max
p_lcb->id++;
l2cu_adj_id (p_lcb, L2CAP_ADJ_ID);
- if ((p_buf = l2cu_build_header (p_lcb, L2CAP_CMD_BLE_UPD_REQ_LEN,
- L2CAP_CMD_BLE_UPDATE_REQ, p_lcb->id)) == NULL )
+ p_buf = l2cu_build_header(p_lcb, L2CAP_CMD_BLE_UPD_REQ_LEN, L2CAP_CMD_BLE_UPDATE_REQ, p_lcb->id);
+ if (p_buf == NULL )
{
L2CAP_TRACE_WARNING ("l2cu_send_peer_ble_par_req - no buffer");
return;
@@ -2987,8 +3001,8 @@ void l2cu_send_peer_ble_par_rsp (tL2C_LCB *p_lcb, uint16_t reason, uint8_t rem_i
BT_HDR *p_buf;
uint8_t *p;
- if ((p_buf = l2cu_build_header (p_lcb, L2CAP_CMD_BLE_UPD_RSP_LEN,
- L2CAP_CMD_BLE_UPDATE_RSP, rem_id)) == NULL )
+ p_buf = l2cu_build_header(p_lcb, L2CAP_CMD_BLE_UPD_RSP_LEN, L2CAP_CMD_BLE_UPDATE_RSP, rem_id);
+ if (p_buf == NULL )
{
L2CAP_TRACE_WARNING ("l2cu_send_peer_ble_par_rsp - no buffer");
return;
@@ -3031,8 +3045,8 @@ void l2cu_send_peer_ble_credit_based_conn_req (tL2C_CCB *p_ccb)
p_ccb->local_id = p_ccb->p_lcb->id;
- if ((p_buf = l2cu_build_header (p_lcb, L2CAP_CMD_BLE_CREDIT_BASED_CONN_REQ_LEN,
- L2CAP_CMD_BLE_CREDIT_BASED_CONN_REQ, p_lcb->id)) == NULL )
+ p_buf = l2cu_build_header(p_lcb, L2CAP_CMD_BLE_CREDIT_BASED_CONN_REQ_LEN, L2CAP_CMD_BLE_CREDIT_BASED_CONN_REQ, p_lcb->id);
+ if (p_buf == NULL )
{
L2CAP_TRACE_WARNING ("l2cu_send_peer_ble_credit_based_conn_req - no buffer");
return;
@@ -3073,8 +3087,8 @@ void l2cu_reject_ble_connection (tL2C_LCB *p_lcb, uint8_t rem_id, uint16_t resul
BT_HDR *p_buf;
uint8_t *p;
- if ((p_buf = l2cu_build_header(p_lcb, L2CAP_CMD_BLE_CREDIT_BASED_CONN_RES_LEN,
- L2CAP_CMD_BLE_CREDIT_BASED_CONN_RES, rem_id)) == NULL )
+ p_buf = l2cu_build_header(p_lcb, L2CAP_CMD_BLE_CREDIT_BASED_CONN_RES_LEN, L2CAP_CMD_BLE_CREDIT_BASED_CONN_RES, rem_id);
+ if (p_buf == NULL )
{
L2CAP_TRACE_WARNING ("l2cu_reject_ble_connection - no buffer");
return;
@@ -3108,8 +3122,8 @@ void l2cu_send_peer_ble_credit_based_conn_res (tL2C_CCB *p_ccb, uint16_t result)
uint8_t *p;
L2CAP_TRACE_DEBUG ("l2cu_send_peer_ble_credit_based_conn_res");
- if ((p_buf = l2cu_build_header(p_ccb->p_lcb, L2CAP_CMD_BLE_CREDIT_BASED_CONN_RES_LEN,
- L2CAP_CMD_BLE_CREDIT_BASED_CONN_RES, p_ccb->remote_id)) == NULL )
+ p_buf = l2cu_build_header(p_ccb->p_lcb, L2CAP_CMD_BLE_CREDIT_BASED_CONN_RES_LEN, L2CAP_CMD_BLE_CREDIT_BASED_CONN_RES, p_ccb->remote_id);
+ if (p_buf == NULL )
{
L2CAP_TRACE_WARNING ("l2cu_send_peer_ble_credit_based_conn_res - no buffer");
return;
@@ -3153,8 +3167,8 @@ void l2cu_send_peer_ble_flow_control_credit(tL2C_CCB *p_ccb, uint16_t credit_val
p_ccb->local_id = p_ccb->p_lcb->id;
- if ((p_buf = l2cu_build_header (p_lcb, L2CAP_CMD_BLE_FLOW_CTRL_CREDIT_LEN,
- L2CAP_CMD_BLE_FLOW_CTRL_CREDIT, p_lcb->id)) == NULL )
+ p_buf = l2cu_build_header(p_lcb, L2CAP_CMD_BLE_FLOW_CTRL_CREDIT_LEN, L2CAP_CMD_BLE_FLOW_CTRL_CREDIT, p_lcb->id);
+ if (p_buf == NULL )
{
L2CAP_TRACE_WARNING ("l2cu_send_peer_ble_credit_based_conn_req - no buffer");
return;
@@ -3195,8 +3209,8 @@ void l2cu_send_peer_ble_credit_based_disconn_req(tL2C_CCB *p_ccb)
l2cu_adj_id(p_ccb->p_lcb, L2CAP_ADJ_ID);
p_ccb->local_id = p_ccb->p_lcb->id;
- if ((p_buf = l2cu_build_header (p_lcb, L2CAP_DISC_REQ_LEN,
- L2CAP_CMD_DISC_REQ, p_lcb->id)) == NULL )
+ p_buf = l2cu_build_header(p_lcb, L2CAP_DISC_REQ_LEN, L2CAP_CMD_DISC_REQ, p_lcb->id);
+ if (p_buf == NULL )
{
L2CAP_TRACE_WARNING ("l2cu_send_peer_ble_credit_based_disconn_req - no buffer");
return;
@@ -3483,7 +3497,8 @@ BT_HDR *l2cu_get_next_buffer_to_send (tL2C_LCB *p_lcb)
for (xx = 0; xx < L2CAP_NUM_FIXED_CHNLS; xx++)
{
- if ((p_ccb = p_lcb->p_fixed_ccbs[xx]) == NULL)
+ p_ccb = p_lcb->p_fixed_ccbs[xx];
+ if (p_ccb == NULL)
continue;
/* eL2CAP option in use */
@@ -3503,7 +3518,8 @@ BT_HDR *l2cu_get_next_buffer_to_send (tL2C_LCB *p_lcb)
continue;
}
- if ((p_buf = l2c_fcr_get_next_xmit_sdu_seg(p_ccb, 0)) != NULL)
+ p_buf = l2c_fcr_get_next_xmit_sdu_seg(p_ccb, 0);
+ if (p_buf != NULL)
{
l2cu_check_channel_congestion (p_ccb);
l2cu_set_acl_hci_header (p_buf, p_ccb);
@@ -3551,7 +3567,8 @@ BT_HDR *l2cu_get_next_buffer_to_send (tL2C_LCB *p_lcb)
L2CAP_TRACE_DEBUG("%s No credits to send packets",__func__);
return NULL;
}
- if ((p_buf = l2c_lcc_get_next_xmit_sdu_seg(p_ccb, 0)) == NULL)
+ p_buf = l2c_lcc_get_next_xmit_sdu_seg(p_ccb, 0);
+ if (p_buf == NULL)
return (NULL);
p_ccb->peer_conn_cfg.credits--;
@@ -3560,7 +3577,8 @@ BT_HDR *l2cu_get_next_buffer_to_send (tL2C_LCB *p_lcb)
{
if (p_ccb->peer_cfg.fcr.mode != L2CAP_FCR_BASIC_MODE)
{
- if ((p_buf = l2c_fcr_get_next_xmit_sdu_seg(p_ccb, 0)) == NULL)
+ p_buf = l2c_fcr_get_next_xmit_sdu_seg(p_ccb, 0);
+ if (p_buf == NULL)
return (NULL);
}
else
diff --git a/system/stack/mcap/mca_api.cc b/system/stack/mcap/mca_api.cc
index 6201e5214fdbebf9bc778342b42762d9418ae9dd..ed8808a08c0b8d993b1076efca0b7b1d167686f4 100644
--- a/system/stack/mcap/mca_api.cc
+++ b/system/stack/mcap/mca_api.cc
@@ -128,7 +128,8 @@ tMCA_HANDLE MCA_Register(tMCA_REG *p_reg, tMCA_CTRL_CBACK *p_cback)
MCA_TRACE_API ("MCA_Register: ctrl_psm:0x%x, data_psm:0x%x", p_reg->ctrl_psm, p_reg->data_psm);
- if ( (p_rcb = mca_rcb_alloc (p_reg)) != NULL)
+ p_rcb = mca_rcb_alloc(p_reg);
+ if (p_rcb != NULL)
{
if (p_reg->ctrl_psm)
{
@@ -338,7 +339,8 @@ tMCA_RESULT MCA_ConnectReq(tMCA_HANDLE handle, BD_ADDR bd_addr,
tMCA_TC_TBL *p_tbl;
MCA_TRACE_API ("MCA_ConnectReq: %d psm:0x%x", handle, ctrl_psm);
- if ((p_ccb = mca_ccb_by_bd(handle, bd_addr)) == NULL)
+ p_ccb = mca_ccb_by_bd(handle, bd_addr);
+ if (p_ccb == NULL)
p_ccb = mca_ccb_alloc(handle, bd_addr);
else
{
diff --git a/system/stack/mcap/mca_csm.cc b/system/stack/mcap/mca_csm.cc
index f80272383bed278f16c0fd7bee6b3aca3cbf64bc..3b30a21bc5eb63c81523d6cdf574b457daaf2a2e 100644
--- a/system/stack/mcap/mca_csm.cc
+++ b/system/stack/mcap/mca_csm.cc
@@ -192,7 +192,8 @@ void mca_ccb_event(tMCA_CCB *p_ccb, uint8_t event, tMCA_CCB_EVT *p_data)
p_ccb->state = state_table[event][MCA_CCB_NEXT_STATE];
/* execute action functions */
- if ((action = state_table[event][MCA_CCB_ACT_COL]) != MCA_CCB_IGNORE)
+ action = state_table[event][MCA_CCB_ACT_COL];
+ if (action != MCA_CCB_IGNORE)
{
(*mca_ccb_action[action])(p_ccb, p_data);
}
diff --git a/system/stack/mcap/mca_dsm.cc b/system/stack/mcap/mca_dsm.cc
index 57e3ae106255a2597d356ce6a4caacaf4cad1b0e..bf6dee403b86292fcf1a400b4ec9e6970c338984 100644
--- a/system/stack/mcap/mca_dsm.cc
+++ b/system/stack/mcap/mca_dsm.cc
@@ -148,7 +148,8 @@ void mca_dcb_event(tMCA_DCB *p_dcb, uint8_t event, tMCA_DCB_EVT *p_data)
p_dcb->state = state_table[event][MCA_DCB_NEXT_STATE];
/* execute action functions */
- if ((action = state_table[event][MCA_DCB_ACT_COL]) != MCA_DCB_IGNORE)
+ action = state_table[event][MCA_DCB_ACT_COL];
+ if (action != MCA_DCB_IGNORE)
{
(*mca_dcb_action[action])(p_dcb, p_data);
}
diff --git a/system/stack/mcap/mca_l2c.cc b/system/stack/mcap/mca_l2c.cc
index e595001edd34efbbb0fa1dbcb236707b0e29f2be..91c203c95a6cba09eb36b3c884859a9d28532cd6 100644
--- a/system/stack/mcap/mca_l2c.cc
+++ b/system/stack/mcap/mca_l2c.cc
@@ -163,10 +163,12 @@ void mca_l2c_cconn_ind_cback(BD_ADDR bd_addr, uint16_t lcid, uint16_t psm, uint8
MCA_TRACE_EVENT ("mca_l2c_cconn_ind_cback: lcid:x%x psm:x%x id:x%x", lcid, psm, id);
/* do we already have a control channel for this peer? */
- if ((p_ccb = mca_ccb_by_bd(handle, bd_addr)) == NULL)
+ p_ccb = mca_ccb_by_bd(handle, bd_addr);
+ if (p_ccb == NULL)
{
/* no, allocate ccb */
- if ((p_ccb = mca_ccb_alloc(handle, bd_addr)) != NULL)
+ p_ccb = mca_ccb_alloc(handle, bd_addr);
+ if (p_ccb != NULL)
{
/* allocate and set up entry */
p_ccb->lcid = lcid;
@@ -302,7 +304,8 @@ void mca_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result)
MCA_TRACE_DEBUG("mca_l2c_connect_cfm_cback lcid: x%x, result: %d",
lcid, result);
/* look up info for this channel */
- if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = mca_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
MCA_TRACE_DEBUG("p_tbl state: %d, tcid: %d", p_tbl->state, p_tbl->tcid);
/* if in correct state */
@@ -368,7 +371,8 @@ void mca_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
tMCA_TC_TBL *p_tbl;
/* look up info for this channel */
- if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = mca_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
/* if in correct state */
if (p_tbl->state == MCA_TC_ST_CFG)
@@ -411,7 +415,8 @@ void mca_l2c_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO *p_cfg)
uint16_t result = L2CAP_CFG_OK;
/* look up info for this channel */
- if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = mca_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
/* store the mtu in tbl */
if (p_cfg->mtu_present)
@@ -466,7 +471,8 @@ void mca_l2c_disconnect_ind_cback(uint16_t lcid, bool ack_needed)
MCA_TRACE_DEBUG("mca_l2c_disconnect_ind_cback lcid: %d, ack_needed: %d",
lcid, ack_needed);
/* look up info for this channel */
- if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = mca_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
if (ack_needed)
{
@@ -498,7 +504,8 @@ void mca_l2c_disconnect_cfm_cback(uint16_t lcid, uint16_t result)
MCA_TRACE_DEBUG("mca_l2c_disconnect_cfm_cback lcid: x%x, result: %d",
lcid, result);
/* look up info for this channel */
- if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = mca_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
p_tbl->cfg_flags = MCA_L2C_CFG_DISCN_INT;
mca_tc_close_ind(p_tbl, result);
@@ -521,7 +528,8 @@ void mca_l2c_congestion_ind_cback(uint16_t lcid, bool is_congested)
tMCA_TC_TBL *p_tbl;
/* look up info for this channel */
- if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = mca_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
mca_tc_cong_ind(p_tbl, is_congested);
}
@@ -542,7 +550,8 @@ void mca_l2c_data_ind_cback(uint16_t lcid, BT_HDR *p_buf)
tMCA_TC_TBL *p_tbl;
/* look up info for this channel */
- if ((p_tbl = mca_tc_tbl_by_lcid(lcid)) != NULL)
+ p_tbl = mca_tc_tbl_by_lcid(lcid);
+ if (p_tbl != NULL)
{
mca_tc_data_ind(p_tbl, p_buf);
}
diff --git a/system/stack/rfcomm/port_api.cc b/system/stack/rfcomm/port_api.cc
index 83b0ab724edd4b35128f84603b00befc242a534b..3b6f773e77db600116fbe536ed73b63d8ee4934e 100644
--- a/system/stack/rfcomm/port_api.cc
+++ b/system/stack/rfcomm/port_api.cc
@@ -155,7 +155,8 @@ int RFCOMM_CreateConnection (uint16_t uuid, uint8_t scn, bool is_server,
}
}
- if ((p_port = port_allocate_port (dlci, bd_addr)) == NULL)
+ p_port = port_allocate_port(dlci, bd_addr);
+ if (p_port == NULL)
{
RFCOMM_TRACE_WARNING ("RFCOMM_CreateConnection - no resources");
return (PORT_NO_RESOURCES);
diff --git a/system/stack/rfcomm/port_rfc.cc b/system/stack/rfcomm/port_rfc.cc
index 32b4806df7b5518679610821841b045d820d5fa1..143b6acf9ef21823a9ad8da48375f2fcbfcd7670 100644
--- a/system/stack/rfcomm/port_rfc.cc
+++ b/system/stack/rfcomm/port_rfc.cc
@@ -62,7 +62,8 @@ int port_open_continue (tPORT *p_port)
RFCOMM_TRACE_EVENT ("port_open_continue, p_port:%p", p_port);
/* Check if multiplexer channel has already been established */
- if ((p_mcb = rfc_alloc_multiplexer_channel (p_port->bd_addr, true)) == NULL)
+ p_mcb = rfc_alloc_multiplexer_channel(p_port->bd_addr, true);
+ if (p_mcb == NULL)
{
RFCOMM_TRACE_WARNING ("port_open_continue no mx channel");
port_release_port (p_port);
@@ -942,7 +943,8 @@ void PORT_FlowInd (tRFC_MCB *p_mcb, uint8_t dlci, bool enable_data)
}
else
{
- if ((p_port = port_find_mcb_dlci_port (p_mcb, dlci)) == NULL)
+ p_port = port_find_mcb_dlci_port(p_mcb, dlci);
+ if (p_port == NULL)
return;
p_port->tx.peer_fc = !enable_data;
@@ -1002,7 +1004,8 @@ uint32_t port_rfc_send_tx_data (tPORT *p_port)
/* get data from tx queue and send it */
mutex_global_lock();
- if ((p_buf = (BT_HDR *)fixed_queue_try_dequeue(p_port->tx.queue)) != NULL)
+ p_buf = (BT_HDR *)fixed_queue_try_dequeue(p_port->tx.queue);
+ if (p_buf != NULL)
{
p_port->tx.queue_size -= p_buf->len;
diff --git a/system/stack/rfcomm/rfc_l2cap_if.cc b/system/stack/rfcomm/rfc_l2cap_if.cc
index a8c3043264808bf44856704fe8d3214c9a7d3c97..f0e665d1db280a509514dc8a2a55b6de169d02da 100644
--- a/system/stack/rfcomm/rfc_l2cap_if.cc
+++ b/system/stack/rfcomm/rfc_l2cap_if.cc
@@ -177,7 +177,8 @@ void RFCOMM_ConnectCnf (uint16_t lcid, uint16_t result)
/* update direction bit */
for (i = 0; i < RFCOMM_MAX_DLCI; i += 2)
{
- if ((idx = p_mcb->port_inx[i]) != 0)
+ idx = p_mcb->port_inx[i];
+ if (idx != 0)
{
p_mcb->port_inx[i] = 0;
p_mcb->port_inx[i+1] = idx;
@@ -355,7 +356,8 @@ void RFCOMM_BufDataInd (uint16_t lcid, BT_HDR *p_buf)
return;
}
- if ((p_port = port_find_dlci_port (rfc_cb.rfc.rx_frame.dlci)) == NULL)
+ p_port = port_find_dlci_port(rfc_cb.rfc.rx_frame.dlci);
+ if (p_port == NULL)
{
rfc_send_dm (p_mcb, rfc_cb.rfc.rx_frame.dlci, true);
osi_free(p_buf);
@@ -424,7 +426,8 @@ tRFC_MCB *rfc_find_lcid_mcb (uint16_t lcid)
}
else
{
- if ((p_mcb = rfc_cb.rfc.p_rfc_lcid_mcb[lcid - L2CAP_BASE_APPL_CID]) != NULL)
+ p_mcb = rfc_cb.rfc.p_rfc_lcid_mcb[lcid - L2CAP_BASE_APPL_CID];
+ if (p_mcb != NULL)
{
if (p_mcb->lcid != lcid)
{
diff --git a/system/stack/rfcomm/rfc_mx_fsm.cc b/system/stack/rfcomm/rfc_mx_fsm.cc
index 62a4869aabb82565eb7b65c12cc866e2f7106ce1..06bb74be6f8293e36244c3bc5ced9a5b7da88cd7 100644
--- a/system/stack/rfcomm/rfc_mx_fsm.cc
+++ b/system/stack/rfcomm/rfc_mx_fsm.cc
@@ -237,7 +237,8 @@ void rfc_mx_sm_state_wait_conn_cnf (tRFC_MCB *p_mcb, uint16_t event, void *p_dat
/* update direction bit */
for (i = 0; i < RFCOMM_MAX_DLCI; i += 2)
{
- if ((idx = p_mcb->port_inx[i]) != 0)
+ idx = p_mcb->port_inx[i];
+ if (idx != 0)
{
p_mcb->port_inx[i] = 0;
p_mcb->port_inx[i+1] = idx;
diff --git a/system/stack/rfcomm/rfc_port_fsm.cc b/system/stack/rfcomm/rfc_port_fsm.cc
index 9f6330708266f1c7af71c695aebeddb458f049a1..ca9af28e61ce965bea10833840acbbd5cc26c62a 100644
--- a/system/stack/rfcomm/rfc_port_fsm.cc
+++ b/system/stack/rfcomm/rfc_port_fsm.cc
@@ -582,7 +582,8 @@ void rfc_process_rpn (tRFC_MCB *p_mcb, bool is_command,
tPORT_STATE port_pars;
tPORT *p_port;
- if ((p_port = port_find_mcb_dlci_port (p_mcb, p_frame->dlci)) == NULL)
+ p_port = port_find_mcb_dlci_port(p_mcb, p_frame->dlci);
+ if (p_port == NULL)
{
/* This is the first command on the port */
if (is_command)
diff --git a/system/stack/sdp/sdp_api.cc b/system/stack/sdp/sdp_api.cc
index 6ac29cf03ed0c6f4ad7d1f4b74e6e6b9b607b79e..c84d9fb12b67baa5e048b7801f7ea1ccf361d87a 100644
--- a/system/stack/sdp/sdp_api.cc
+++ b/system/stack/sdp/sdp_api.cc
@@ -830,7 +830,8 @@ bool SDP_FindAddProtoListsElemInRec (tSDP_DISC_REC *p_rec, uint16_t layer_uui
/* Safety check - each entry should itself be a sequence */
if (SDP_DISC_ATTR_TYPE(p_sattr->attr_len_type) == DATA_ELE_SEQ_DESC_TYPE)
{
- if ( (ret = sdp_fill_proto_elem(p_sattr, layer_uuid, p_elem)) == true)
+ ret = sdp_fill_proto_elem(p_sattr, layer_uuid, p_elem);
+ if (ret == true)
break;
}
}
@@ -1135,7 +1136,8 @@ uint16_t SDP_SetLocalDiRecord( tSDP_DI_RECORD *p_device_info, uint32_t *p_handle
handle = sdp_cb.server_db.di_primary_handle;
else
{
- if ( (handle = SDP_CreateRecord()) == 0 )
+ handle = SDP_CreateRecord();
+ if (handle == 0)
return SDP_NO_RESOURCES;
}
diff --git a/system/stack/sdp/sdp_main.cc b/system/stack/sdp/sdp_main.cc
index 341c2607baed09cbe8cd933dba4fb4f489bdccef..af696b4242e05802ab061f9b1729faa2f113f31f 100644
--- a/system/stack/sdp/sdp_main.cc
+++ b/system/stack/sdp/sdp_main.cc
@@ -177,7 +177,8 @@ static void sdp_connect_ind (BD_ADDR bd_addr, uint16_t l2cap_cid,
tCONN_CB *p_ccb;
/* Allocate a new CCB. Return if none available. */
- if ((p_ccb = sdpu_allocate_ccb()) == NULL)
+ p_ccb = sdpu_allocate_ccb();
+ if (p_ccb == NULL)
return;
/* Transition to the next appropriate state, waiting for config setup. */
@@ -234,7 +235,8 @@ static void sdp_connect_cfm (uint16_t l2cap_cid, uint16_t result)
tL2CAP_CFG_INFO cfg;
/* Find CCB based on CID */
- if ((p_ccb = sdpu_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = sdpu_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
{
SDP_TRACE_WARNING ("SDP - Rcvd conn cnf for unknown CID 0x%x", l2cap_cid);
return;
@@ -311,7 +313,8 @@ static void sdp_config_ind (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
tCONN_CB *p_ccb;
/* Find CCB based on CID */
- if ((p_ccb = sdpu_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = sdpu_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
{
SDP_TRACE_WARNING ("SDP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
@@ -408,7 +411,8 @@ static void sdp_config_cfm (uint16_t l2cap_cid, tL2CAP_CFG_INFO *p_cfg)
SDP_TRACE_EVENT ("SDP - Rcvd cfg cfm, CID: 0x%x Result: %d", l2cap_cid, p_cfg->result);
/* Find CCB based on CID */
- if ((p_ccb = sdpu_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = sdpu_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
{
SDP_TRACE_WARNING ("SDP - Rcvd L2CAP cfg ind, unknown CID: 0x%x", l2cap_cid);
return;
@@ -467,7 +471,8 @@ static void sdp_disconnect_ind (uint16_t l2cap_cid, bool ack_needed)
tCONN_CB *p_ccb;
/* Find CCB based on CID */
- if ((p_ccb = sdpu_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = sdpu_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
{
SDP_TRACE_WARNING ("SDP - Rcvd L2CAP disc, unknown CID: 0x%x", l2cap_cid);
return;
@@ -510,7 +515,8 @@ static void sdp_data_ind (uint16_t l2cap_cid, BT_HDR *p_msg)
tCONN_CB *p_ccb;
/* Find CCB based on CID */
- if ((p_ccb = sdpu_find_ccb_by_cid (l2cap_cid)) != NULL)
+ p_ccb = sdpu_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb != NULL)
{
if (p_ccb->con_state == SDP_STATE_CONNECTED)
{
@@ -551,7 +557,8 @@ tCONN_CB* sdp_conn_originate (uint8_t *p_bd_addr)
uint16_t cid;
/* Allocate a new CCB. Return if none available. */
- if ((p_ccb = sdpu_allocate_ccb()) == NULL)
+ p_ccb = sdpu_allocate_ccb();
+ if (p_ccb == NULL)
{
SDP_TRACE_WARNING ("SDP - no spare CCB for orig");
return (NULL);
@@ -675,7 +682,8 @@ static void sdp_disconnect_cfm (uint16_t l2cap_cid,
tCONN_CB *p_ccb;
/* Find CCB based on CID */
- if ((p_ccb = sdpu_find_ccb_by_cid (l2cap_cid)) == NULL)
+ p_ccb = sdpu_find_ccb_by_cid(l2cap_cid);
+ if (p_ccb == NULL)
{
SDP_TRACE_WARNING ("SDP - Rcvd L2CAP disc cfm, unknown CID: 0x%x", l2cap_cid);
return;
diff --git a/system/stack/smp/smp_br_main.cc b/system/stack/smp/smp_br_main.cc
index c8e12275104b70de48e5fe91a82290195dedf6cc..ecc4f1de0b4a261390248693e5a1be7e441ac588 100644
--- a/system/stack/smp/smp_br_main.cc
+++ b/system/stack/smp/smp_br_main.cc
@@ -382,7 +382,8 @@ void smp_br_state_machine_event(tSMP_CB *p_cb, tSMP_BR_EVENT event, void *p_data
/* execute action functions */
for (uint8_t i = 0; i < SMP_BR_NUM_ACTIONS; i++)
{
- if ((action = state_table[entry - 1][i]) != SMP_BR_SM_NO_ACTION)
+ action = state_table[entry - 1][i];
+ if (action != SMP_BR_SM_NO_ACTION)
{
(*smp_br_sm_action[action])(p_cb, (tSMP_INT_DATA *)p_data);
}
diff --git a/system/stack/smp/smp_keys.cc b/system/stack/smp/smp_keys.cc
index 566ff2a496244c8c02aad6358d94d765ca268b3e..dfeea88dc2d1c5fb5bb645086c48dd120a9cb265 100644
--- a/system/stack/smp/smp_keys.cc
+++ b/system/stack/smp/smp_keys.cc
@@ -1911,7 +1911,8 @@ bool smp_calculate_link_key_from_long_term_key(tSMP_CB *p_cb)
return false;
}
- if ((p_dev_rec = btm_find_dev (p_cb->pairing_bda)) == NULL)
+ p_dev_rec = btm_find_dev(p_cb->pairing_bda);
+ if (p_dev_rec == NULL)
{
SMP_TRACE_ERROR("%s failed to find Security Record", __func__);
return false;
@@ -1997,15 +1998,16 @@ bool smp_calculate_long_term_key_from_link_key(tSMP_CB *p_cb)
SMP_TRACE_DEBUG ("%s", __func__);
- if ((p_dev_rec = btm_find_dev (p_cb->pairing_bda)) == NULL)
+ p_dev_rec = btm_find_dev(p_cb->pairing_bda);
+ if (p_dev_rec == NULL)
{
SMP_TRACE_ERROR("%s failed to find Security Record",__func__);
return false;
}
uint8_t br_link_key_type;
- if ((br_link_key_type = BTM_SecGetDeviceLinkKeyType (p_cb->pairing_bda))
- == BTM_LKEY_TYPE_IGNORE)
+ br_link_key_type = BTM_SecGetDeviceLinkKeyType(p_cb->pairing_bda);
+ if (br_link_key_type == BTM_LKEY_TYPE_IGNORE)
{
SMP_TRACE_ERROR("%s failed to retrieve BR link type",__func__);
return false;
diff --git a/system/stack/smp/smp_main.cc b/system/stack/smp/smp_main.cc
index 203d299803c54a0701412c5b982448934070e2fc..c598df8140466845a17577ed4e356fcbd57ed7c7 100644
--- a/system/stack/smp/smp_main.cc
+++ b/system/stack/smp/smp_main.cc
@@ -813,7 +813,8 @@ void smp_sm_event(tSMP_CB *p_cb, tSMP_EVENT event, void *p_data)
/* execute action functions */
for (i = 0; i < SMP_NUM_ACTIONS; i++)
{
- if ((action = state_table[entry-1][i]) != SMP_SM_NO_ACTION)
+ action = state_table[entry - 1][i];
+ if (action != SMP_SM_NO_ACTION)
{
(*smp_sm_action[action])(p_cb, (tSMP_INT_DATA *)p_data);
}
diff --git a/system/stack/smp/smp_utils.cc b/system/stack/smp/smp_utils.cc
index 649e8328b9d6dccf389e71a229dde2775cfa18e0..7e526c037aae8a674e991f637113bb87346867b0 100644
--- a/system/stack/smp/smp_utils.cc
+++ b/system/stack/smp/smp_utils.cc
@@ -293,7 +293,8 @@ bool smp_send_msg_to_L2CAP(BD_ADDR rem_bda, BT_HDR *p_toL2CAP)
SMP_TRACE_EVENT("%s", __func__);
smp_cb.total_tx_unacked += 1;
- if ((l2cap_ret = L2CA_SendFixedChnlData (fixed_cid, rem_bda, p_toL2CAP)) == L2CAP_DW_FAILED)
+ l2cap_ret = L2CA_SendFixedChnlData(fixed_cid, rem_bda, p_toL2CAP);
+ if (l2cap_ret == L2CAP_DW_FAILED)
{
smp_cb.total_tx_unacked -= 1;
SMP_TRACE_ERROR("SMP failed to pass msg:0x%0x to L2CAP",