Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c589f416 authored by Jack He's avatar Jack He
Browse files

HFP: Fix static check errors 

* In bta/ag and btif/btif_hf.cc
* Simplify boolean values
* Use nullptr intead of NULL
* Use C++ style include headers instead of C style ones
* Remove unused struct definitions
* Remove unused code from bta_ag_ci.h/cc
* Use range based for-loop when it can be converted automatically
* Use C++ style zero-initialization instead of memset so that non-POD
  members of structs can be initialized properly
* Use "" to initliaze char array since the rest of the array will be
  zero padded if the array is assigned to a shorter string than its
  length

Bug: 68340193
Test: make, connect to HFP enabled device
Change-Id: I25c1e48ca1cb40629b9b60243ec462f498d8fc24
parent 1aa503f7

system/bta/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ cc_library_static { 
        "ag/bta_ag_api.cc",

        "ag/bta_ag_at.cc",

        "ag/bta_ag_cfg.cc",

        "ag/bta_ag_ci.cc",

        "ag/bta_ag_cmd.cc",

        "ag/bta_ag_main.cc",

        "ag/bta_ag_rfc.cc",

system/bta/ag/bta_ag_act.cc

+20 −18
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 *

 ******************************************************************************/



#include <string.h>

#include <cstring>



#include "bta_ag_api.h"

#include "bta_ag_co.h"
@@ -76,7 +76,7 @@ const tBTA_AG_ATCMD_CBACK bta_ag_at_cback_tbl[BTA_AG_NUM_IDX] = { 
 ******************************************************************************/

static void bta_ag_cback_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data,

                              tBTA_AG_STATUS status) {

  tBTA_AG_OPEN open;

  tBTA_AG_OPEN open = {};



  /* call app callback with open event */

  open.hdr.handle = bta_ag_scb_to_idx(p_scb);
@@ -106,7 +106,7 @@ static void bta_ag_cback_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data, 
 *

 ******************************************************************************/

void bta_ag_register(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {

  tBTA_AG_REGISTER reg;

  tBTA_AG_REGISTER reg = {};



  /* initialize control block */

  p_scb->reg_services = p_data->api_register.services;
@@ -181,7 +181,7 @@ void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) { 
 *

 ******************************************************************************/

void bta_ag_start_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {

  RawAddress pending_bd_addr;

  RawAddress pending_bd_addr = {};



  /* store parameters */

  if (p_data) {
@@ -308,7 +308,7 @@ void bta_ag_disc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
  p_scb->peer_addr = RawAddress::kEmpty;



  /* call open cback w. failure */

  bta_ag_cback_open(p_scb, NULL, BTA_AG_FAIL_SDP);

  bta_ag_cback_open(p_scb, nullptr, BTA_AG_FAIL_SDP);

}



/*******************************************************************************
@@ -353,7 +353,7 @@ void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
  bta_ag_start_servers(p_scb, p_scb->reg_services);



  /* call open cback w. failure */

  bta_ag_cback_open(p_scb, NULL, BTA_AG_FAIL_RFCOMM);

  bta_ag_cback_open(p_scb, nullptr, BTA_AG_FAIL_RFCOMM);

}



/*******************************************************************************
@@ -367,7 +367,7 @@ void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
 *

 ******************************************************************************/

void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {

  tBTA_AG_CLOSE close;

  tBTA_AG_CLOSE close = {};

  tBTA_SERVICE_MASK services;

  int i, num_active_conn = 0;
@@ -386,8 +386,12 @@ void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
  p_scb->hsp_version = HSP_VERSION_1_2;

  bta_ag_at_reinit(&p_scb->at_cb);



  memset(&(p_scb->peer_hf_indicators), 0, sizeof(p_scb->peer_hf_indicators));

  memset(&(p_scb->local_hf_indicators), 0, sizeof(p_scb->local_hf_indicators));

  for (auto& peer_hf_indicator : p_scb->peer_hf_indicators) {

    peer_hf_indicator = {};

  }

  for (auto& local_hf_indicator : p_scb->local_hf_indicators) {

    local_hf_indicator = {};

  }



  /* stop timers */

  alarm_cancel(p_scb->ring_timer);
@@ -421,7 +425,7 @@ void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
    p_scb->conn_handle = 0;



    /* Make sure SCO state is BTA_AG_SCO_SHUTDOWN_ST */

    bta_ag_sco_shutdown(p_scb, NULL);

    bta_ag_sco_shutdown(p_scb, nullptr);



    /* Check if all the SLCs are down */

    for (i = 0; i < BTA_AG_NUM_SCB; i++) {
@@ -475,7 +479,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) { 


  bta_sys_conn_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);



  bta_ag_cback_open(p_scb, NULL, BTA_AG_SUCCESS);

  bta_ag_cback_open(p_scb, nullptr, BTA_AG_SUCCESS);



  if (p_scb->conn_service == BTA_AG_HFP) {

    /* if hfp start timer for service level conn */
@@ -501,7 +505,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) { 
  uint16_t lcid;

  int i;

  tBTA_AG_SCB *ag_scb, *other_scb;

  RawAddress dev_addr;

  RawAddress dev_addr = {};

  int status;



  /* set role */
@@ -584,9 +588,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) { 
 ******************************************************************************/

void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {

  uint16_t len;

  char buf[BTA_AG_RFC_READ_MAX];



  memset(buf, 0, BTA_AG_RFC_READ_MAX);

  char buf[BTA_AG_RFC_READ_MAX] = "";



  APPL_TRACE_DEBUG("%s", __func__);
@@ -740,7 +742,7 @@ void bta_ag_post_sco_close(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) { 
 ******************************************************************************/

void bta_ag_svc_conn_open(tBTA_AG_SCB* p_scb,

                          UNUSED_ATTR tBTA_AG_DATA* p_data) {

  tBTA_AG_CONN evt;

  tBTA_AG_CONN evt = {};



  if (!p_scb->svc_conn) {

    /* set state variable */
@@ -811,7 +813,7 @@ void bta_ag_rcvd_slc_ready(tBTA_AG_SCB* p_scb, 
  if (bta_ag_cb.parse_mode == BTA_AG_PASS_THROUGH) {

    /* In pass-through mode, BTA knows that SLC is ready only through call-in.

     */

    bta_ag_svc_conn_open(p_scb, NULL);

    bta_ag_svc_conn_open(p_scb, nullptr);

  }

}
@@ -827,7 +829,7 @@ void bta_ag_rcvd_slc_ready(tBTA_AG_SCB* p_scb, 
 ******************************************************************************/

void bta_ag_setcodec(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {

  tBTA_AG_PEER_CODEC codec_type = p_data->api_setcodec.codec;

  tBTA_AG_VAL val;

  tBTA_AG_VAL val = {};



  /* Check if the requested codec type is valid */

  if ((codec_type != BTA_AG_CODEC_NONE) && (codec_type != BTA_AG_CODEC_CVSD) &&

system/bta/ag/bta_ag_api.cc

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 ******************************************************************************/



#include "bta_ag_api.h"

#include <string.h>

#include <cstring>

#include "bt_common.h"

#include "bta_ag_int.h"

#include "bta_api.h"
@@ -53,8 +53,8 @@ static const tBTA_SYS_REG bta_ag_reg = {bta_ag_hdl_event, BTA_AgDisable}; 
tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode,

                         tBTA_AG_CBACK* p_cback) {

  /* Error if AG is already enabled, or AG is in the middle of disabling. */

  for (int idx = 0; idx < BTA_AG_NUM_SCB; idx++) {

    if (bta_ag_cb.scb[idx].in_use) {

  for (const tBTA_AG_SCB& scb : bta_ag_cb.scb) {

    if (scb.in_use) {

      APPL_TRACE_ERROR("BTA_AgEnable: FAILED, AG already enabled.");

      return BTA_FAILURE;

    }
@@ -84,7 +84,7 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode, 
 * Returns          void

 *

 ******************************************************************************/

void BTA_AgDisable(void) {

void BTA_AgDisable() {

  BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));



  p_buf->event = BTA_AG_API_DISABLE_EVT;

system/bta/ag/bta_ag_at.cc

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 *

 ******************************************************************************/



#include <string.h>

#include <cstring>



#include "bt_common.h"

#include "bta_ag_at.h"
@@ -43,7 +43,7 @@ 
 *

 *****************************************************************************/

void bta_ag_at_init(tBTA_AG_AT_CB* p_cb) {

  p_cb->p_cmd_buf = NULL;

  p_cb->p_cmd_buf = nullptr;

  p_cb->cmd_pos = 0;

}
@@ -129,7 +129,7 @@ void bta_ag_process_at(tBTA_AG_AT_CB* p_cb) { 
        if (int_arg < (int16_t)p_cb->p_at_tbl[idx].min ||

            int_arg > (int16_t)p_cb->p_at_tbl[idx].max) {

          /* arg out of range; error */

          (*p_cb->p_err_cback)((tBTA_AG_SCB*)p_cb->p_user, false, NULL);

          (*p_cb->p_err_cback)((tBTA_AG_SCB*)p_cb->p_user, false, nullptr);

        } else {

          (*p_cb->p_cmd_cback)((tBTA_AG_SCB*)p_cb->p_user,

                               p_cb->p_at_tbl[idx].command_id, arg_type, p_arg,
@@ -143,7 +143,7 @@ void bta_ag_process_at(tBTA_AG_AT_CB* p_cb) { 
    }

    /* else error */

    else {

      (*p_cb->p_err_cback)((tBTA_AG_SCB*)p_cb->p_user, false, NULL);

      (*p_cb->p_err_cback)((tBTA_AG_SCB*)p_cb->p_user, false, nullptr);

    }

  }

  /* else no match call error callback */
@@ -168,7 +168,7 @@ void bta_ag_at_parse(tBTA_AG_AT_CB* p_cb, char* p_buf, uint16_t len) { 
  int i = 0;

  char* p_save;



  if (p_cb->p_cmd_buf == NULL) {

  if (p_cb->p_cmd_buf == nullptr) {

    p_cb->p_cmd_buf = (char*)osi_malloc(p_cb->cmd_max_len);

    p_cb->cmd_pos = 0;

  }

system/bta/ag/bta_ag_cfg.cc

+3 −3
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ 
const tBTA_AG_HF_IND bta_ag_local_hf_ind_cfg[] = {

    /* The first row contains the number of indicators. Need to be updated

       accordingly */

    {BTA_AG_NUM_LOCAL_HF_IND, 0, 0, 0, 0},

    {BTA_AG_NUM_LOCAL_HF_IND, false, false, 0, 0},



    {1, 1, 1, 0,

    {1, true, true, 0,

     1}, /* Enhanced Driver Status, supported, enabled, range 0 ~ 1 */

    {2, 1, 1, 0,

    {2, true, true, 0,

     100} /* Battery Level Status, supported, enabled, range 0 ~ 100 */

};