From 0fa092411aafeaf6d5489a4a751e4bcf27a726f7 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Mon, 1 Nov 2021 17:02:43 -0700
Subject: [PATCH] legacy: Const-ify inquiry results APIs
Bug: 187830698
Tag: #refactor
Test: gd/cert/run
Change-Id: Iaa604d15509b0881efb2e779ebab1d481278a91c
---
system/bta/include/bta_api.h | 2 +-
system/main/shim/btm_api.cc | 2 +-
system/stack/btm/btm_inq.cc | 10 +++++-----
system/stack/include/inq_hci_link_interface.h | 4 ++--
system/test/mock/mock_stack_btm_inq.cc | 6 +++---
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index 8ac26359c64..a4d0cb5aaba 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -421,7 +421,7 @@ typedef struct {
* request */
bool is_limited; /* true, if the limited inquiry bit is set in the CoD */
int8_t rssi; /* The rssi value */
- uint8_t* p_eir; /* received EIR */
+ const uint8_t* p_eir; /* received EIR */
uint16_t eir_len; /* received EIR length */
uint8_t inq_result_type;
tBLE_ADDR_TYPE ble_addr_type;
diff --git a/system/main/shim/btm_api.cc b/system/main/shim/btm_api.cc
index d26dd6c18f1..f4b1e28c89c 100644
--- a/system/main/shim/btm_api.cc
+++ b/system/main/shim/btm_api.cc
@@ -69,7 +69,7 @@ extern tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda);
extern void btm_acl_update_inquiry_status(uint8_t status);
extern void btm_clear_all_pending_le_entry(void);
extern void btm_clr_inq_result_flt(void);
-extern void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
+extern void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
extern void btm_sort_inq_result(void);
extern void btm_process_inq_complete(uint8_t status, uint8_t result_type);
diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc
index 52e7c6a13a2..24b63819928 100644
--- a/system/stack/btm/btm_inq.cc
+++ b/system/stack/btm/btm_inq.cc
@@ -148,7 +148,7 @@ static tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda,
tBTM_CMPL_CB* p_cb);
static uint8_t btm_convert_uuid_to_eir_service(uint16_t uuid16);
-void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
+void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
static const uint8_t* btm_eir_get_uuid_list(const uint8_t* p_eir,
size_t eir_len, uint8_t uuid_size,
uint8_t* p_num_uuid,
@@ -1037,7 +1037,7 @@ tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda) {
* Returns void
*
******************************************************************************/
-void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len,
+void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,
uint8_t inq_res_mode) {
uint8_t num_resp, xx;
RawAddress bda;
@@ -1054,7 +1054,7 @@ void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len,
uint8_t rssi = 0;
DEV_CLASS dc;
uint16_t clock_offset;
- uint8_t* p_eir_data = NULL;
+ const uint8_t* p_eir_data = NULL;
#if (BTM_INQ_DEBUG == TRUE)
BTM_TRACE_DEBUG("btm_process_inq_results inq_active:0x%x state:%d",
@@ -1401,7 +1401,7 @@ tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda, uint8_t origin,
* Returns void
*
******************************************************************************/
-void btm_process_remote_name(const RawAddress* bda, BD_NAME bdn,
+void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn,
uint16_t evt_len, uint8_t hci_status) {
tBTM_REMOTE_DEV_NAME rem_name;
tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;
@@ -1861,7 +1861,7 @@ static uint16_t btm_convert_uuid_to_uuid16(const uint8_t* p_uuid,
* Returns None
*
******************************************************************************/
-void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results) {
+void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results) {
const uint8_t* p_uuid_data;
uint8_t num_uuid;
uint16_t uuid16;
diff --git a/system/stack/include/inq_hci_link_interface.h b/system/stack/include/inq_hci_link_interface.h
index 2d7fd08a9ec..6ceaae6be2a 100644
--- a/system/stack/include/inq_hci_link_interface.h
+++ b/system/stack/include/inq_hci_link_interface.h
@@ -23,10 +23,10 @@
#include "types/raw_address.h"
-extern void btm_process_remote_name(const RawAddress* bda, BD_NAME name,
+extern void btm_process_remote_name(const RawAddress* bda, const BD_NAME name,
uint16_t evt_len, uint8_t hci_status);
-extern void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len,
+extern void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,
uint8_t inq_res_mode);
extern void btm_process_inq_complete(uint8_t status, uint8_t mode);
diff --git a/system/test/mock/mock_stack_btm_inq.cc b/system/test/mock/mock_stack_btm_inq.cc
index ef8d092583a..977a156b41c 100644
--- a/system/test/mock/mock_stack_btm_inq.cc
+++ b/system/test/mock/mock_stack_btm_inq.cc
@@ -173,15 +173,15 @@ void btm_process_cancel_complete(uint8_t status, uint8_t mode) {
void btm_process_inq_complete(uint8_t status, uint8_t mode) {
mock_function_count_map[__func__]++;
}
-void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len,
+void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,
uint8_t inq_res_mode) {
mock_function_count_map[__func__]++;
}
-void btm_process_remote_name(const RawAddress* bda, BD_NAME bdn,
+void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn,
uint16_t evt_len, uint8_t hci_status) {
mock_function_count_map[__func__]++;
}
-void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results) {
+void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results) {
mock_function_count_map[__func__]++;
}
void btm_sort_inq_result(void) { mock_function_count_map[__func__]++; }
--
GitLab