Replace libuuid with internal implementation

[babeltrace.git] / src / ctf-writer / clock.c

diff --git a/src/ctf-writer/clock.c b/src/ctf-writer/clock.c
index 58d86d1ce1cf7ca3fa4d0192e58210f498daca02..e1c00dacce50d3a035ab285caeea321c9831ea17 100644 (file)
--- a/src/ctf-writer/clock.c
+++ b/src/ctf-writer/clock.c
@@ -31,7 +31,7 @@
 #include "logging.h"
 
 #include "common/assert.h"
-#include "compat/uuid.h"
+#include "common/uuid.h"
 #include "compat/compiler.h"
 #include <babeltrace2/ctf-writer/utils.h>
 #include <babeltrace2/ctf-writer/object.h>
@@ -49,7 +49,7 @@ struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
 {
        int ret;
        struct bt_ctf_clock *clock = NULL;
-       unsigned char cc_uuid[BABELTRACE_UUID_LEN];
+       bt_uuid_t cc_uuid;
 
        BT_CTF_ASSERT_PRE_NON_NULL(name, "Name");
        clock = g_new0(struct bt_ctf_clock, 1);
@@ -67,10 +67,7 @@ struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
        }
 
        /* Automatically set clock class's UUID. */
-       ret = bt_uuid_generate(cc_uuid);
-       if (ret) {
-               goto error;
-       }
+       bt_uuid_generate(cc_uuid);
 
        ret = bt_ctf_clock_class_set_uuid(clock->clock_class, cc_uuid);
        BT_ASSERT(ret == 0);
@@ -167,13 +164,13 @@ int bt_ctf_clock_set_is_absolute(struct bt_ctf_clock *clock, int is_absolute)
                is_absolute);
 }
 
-const unsigned char *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock)
+const uint8_t *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock)
 {
        BT_CTF_ASSERT_PRE_NON_NULL(clock, "CTF writer clock");
        return bt_ctf_clock_class_get_uuid(clock->clock_class);
 }
 
-int bt_ctf_clock_set_uuid(struct bt_ctf_clock *clock, const unsigned char *uuid)
+int bt_ctf_clock_set_uuid(struct bt_ctf_clock *clock, const uint8_t *uuid)
 {
        BT_CTF_ASSERT_PRE_NON_NULL(clock, "CTF writer clock");
        return bt_ctf_clock_class_set_uuid(clock->clock_class, uuid);
@@ -226,7 +223,7 @@ BT_HIDDEN
 void bt_ctf_clock_class_serialize(struct bt_ctf_clock_class *clock_class,
                struct metadata_context *context)
 {
-       unsigned char *uuid;
+       uint8_t *uuid;
 
        BT_LOGD("Serializing clock class's metadata: clock-class-addr=%p, "
                "name=\"%s\", metadata-context-addr=%p", clock_class,
@@ -249,11 +246,8 @@ void bt_ctf_clock_class_serialize(struct bt_ctf_clock_class *clock_class,
 
        if (clock_class->uuid_set) {
                g_string_append_printf(context->string,
-                       "\tuuid = \"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\";\n",
-                       uuid[0], uuid[1], uuid[2], uuid[3],
-                       uuid[4], uuid[5], uuid[6], uuid[7],
-                       uuid[8], uuid[9], uuid[10], uuid[11],
-                       uuid[12], uuid[13], uuid[14], uuid[15]);
+                       "\tuuid = \"" BT_UUID_FMT "\";\n",
+                       BT_UUID_FMT_VALUES(uuid));
        }
 
        if (clock_class->description) {