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

Commit 0de54db9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "legacy: Const-ify various SDP API params"

parents 3e98d1f4 666e6e6e

system/stack/sdp/sdp_db.cc

+7 −5
Original line number Original line Diff line number Diff line
@@ -37,8 +37,9 @@ 
/******************************************************************************/

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

/*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */

/*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */

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

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

static bool find_uuid_in_seq(uint8_t* p, uint32_t seq_len, uint8_t* p_his_uuid,

static bool find_uuid_in_seq(uint8_t* p, uint32_t seq_len,

                             uint16_t his_len, int nest_level);

                             const uint8_t* p_his_uuid, uint16_t his_len,

                             int nest_level);





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

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

 *

 *
@@ -52,7 +53,7 @@ static bool find_uuid_in_seq(uint8_t* p, uint32_t seq_len, uint8_t* p_his_uuid, 
 *

 *

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

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

const tSDP_RECORD* sdp_db_service_search(const tSDP_RECORD* p_rec,

const tSDP_RECORD* sdp_db_service_search(const tSDP_RECORD* p_rec,

                                         tSDP_UUID_SEQ* p_seq) {

                                         const tSDP_UUID_SEQ* p_seq) {

  uint16_t xx, yy;

  uint16_t xx, yy;

  const tSDP_ATTRIBUTE* p_attr;

  const tSDP_ATTRIBUTE* p_attr;

  tSDP_RECORD* p_end = &sdp_cb.server_db.record[sdp_cb.server_db.num_records];

  tSDP_RECORD* p_end = &sdp_cb.server_db.record[sdp_cb.server_db.num_records];
@@ -103,8 +104,9 @@ const tSDP_RECORD* sdp_db_service_search(const tSDP_RECORD* p_rec, 
 * Returns          true if found, else false

 * Returns          true if found, else false

 *

 *

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

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

static bool find_uuid_in_seq(uint8_t* p, uint32_t seq_len, uint8_t* p_uuid,

static bool find_uuid_in_seq(uint8_t* p, uint32_t seq_len,

                             uint16_t uuid_len, int nest_level) {

                             const uint8_t* p_uuid, uint16_t uuid_len,

                             int nest_level) {

  uint8_t* p_end = p + seq_len;

  uint8_t* p_end = p + seq_len;

  uint8_t type;

  uint8_t type;

  uint32_t len;

  uint32_t len;

system/stack/sdp/sdp_utils.cc

+3 −3
Original line number Original line Diff line number Diff line
@@ -873,8 +873,8 @@ bool sdpu_is_base_uuid(uint8_t* p_uuid) { 
 * Returns          true if matched, else false

 * Returns          true if matched, else false

 *

 *

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

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

bool sdpu_compare_uuid_arrays(uint8_t* p_uuid1, uint32_t len1, uint8_t* p_uuid2,

bool sdpu_compare_uuid_arrays(const uint8_t* p_uuid1, uint32_t len1,

                              uint16_t len2) {

                              const uint8_t* p_uuid2, uint16_t len2) {

  uint8_t nu1[Uuid::kNumBytes128];

  uint8_t nu1[Uuid::kNumBytes128];

  uint8_t nu2[Uuid::kNumBytes128];

  uint8_t nu2[Uuid::kNumBytes128];
@@ -1033,7 +1033,7 @@ uint16_t sdpu_get_list_len(tSDP_UUID_SEQ* uid_seq, tSDP_ATTR_SEQ* attr_seq) { 
 *

 *

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

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

uint16_t sdpu_get_attrib_seq_len(const tSDP_RECORD* p_rec,

uint16_t sdpu_get_attrib_seq_len(const tSDP_RECORD* p_rec,

                                 tSDP_ATTR_SEQ* attr_seq) {

                                 const tSDP_ATTR_SEQ* attr_seq) {

  const tSDP_ATTRIBUTE* p_attr;

  const tSDP_ATTRIBUTE* p_attr;

  uint16_t len1 = 0;

  uint16_t len1 = 0;

  uint16_t xx;

  uint16_t xx;

system/stack/sdp/sdpint.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -216,8 +216,8 @@ extern uint8_t* sdpu_extract_uid_seq(uint8_t* p, uint16_t param_len, 
extern uint8_t* sdpu_get_len_from_type(uint8_t* p, uint8_t* p_end, uint8_t type,

extern uint8_t* sdpu_get_len_from_type(uint8_t* p, uint8_t* p_end, uint8_t type,

                                       uint32_t* p_len);

                                       uint32_t* p_len);

extern bool sdpu_is_base_uuid(uint8_t* p_uuid);

extern bool sdpu_is_base_uuid(uint8_t* p_uuid);

extern bool sdpu_compare_uuid_arrays(uint8_t* p_uuid1, uint32_t len1,

extern bool sdpu_compare_uuid_arrays(const uint8_t* p_uuid1, uint32_t len1,

                                     uint8_t* p_uuid2, uint16_t len2);

                                     const uint8_t* p_uuid2, uint16_t len2);

extern bool sdpu_compare_uuid_with_attr(const bluetooth::Uuid& uuid,

extern bool sdpu_compare_uuid_with_attr(const bluetooth::Uuid& uuid,

                                        tSDP_DISC_ATTR* p_attr);

                                        tSDP_DISC_ATTR* p_attr);
@@ -225,7 +225,7 @@ extern void sdpu_sort_attr_list(uint16_t num_attr, tSDP_DISCOVERY_DB* p_db); 
extern uint16_t sdpu_get_list_len(tSDP_UUID_SEQ* uid_seq,

extern uint16_t sdpu_get_list_len(tSDP_UUID_SEQ* uid_seq,

                                  tSDP_ATTR_SEQ* attr_seq);

                                  tSDP_ATTR_SEQ* attr_seq);

extern uint16_t sdpu_get_attrib_seq_len(const tSDP_RECORD* p_rec,

extern uint16_t sdpu_get_attrib_seq_len(const tSDP_RECORD* p_rec,

                                        tSDP_ATTR_SEQ* attr_seq);

                                        const tSDP_ATTR_SEQ* attr_seq);

extern uint16_t sdpu_get_attrib_entry_len(const tSDP_ATTRIBUTE* p_attr);

extern uint16_t sdpu_get_attrib_entry_len(const tSDP_ATTRIBUTE* p_attr);

extern uint8_t* sdpu_build_partial_attrib_entry(uint8_t* p_out,

extern uint8_t* sdpu_build_partial_attrib_entry(uint8_t* p_out,

                                                const tSDP_ATTRIBUTE* p_attr,

                                                const tSDP_ATTRIBUTE* p_attr,
@@ -236,7 +236,7 @@ extern uint16_t sdpu_is_avrcp_profile_description_list( 
/* Functions provided by sdp_db.cc

/* Functions provided by sdp_db.cc

 */

 */

extern const tSDP_RECORD* sdp_db_service_search(const tSDP_RECORD* p_rec,

extern const tSDP_RECORD* sdp_db_service_search(const tSDP_RECORD* p_rec,

                                                tSDP_UUID_SEQ* p_seq);

                                                const tSDP_UUID_SEQ* p_seq);

extern tSDP_RECORD* sdp_db_find_record(uint32_t handle);

extern tSDP_RECORD* sdp_db_find_record(uint32_t handle);

extern const tSDP_ATTRIBUTE* sdp_db_find_attr_in_rec(const tSDP_RECORD* p_rec,

extern const tSDP_ATTRIBUTE* sdp_db_find_attr_in_rec(const tSDP_RECORD* p_rec,

                                                     uint16_t start_attr,

                                                     uint16_t start_attr,