Rename legacy uuid_copy to not conflict

diff --git a/bta/jv/bta_jv_act.c b/bta/jv/bta_jv_act.c
index 8981e75..224450a 100644 (file)
--- a/bta/jv/bta_jv_act.c
+++ b/bta/jv/bta_jv_act.c
@@ -44,11 +44,11 @@
 #include "gap_api.h"
 
 
-extern void uuid_to_string(bt_uuid_t *p_uuid, char *str);
+extern void uuid_to_string_legacy(bt_uuid_t *p_uuid, char *str);
 static inline void logu(const char* title, const uint8_t * p_uuid)
 {
     char uuids[128];
-    uuid_to_string((bt_uuid_t*)p_uuid, uuids);
+    uuid_to_string_legacy((bt_uuid_t*)p_uuid, uuids);
     APPL_TRACE_DEBUG("%s: %s", title, uuids);
 }
 

diff --git a/btif/include/btif_util.h b/btif/include/btif_util.h
index 6699463..2315523 100644 (file)
--- a/btif/include/btif_util.h
+++ b/btif/include/btif_util.h
@@ -68,7 +68,7 @@ UINT32 devclass2uint(DEV_CLASS dev_class);
 void uint2devclass(UINT32 dev, DEV_CLASS dev_class);
 void uuid16_to_uuid128(uint16_t uuid16, bt_uuid_t* uuid128);
 
-void uuid_to_string(bt_uuid_t *p_uuid, char *str);
+void uuid_to_string_legacy(bt_uuid_t *p_uuid, char *str);
 void string_to_uuid(char *str, bt_uuid_t *p_uuid);
 int ascii_2_hex (char *p_ascii, int len, UINT8 *p_hex);
 

diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index 3f96b0a..8ecb1d3 100644 (file)
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -1406,7 +1406,7 @@ static void btif_dm_search_services_evt(UINT16 event, char *p_param)
                  for (i=0; i < p_data->disc_res.num_uuids; i++)
                  {
                       char temp[256];
-                      uuid_to_string((bt_uuid_t*)(p_data->disc_res.p_uuid_list + (i*MAX_UUID_SIZE)), temp);
+                      uuid_to_string_legacy((bt_uuid_t*)(p_data->disc_res.p_uuid_list + (i*MAX_UUID_SIZE)), temp);
                       BTIF_TRACE_ERROR("Index: %d uuid:%s", i, temp);
                  }
             }
@@ -1466,7 +1466,7 @@ static void btif_dm_search_services_evt(UINT16 event, char *p_param)
                     j--;
                 }
 
-                uuid_to_string(&uuid, temp);
+                uuid_to_string_legacy(&uuid, temp);
                 BTIF_TRACE_ERROR(" uuid:%s", temp);
 
                 bdcpy(bd_addr.address, p_data->disc_ble_res.bd_addr);

diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
index f770df9..9a3bb55 100644 (file)
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -275,7 +275,7 @@ static int prop2cfg(bt_bdaddr_t *remote_bd_addr, bt_property_t *prop)
             {
                 bt_uuid_t *p_uuid = (bt_uuid_t*)prop->val + i;
                 memset(buf, 0, sizeof(buf));
-                uuid_to_string(p_uuid, buf);
+                uuid_to_string_legacy(p_uuid, buf);
                 strcat(value, buf);
                 //strcat(value, ";");
                 strcat(value, " ");

diff --git a/btif/src/btif_util.c b/btif/src/btif_util.c
index 0ecdfe6..2abfb13 100644 (file)
--- a/btif/src/btif_util.c
+++ b/btif/src/btif_util.c
@@ -137,7 +137,7 @@ void string_to_uuid(char *str, bt_uuid_t *p_uuid)
 
 }
 
-void uuid_to_string(bt_uuid_t *p_uuid, char *str)
+void uuid_to_string_legacy(bt_uuid_t *p_uuid, char *str)
 {
     uint32_t uuid0, uuid4;
     uint16_t uuid1, uuid2, uuid3, uuid5;