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

Commit 6b597c3d authored by Chris Manton's avatar Chris Manton
Browse files

legacy: Use system/bta/dm/bta_dm_act::calloc 

Bug: 227293046
Tag: #refactor
Test: gd/cert/run

Change-Id: Ie559804a180fe8cf61d32cabfe90b02abd9debba
parent 76e55632

system/bta/dm/bta_dm_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
            &bta_dm_service_search_remname_cback);

      }



      p_msg = (tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_MSG));

      p_msg = (tBTA_DM_MSG*)osi_calloc(sizeof(tBTA_DM_MSG));

      p_msg->hdr.event = BTA_DM_DISCOVERY_RESULT_EVT;

      p_msg->disc_result.result.disc_res.result = BTA_SUCCESS;

      p_msg->disc_result.result.disc_res.num_uuids = uuid_list.size();
@@ -1206,7 +1206,7 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
        // TODO(jpawlowski): make p_uuid_list into vector, and just copy

        // vectors, but first get rid of bta_sys_sendmsg below.

        p_msg->disc_result.result.disc_res.p_uuid_list =

            (Uuid*)osi_malloc(uuid_list.size() * sizeof(Uuid));

            (Uuid*)osi_calloc(uuid_list.size() * sizeof(Uuid));

        memcpy(p_msg->disc_result.result.disc_res.p_uuid_list, uuid_list.data(),

               uuid_list.size() * sizeof(Uuid));

      }
@@ -1262,7 +1262,7 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
      BTM_SecDeleteRmtNameNotifyCallback(&bta_dm_service_search_remname_cback);

    }



    p_msg = (tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_MSG));

    p_msg = (tBTA_DM_MSG*)osi_calloc(sizeof(tBTA_DM_MSG));

    p_msg->hdr.event = BTA_DM_DISCOVERY_RESULT_EVT;

    p_msg->disc_result.result.disc_res.result = BTA_FAILURE;

    p_msg->disc_result.result.disc_res.services =