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

Commit df4a008d authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove unused parameter from bta_dm_free_sdp_db 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I38520e4a0f5825111d185e0cd48a56bb390c6632
parent 66dba63c

system/bta/dm/bta_dm_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -1134,7 +1134,7 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
    /* if there are more services to search for */

    if (bta_dm_search_cb.services_to_search) {

      /* Free up the p_sdp_db before checking the next one */

      bta_dm_free_sdp_db(NULL);

      bta_dm_free_sdp_db();

      bta_dm_find_services(bta_dm_search_cb.peer_bdaddr);

    } else {

      /* callbacks */
@@ -1183,7 +1183,7 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
                         __func__);

      }

      /* Done with p_sdp_db. Free it */

      bta_dm_free_sdp_db(NULL);

      bta_dm_free_sdp_db();

      p_msg->disc_result.result.disc_res.services =

          bta_dm_search_cb.services_found;
@@ -1332,7 +1332,7 @@ static void bta_dm_search_timer_cback(UNUSED_ATTR void* data) { 
 * Returns          void

 *

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

void bta_dm_free_sdp_db(UNUSED_ATTR tBTA_DM_MSG* p_data) {

void bta_dm_free_sdp_db() {

  osi_free_and_reset((void**)&bta_dm_search_cb.p_sdp_db);

}

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ extern void bta_dm_inq_cmpl(uint8_t num); 
extern void bta_dm_rmt_name(tBTA_DM_MSG* p_data);

extern void bta_dm_sdp_result(tBTA_DM_MSG* p_data);

extern void bta_dm_search_cmpl();

extern void bta_dm_free_sdp_db(tBTA_DM_MSG* p_data);

extern void bta_dm_free_sdp_db();

extern void bta_dm_disc_result(tBTA_DM_MSG* p_data);

extern void bta_dm_search_result(tBTA_DM_MSG* p_data);

extern void bta_dm_discovery_cmpl(tBTA_DM_MSG* p_data);

system/bta/dm/bta_dm_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
          bta_dm_discover(message);

          break;

        case BTA_DM_SDP_RESULT_EVT:

          bta_dm_free_sdp_db(message);

          bta_dm_free_sdp_db();

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          bta_dm_close_gatt_conn(message);
@@ -116,7 +116,7 @@ bool bta_dm_search_sm_execute(BT_HDR* p_msg) { 
        case BTA_DM_SEARCH_CMPL_EVT:

        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_free_sdp_db(message);

          bta_dm_free_sdp_db();

          bta_dm_search_cancel_notify();

          bta_dm_search_cancel_cmpl();

          break;