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

Commit 6b81cf0a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "legacy: Const-ify sdp callback with user data"

parents 595da13a ca598e6c

system/bta/gatt/bta_gattc_cache.cc

+4 −4
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ descriptor_discovery_done: 
}



/* Process the discovery result from sdp */

void bta_gattc_sdp_callback(tSDP_STATUS sdp_status, void* user_data) {

void bta_gattc_sdp_callback(tSDP_STATUS sdp_status, const void* user_data) {

  tBTA_GATTC_CB_DATA* cb_data = (tBTA_GATTC_CB_DATA*)user_data;

  tBTA_GATTC_SERV* p_srvc_cb = bta_gattc_find_scb_by_cid(cb_data->sdp_conn_id);
@@ -357,9 +357,9 @@ static tGATT_STATUS bta_gattc_sdp_service_disc(uint16_t conn_id, 
  SDP_InitDiscoveryDb(cb_data->p_sdp_db, BTA_GATT_SDP_DB_SIZE, 1, &uuid,

                      num_attrs, attr_list);



  if (!SDP_ServiceSearchAttributeRequest2(p_server_cb->server_bda,

                                          cb_data->p_sdp_db,

                                          &bta_gattc_sdp_callback, cb_data)) {

  if (!SDP_ServiceSearchAttributeRequest2(

          p_server_cb->server_bda, cb_data->p_sdp_db, &bta_gattc_sdp_callback,

          const_cast<const void*>(static_cast<void*>(cb_data)))) {

    osi_free(cb_data);

    return GATT_ERROR;

  }

system/bta/hf_client/bta_hf_client_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ using bluetooth::Uuid; 
 * Returns          void

 *

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

static void bta_hf_client_sdp_cback(tSDP_STATUS status, void* data) {

static void bta_hf_client_sdp_cback(tSDP_STATUS status, const void* data) {

  uint16_t event;

  tBTA_HF_CLIENT_DISC_RESULT* p_buf = (tBTA_HF_CLIENT_DISC_RESULT*)osi_malloc(

      sizeof(tBTA_HF_CLIENT_DISC_RESULT));

system/bta/jv/bta_jv_act.cc

+4 −2
Original line number Diff line number Diff line
@@ -721,9 +721,11 @@ void bta_jv_free_scn(int32_t type /* One of BTA_JV_CONN_TYPE_ */, 
 * Returns      void

 *

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

static void bta_jv_start_discovery_cback(tSDP_RESULT result, void* user_data) {

static void bta_jv_start_discovery_cback(tSDP_RESULT result,

                                         const void* user_data) {

  tBTA_JV_STATUS status;

  uint32_t* p_rfcomm_slot_id = static_cast<uint32_t*>(user_data);

  uint32_t* p_rfcomm_slot_id =

      static_cast<uint32_t*>(const_cast<void*>(user_data));



  VLOG(2) << __func__ << ": res=" << loghex(static_cast<uint16_t>(result));

system/bta/sdp/bta_sdp_act.cc

+4 −3
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static void bta_create_raw_sdp_record(bluetooth_sdp_record* record, 
}



/** Callback from btm after search is completed */

static void bta_sdp_search_cback(tSDP_RESULT result, void* user_data) {

static void bta_sdp_search_cback(tSDP_RESULT result, const void* user_data) {

  tBTA_SDP_STATUS status = BTA_SDP_FAILURE;

  int count = 0;

  APPL_TRACE_DEBUG("%s() -  res: 0x%x", __func__, result);
@@ -376,7 +376,7 @@ static void bta_sdp_search_cback(tSDP_RESULT result, void* user_data) { 


  if (bta_sdp_cb.p_dm_cback == NULL) return;



  Uuid& uuid = *(reinterpret_cast<Uuid*>(user_data));

  Uuid& uuid = *(reinterpret_cast<Uuid*>(const_cast<void*>(user_data)));



  tBTA_SDP_SEARCH_COMP evt_data;

  memset(&evt_data, 0, sizeof(evt_data));
@@ -435,7 +435,8 @@ static void bta_sdp_search_cback(tSDP_RESULT result, void* user_data) { 
  tBTA_SDP bta_sdp;

  bta_sdp.sdp_search_comp = evt_data;

  bta_sdp_cb.p_dm_cback(BTA_SDP_SEARCH_COMP_EVT, &bta_sdp, (void*)&uuid);

  osi_free(user_data);  // We no longer need the user data to track the search

  osi_free(const_cast<void*>(

      user_data));  // We no longer need the user data to track the search

}



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

system/stack/include/sdp_api.h

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ inline std::string sdp_status_text(const tSDP_STATUS& status) { 


/* Define a callback function for when discovery is complete. */

typedef void(tSDP_DISC_CMPL_CB)(tSDP_RESULT result);

typedef void(tSDP_DISC_CMPL_CB2)(tSDP_RESULT result, void* user_data);

typedef void(tSDP_DISC_CMPL_CB2)(tSDP_RESULT result, const void* user_data);



typedef struct {

  RawAddress peer_addr;
@@ -273,7 +273,7 @@ bool SDP_ServiceSearchAttributeRequest(const RawAddress& p_bd_addr, 
bool SDP_ServiceSearchAttributeRequest2(const RawAddress& p_bd_addr,

                                        tSDP_DISCOVERY_DB* p_db,

                                        tSDP_DISC_CMPL_CB2* p_cb,

                                        void* user_data);

                                        const void* user_data);



/* API of utilities to find data in the local discovery database */