Remove useless typedefs

Toward meaningful code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I5d96ba04a4dea271488fc59b53558c775a315452

diff --git a/bta/dm/bta_dm_api.cc b/bta/dm/bta_dm_api.cc
index 8e86c76..2611ebf 100644 (file)
--- a/bta/dm/bta_dm_api.cc
+++ b/bta/dm/bta_dm_api.cc
@@ -359,7 +359,7 @@ bool BTA_DmGetConnectionState(const RawAddress& bd_addr) {
  * Returns          BTA_SUCCESS if record set sucessfully, otherwise error code.
  *
  ******************************************************************************/
-tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info,
+tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info,
                                    uint32_t* p_handle) {
   tBTA_STATUS status = BTA_FAILURE;
 

diff --git a/bta/include/bta_api.h b/bta/include/bta_api.h
index afad7ce..3007479 100644 (file)
--- a/bta/include/bta_api.h
+++ b/bta/include/bta_api.h
@@ -627,12 +627,6 @@ enum {
 
 /* Device Identification (DI) data structure
 */
-/* Used to set the DI record */
-typedef tSDP_DI_RECORD tBTA_DI_RECORD;
-/* Used to get the DI record */
-typedef tSDP_DI_GET_RECORD tBTA_DI_GET_RECORD;
-/* SDP discovery database */
-typedef tSDP_DISCOVERY_DB tBTA_DISCOVERY_DB;
 
 #ifndef BTA_DI_NUM_MAX
 #define BTA_DI_NUM_MAX 3
@@ -910,7 +904,7 @@ extern bool BTA_DmGetConnectionState(const RawAddress& bd_addr);
  * Returns          BTA_SUCCESS if record set sucessfully, otherwise error code.
  *
  ******************************************************************************/
-extern tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info,
+extern tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info,
                                           uint32_t* p_handle);
 
 /*******************************************************************************

diff --git a/main/bte_conf.cc b/main/bte_conf.cc
index 6353266..4634cce 100644 (file)
--- a/main/bte_conf.cc
+++ b/main/bte_conf.cc
@@ -48,7 +48,7 @@ void bte_load_did_conf(const char* p_path) {
       break;
     }
 
-    tBTA_DI_RECORD record;
+    tSDP_DI_RECORD record;
     record.vendor =
         config_get_int(*config, section_name, "vendorId", LMP_COMPID_GOOGLE);
     record.vendor_id_source = config_get_int(

diff --git a/test/mock/mock_bta_dm_api.cc b/test/mock/mock_bta_dm_api.cc
index 70e5a90..5c8b07d 100644 (file)
--- a/test/mock/mock_bta_dm_api.cc
+++ b/test/mock/mock_bta_dm_api.cc
@@ -48,7 +48,7 @@ tBTA_STATUS BTA_DmRemoveDevice(const RawAddress& bd_addr) {
   mock_function_count_map[__func__]++;
   return BTA_SUCCESS;
 }
-tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info,
+tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info,
                                    uint32_t* p_handle) {
   mock_function_count_map[__func__]++;
   return BTA_SUCCESS;