diff --git a/attrib/gatt.c b/attrib/gatt.c
index 77c96f3..a62f348 100644
--- a/attrib/gatt.c
+++ b/attrib/gatt.c
dp->user_data = user_data;
if (uuid) {
- memcpy(&dp->uuid, uuid, sizeof(bt_uuid_t));
+ dp->uuid = *uuid;
cb = primary_by_uuid_cb;
} else
cb = primary_all_cb;
diff --git a/lib/uuid.c b/lib/uuid.c
index 325016a..a3e2a1a 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
{
switch (src->type) {
case BT_UUID128:
- memcpy(dst, src, sizeof(bt_uuid_t));
+ *dst = *src;
break;
case BT_UUID32:
bt_uuid32_to_uuid128(src, dst);
diff --git a/src/attrib-server.c b/src/attrib-server.c
index 2e99a52..59dddf6 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
a->len = len;
a->data = g_memdup(value, len);
a->handle = handle;
- memcpy(&a->uuid, uuid, sizeof(bt_uuid_t));
+ a->uuid = *uuid;
a->read_reqs = read_reqs;
a->write_reqs = write_reqs;
memcpy(a->data, value, len);
if (uuid != NULL)
- memcpy(&a->uuid, uuid, sizeof(bt_uuid_t));
+ a->uuid = *uuid;
if (attr)
*attr = a;