summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-04-28 10:40:48 +0200
committerMarcel Holtmann <marcel@holtmann.org>2010-04-28 10:40:48 +0200
commitbd3ebad37bedd9082f4123751c304ed97a7866fd (patch)
tree473ad3d06052472530ef6797fe0b8b047cbb6c10
parentd108edd5cd7115ced6fc3c1a9bc2b975abdfc4e2 (diff)
downloadbluez-bd3ebad37bedd9082f4123751c304ed97a7866fd.tar.gz
Make some UUID parameters const
-rw-r--r--lib/sdp.c10
-rw-r--r--lib/sdp_lib.h6
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/sdp.c b/lib/sdp.c
index bc324eead..5f1f2fc20 100644
--- a/lib/sdp.c
+++ b/lib/sdp.c
@@ -2614,8 +2614,8 @@ uuid_t *sdp_uuid128_create(uuid_t *u, const void *val)
*/
int sdp_uuid_cmp(const void *p1, const void *p2)
{
- uuid_t *u1 = sdp_uuid_to_uuid128((uuid_t *) p1);
- uuid_t *u2 = sdp_uuid_to_uuid128((uuid_t *) p2);
+ uuid_t *u1 = sdp_uuid_to_uuid128(p1);
+ uuid_t *u2 = sdp_uuid_to_uuid128(p2);
int ret;
ret = sdp_uuid128_cmp(u1, u2);
@@ -2653,7 +2653,7 @@ int sdp_uuid128_cmp(const void *p1, const void *p2)
* yet to be implemented. Note that the input is in NBO in
* both 32 and 128 bit UUIDs and conversion is needed
*/
-void sdp_uuid16_to_uuid128(uuid_t *uuid128, uuid_t *uuid16)
+void sdp_uuid16_to_uuid128(uuid_t *uuid128, const uuid_t *uuid16)
{
/*
* We have a 16 bit value, which needs to be added to
@@ -2675,7 +2675,7 @@ void sdp_uuid16_to_uuid128(uuid_t *uuid128, uuid_t *uuid16)
memcpy(&uuid128->value.uuid128.data[2], &data1, 2);
}
-void sdp_uuid32_to_uuid128(uuid_t *uuid128, uuid_t *uuid32)
+void sdp_uuid32_to_uuid128(uuid_t *uuid128, const uuid_t *uuid32)
{
/*
* We have a 32 bit value, which needs to be added to
@@ -2697,7 +2697,7 @@ void sdp_uuid32_to_uuid128(uuid_t *uuid128, uuid_t *uuid32)
memcpy(&uuid128->value.uuid128.data[0], &data0, 4);
}
-uuid_t *sdp_uuid_to_uuid128(uuid_t *uuid)
+uuid_t *sdp_uuid_to_uuid128(const uuid_t *uuid)
{
uuid_t *uuid128 = bt_malloc(sizeof(uuid_t));
diff --git a/lib/sdp_lib.h b/lib/sdp_lib.h
index 327f59249..cef31319a 100644
--- a/lib/sdp_lib.h
+++ b/lib/sdp_lib.h
@@ -474,9 +474,9 @@ uuid_t *sdp_uuid128_create(uuid_t *uuid, const void *data);
int sdp_uuid16_cmp(const void *p1, const void *p2);
int sdp_uuid128_cmp(const void *p1, const void *p2);
int sdp_uuid_cmp(const void *p1, const void *p2);
-uuid_t *sdp_uuid_to_uuid128(uuid_t *uuid);
-void sdp_uuid16_to_uuid128(uuid_t *uuid128, uuid_t *uuid16);
-void sdp_uuid32_to_uuid128(uuid_t *uuid128, uuid_t *uuid32);
+uuid_t *sdp_uuid_to_uuid128(const uuid_t *uuid);
+void sdp_uuid16_to_uuid128(uuid_t *uuid128, const uuid_t *uuid16);
+void sdp_uuid32_to_uuid128(uuid_t *uuid128, const uuid_t *uuid32);
int sdp_uuid128_to_uuid(uuid_t *uuid);
int sdp_uuid_to_proto(uuid_t *uuid);
int sdp_uuid_extract(const uint8_t *buffer, int bufsize, uuid_t *uuid, int *scanned);