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

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

stack::sdp Enforce API checks with nodiscard 

Bug: 339311914
Test: m .
Flag: EXEMPT, Compile Time Check

Change-Id: Iec9373a543b9053c4990d64d8a60063dff183fb4
parent ab89d1f4

system/stack/include/sdp_api.h

+66 −58
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ struct tSdpApi { 
      Returns          true if successful, false if one or more parameters are

                       bad

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

    bool (*SDP_InitDiscoveryDb)(tSDP_DISCOVERY_DB*, uint32_t, uint16_t,

                                const bluetooth::Uuid*, uint16_t,

                                const uint16_t*);

    [[nodiscard]] bool (*SDP_InitDiscoveryDb)(tSDP_DISCOVERY_DB*, uint32_t,

                                              uint16_t, const bluetooth::Uuid*,

                                              uint16_t, const uint16_t*);



    /*******************************************************************************
@@ -74,7 +74,7 @@ struct tSdpApi { 
                       activity is not found.



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

    bool (*SDP_CancelServiceSearch)(const tSDP_DISCOVERY_DB*);

    [[nodiscard]] bool (*SDP_CancelServiceSearch)(const tSDP_DISCOVERY_DB*);



    /*******************************************************************************
@@ -89,7 +89,8 @@ struct tSdpApi { 
      Returns          true if discovery started, false if failed.



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

    bool (*SDP_ServiceSearchRequest)(const RawAddress&, tSDP_DISCOVERY_DB*,

    [[nodiscard]] bool (*SDP_ServiceSearchRequest)(const RawAddress&,

                                                   tSDP_DISCOVERY_DB*,

                                                   tSDP_DISC_CMPL_CB*);



    /*******************************************************************************
@@ -110,7 +111,7 @@ struct tSdpApi { 
      Returns          true if discovery started, false if failed.



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

    bool (*SDP_ServiceSearchAttributeRequest)(const RawAddress&,

    [[nodiscard]] bool (*SDP_ServiceSearchAttributeRequest)(const RawAddress&,

                                                            tSDP_DISCOVERY_DB*,

                                                            tSDP_DISC_CMPL_CB*);
@@ -134,9 +135,8 @@ struct tSdpApi { 
      Returns          true if discovery started, false if failed.



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

    bool (*SDP_ServiceSearchAttributeRequest2)(const RawAddress&,

                                               tSDP_DISCOVERY_DB*,

                                               tSDP_DISC_CMPL_CB2*,

    [[nodiscard]] bool (*SDP_ServiceSearchAttributeRequest2)(

        const RawAddress&, tSDP_DISCOVERY_DB*, tSDP_DISC_CMPL_CB2*,

        const void*);

  } service;
@@ -158,8 +158,8 @@ struct tSdpApi { 
      Returns          Pointer to record containing service class, or NULL



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

    tSDP_DISC_REC* (*SDP_FindServiceInDb)(const tSDP_DISCOVERY_DB*, uint16_t,

                                          tSDP_DISC_REC*);

    [[nodiscard]] tSDP_DISC_REC* (*SDP_FindServiceInDb)(

        const tSDP_DISCOVERY_DB*, uint16_t, tSDP_DISC_REC*);



    /*******************************************************************************
@@ -182,9 +182,8 @@ struct tSdpApi { 
      Returns          Pointer to record containing service class, or NULL



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

    tSDP_DISC_REC* (*SDP_FindServiceUUIDInDb)(const tSDP_DISCOVERY_DB*,

                                              const bluetooth::Uuid&,

                                              tSDP_DISC_REC*);

    [[nodiscard]] tSDP_DISC_REC* (*SDP_FindServiceUUIDInDb)(

        const tSDP_DISCOVERY_DB*, const bluetooth::Uuid&, tSDP_DISC_REC*);



    /*******************************************************************************
@@ -202,8 +201,8 @@ struct tSdpApi { 
      Returns          Pointer to record containing service class, or NULL



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

    tSDP_DISC_REC* (*SDP_FindServiceInDb_128bit)(const tSDP_DISCOVERY_DB*,

                                                 tSDP_DISC_REC*);

    [[nodiscard]] tSDP_DISC_REC* (*SDP_FindServiceInDb_128bit)(

        const tSDP_DISCOVERY_DB*, tSDP_DISC_REC*);

  } db;



  struct {
@@ -222,7 +221,8 @@ struct tSdpApi { 
      Returns          Pointer to matching attribute entry, or NULL



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

    tSDP_DISC_ATTR* (*SDP_FindAttributeInRec)(const tSDP_DISC_REC*, uint16_t);

    [[nodiscard]] tSDP_DISC_ATTR* (*SDP_FindAttributeInRec)(

        const tSDP_DISC_REC*, uint16_t);



    /*******************************************************************************
@@ -237,7 +237,7 @@ struct tSdpApi { 
      Returns          true if found, otherwise false.



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

    bool (*SDP_FindServiceUUIDInRec_128bit)(const tSDP_DISC_REC*,

    [[nodiscard]] bool (*SDP_FindServiceUUIDInRec_128bit)(const tSDP_DISC_REC*,

                                                          bluetooth::Uuid*);



    /*******************************************************************************
@@ -255,7 +255,8 @@ struct tSdpApi { 
                       If found, the passed protocol list element is filled in.



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

    bool (*SDP_FindProtocolListElemInRec)(const tSDP_DISC_REC*, uint16_t,

    [[nodiscard]] bool (*SDP_FindProtocolListElemInRec)(const tSDP_DISC_REC*,

                                                        uint16_t,

                                                        tSDP_PROTOCOL_ELEM*);



    /*******************************************************************************
@@ -274,8 +275,8 @@ struct tSdpApi { 
      Returns          true if found, false if not



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

    bool (*SDP_FindProfileVersionInRec)(const tSDP_DISC_REC*, uint16_t,

                                        uint16_t*);

    [[nodiscard]] bool (*SDP_FindProfileVersionInRec)(const tSDP_DISC_REC*,

                                                      uint16_t, uint16_t*);



    /*******************************************************************************
@@ -290,7 +291,7 @@ struct tSdpApi { 
      Returns          true if found, otherwise false.



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

    bool (*SDP_FindServiceUUIDInRec)(const tSDP_DISC_REC* p_rec,

    [[nodiscard]] bool (*SDP_FindServiceUUIDInRec)(const tSDP_DISC_REC* p_rec,

                                                   bluetooth::Uuid* p_uuid);

  } record;
@@ -310,7 +311,7 @@ struct tSdpApi { 
      Returns          Record handle if OK, else 0.



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

    uint32_t (*SDP_CreateRecord)(void);

    [[nodiscard]] uint32_t (*SDP_CreateRecord)(void);



    /*******************************************************************************
@@ -326,7 +327,7 @@ struct tSdpApi { 
      Returns          true if succeeded, else false



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

    bool (*SDP_DeleteRecord)(uint32_t);

    [[nodiscard]] bool (*SDP_DeleteRecord)(uint32_t);



    /*******************************************************************************
@@ -348,7 +349,7 @@ struct tSdpApi { 
      Returns          true if added OK, else false



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

    bool (*SDP_AddAttribute)(uint32_t handle, uint16_t attr_id,

    [[nodiscard]] bool (*SDP_AddAttribute)(uint32_t handle, uint16_t attr_id,

                                           uint8_t attr_type, uint32_t attr_len,

                                           uint8_t* p_val);
@@ -373,9 +374,9 @@ struct tSdpApi { 
      Returns          true if added OK, else false



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

    bool (*SDP_AddSequence)(uint32_t handle, uint16_t attr_id,

                            uint16_t num_elem, uint8_t type[], uint8_t len[],

                            uint8_t* p_val[]);

    [[nodiscard]] bool (*SDP_AddSequence)(uint32_t handle, uint16_t attr_id,

                                          uint16_t num_elem, uint8_t type[],

                                          uint8_t len[], uint8_t* p_val[]);



    /*******************************************************************************
@@ -394,8 +395,9 @@ struct tSdpApi { 
      Returns          true if added OK, else false



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

    bool (*SDP_AddUuidSequence)(uint32_t handle, uint16_t attr_id,

                                uint16_t num_uuids, uint16_t* p_uuids);

    [[nodiscard]] bool (*SDP_AddUuidSequence)(uint32_t handle, uint16_t attr_id,

                                              uint16_t num_uuids,

                                              uint16_t* p_uuids);



    /*******************************************************************************
@@ -413,7 +415,8 @@ struct tSdpApi { 
      Returns          true if added OK, else false



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

    bool (*SDP_AddProtocolList)(uint32_t handle, uint16_t num_elem,

    [[nodiscard]] bool (*SDP_AddProtocolList)(uint32_t handle,

                                              uint16_t num_elem,

                                              tSDP_PROTOCOL_ELEM* p_elem_list);



    /*******************************************************************************
@@ -432,8 +435,8 @@ struct tSdpApi { 
      Returns          true if added OK, else false



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

    bool (*SDP_AddAdditionProtoLists)(uint32_t handle, uint16_t num_elem,

                                      tSDP_PROTO_LIST_ELEM* p_proto_list);

    [[nodiscard]] bool (*SDP_AddAdditionProtoLists)(

        uint32_t handle, uint16_t num_elem, tSDP_PROTO_LIST_ELEM* p_proto_list);



    /*******************************************************************************
@@ -451,7 +454,8 @@ struct tSdpApi { 
      Returns          true if added OK, else false



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

    bool (*SDP_AddProfileDescriptorList)(uint32_t handle, uint16_t profile_uuid,

    [[nodiscard]] bool (*SDP_AddProfileDescriptorList)(uint32_t handle,

                                                       uint16_t profile_uuid,

                                                       uint16_t version);



    /*******************************************************************************
@@ -471,8 +475,10 @@ struct tSdpApi { 
      Returns          true if added OK, else false



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

    bool (*SDP_AddLanguageBaseAttrIDList)(uint32_t handle, uint16_t lang,

                                          uint16_t char_enc, uint16_t base_id);

    [[nodiscard]] bool (*SDP_AddLanguageBaseAttrIDList)(uint32_t handle,

                                                        uint16_t lang,

                                                        uint16_t char_enc,

                                                        uint16_t base_id);



    /*******************************************************************************
@@ -490,7 +496,8 @@ struct tSdpApi { 
      Returns          true if added OK, else false



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

    bool (*SDP_AddServiceClassIdList)(uint32_t handle, uint16_t num_services,

    [[nodiscard]] bool (*SDP_AddServiceClassIdList)(uint32_t handle,

                                                    uint16_t num_services,

                                                    uint16_t* p_service_uuids);

  } handle;
@@ -511,8 +518,8 @@ struct tSdpApi { 
                       error



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

    uint16_t (*SDP_SetLocalDiRecord)(const tSDP_DI_RECORD* device_info,

                                     uint32_t* p_handle);

    [[nodiscard]] uint16_t (*SDP_SetLocalDiRecord)(

        const tSDP_DI_RECORD* device_info, uint32_t* p_handle);



    /*******************************************************************************
@@ -531,8 +538,9 @@ struct tSdpApi { 
      Returns          SDP_SUCCESS if query started successfully, else error



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

    tSDP_STATUS (*SDP_DiDiscover)(const RawAddress& remote_device,

                                  tSDP_DISCOVERY_DB* p_db, uint32_t len,

    [[nodiscard]] tSDP_STATUS (*SDP_DiDiscover)(const RawAddress& remote_device,

                                                tSDP_DISCOVERY_DB* p_db,

                                                uint32_t len,

                                                tSDP_DISC_CMPL_CB* p_cb);



    /*******************************************************************************
@@ -548,7 +556,7 @@ struct tSdpApi { 
      Returns          number of DI records found



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

    uint8_t (*SDP_GetNumDiRecords)(const tSDP_DISCOVERY_DB* p_db);

    [[nodiscard]] uint8_t (*SDP_GetNumDiRecords)(const tSDP_DISCOVERY_DB* p_db);



    /*******************************************************************************
@@ -566,7 +574,7 @@ struct tSdpApi { 
      Returns          SDP_SUCCESS if record retrieved, else error



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

    uint16_t (*SDP_GetDiRecord)(uint8_t getRecordIndex,

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

                                              tSDP_DI_GET_RECORD* device_info,

                                              const tSDP_DISCOVERY_DB* p_db);