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

Commit ec294128 authored by Chris Manton's avatar Chris Manton
Browse files

stack::sdp::SDP_GetDiRecord Use proper return type 

Bug: 352845847
Test: m .
Flag: EXEMPT, Proper Return Typing

Change-Id: I95aeb08bc6e92a5f8c5643e03f6c98bb2f7f5d43
parent 1de3b23b

system/stack/include/sdp_api.h

+3 −3
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ struct tSdpApi { 
      Returns          SDP_SUCCESS if record retrieved, else error



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

    [[nodiscard]] uint16_t (*SDP_GetDiRecord)(uint8_t getRecordIndex,

    [[nodiscard]] tSDP_STATUS (*SDP_GetDiRecord)(uint8_t getRecordIndex,

                                                 tSDP_DI_GET_RECORD* device_info,

                                                 const tSDP_DISCOVERY_DB* p_db);

system/stack/sdp/internal/sdp_api.h

+2 −2
Original line number Diff line number Diff line
@@ -420,5 +420,5 @@ uint8_t SDP_GetNumDiRecords(const tSDP_DISCOVERY_DB* p_db); 
 * Returns          SDP_SUCCESS if record retrieved, else error

 *

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

uint16_t SDP_GetDiRecord(uint8_t getRecordIndex, tSDP_DI_GET_RECORD* device_info,

tSDP_STATUS SDP_GetDiRecord(uint8_t getRecordIndex, tSDP_DI_GET_RECORD* device_info,

                            const tSDP_DISCOVERY_DB* p_db);

system/stack/sdp/sdp_api.cc

+3 −3
Original line number Diff line number Diff line
@@ -824,9 +824,9 @@ static void SDP_AttrStringCopy(char* dst, const tSDP_DISC_ATTR* p_attr, uint16_t 
 * Returns          SDP_SUCCESS if record retrieved, else error

 *

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

uint16_t SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,

tSDP_STATUS SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,

                            const tSDP_DISCOVERY_DB* p_db) {

  uint16_t result = SDP_NO_DI_RECORD_FOUND;

  tSDP_STATUS result = SDP_NO_DI_RECORD_FOUND;

  uint8_t curr_record_index = 1;



  tSDP_DISC_REC* p_curr_record = NULL;

system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static const std::vector<std::function<void(FuzzedDataProvider*)>> sdp_operation 
        // ::SDP_GetDiRecord

        [](FuzzedDataProvider* fdp) -> void {

          tSDP_DI_GET_RECORD device_info;  // Output var

          [[maybe_unused]] bool rc = get_legacy_stack_sdp_api()->device_id.SDP_GetDiRecord(

          [[maybe_unused]] tSDP_STATUS rc = get_legacy_stack_sdp_api()->device_id.SDP_GetDiRecord(

                  fdp->ConsumeIntegral<uint8_t>(), &device_info,

                  getArbitraryVectorElement(fdp, sdp_db_vect, true).get());

        },

system/test/mock/mock_stack_sdp_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ tSDP_STATUS SDP_DiDiscover(const RawAddress& remote_device, tSDP_DISCOVERY_DB* p 
  inc_func_call_count(__func__);

  return test::mock::stack_sdp_api::SDP_DiDiscover(remote_device, p_db, len, p_cb);

}

uint16_t SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,

tSDP_STATUS SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,

                            const tSDP_DISCOVERY_DB* p_db) {

  inc_func_call_count(__func__);

  return test::mock::stack_sdp_api::SDP_GetDiRecord(get_record_index, p_device_info, p_db);