diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-01-21 14:46:47 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-01-21 14:46:47 +0200 |
| commit | 37ba9e25fb8ed1327a305617040f993ad453b6a9 (patch) | |
| tree | bd40b392a290167e47476eab03374a7e9b08aae4 /src/uuid-helper.c | |
| parent | d878aac68ea38bbfdacb9a61aa371e09b9971cc2 (diff) | |
| download | bluez-37ba9e25fb8ed1327a305617040f993ad453b6a9.tar.gz | |
core: Don't use GLib allocators for bt_uuid2string and bt_name2string
Diffstat (limited to 'src/uuid-helper.c')
| -rw-r--r-- | src/uuid-helper.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/uuid-helper.c b/src/uuid-helper.c index 1995ea1a6..3cca02446 100644 --- a/src/uuid-helper.c +++ b/src/uuid-helper.c @@ -72,6 +72,7 @@ char *bt_uuid2string(uuid_t *uuid) unsigned short data3; unsigned int data4; unsigned short data5; + int err; if (!uuid) return NULL; @@ -98,14 +99,12 @@ char *bt_uuid2string(uuid_t *uuid) memcpy(&data4, &uuid128.value.uuid128.data[10], 4); memcpy(&data5, &uuid128.value.uuid128.data[14], 2); - str = g_try_malloc0(MAX_LEN_UUID_STR); - if (!str) - return NULL; - - sprintf(str, "%.8x-%.4x-%.4x-%.4x-%.8x%.4x", + err = asprintf(&str, "%.8x-%.4x-%.4x-%.4x-%.8x%.4x", g_ntohl(data0), g_ntohs(data1), g_ntohs(data2), g_ntohs(data3), g_ntohl(data4), g_ntohs(data5)); + if (err < 0) + return NULL; return str; } @@ -187,7 +186,7 @@ char *bt_name2string(const char *pattern) /* UUID 128 string format */ if (is_uuid128(pattern)) - return g_strdup(pattern); + return strdup(pattern); /* Friendly service name format */ uuid16 = name2class(pattern); |