Use uuid_to_str() when formatting metadata

[lttng-tools.git] / src / bin / lttng-sessiond / ust-metadata.c

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index 49edb1711254bf9475ddc74f9432aec0e0a38312..a657f7c5d3d26b62472e66ecef3f188e987ee121 100644 (file)
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 #include <common/common.h>
+#include <common/time.h>
 
 #include "ust-registry.h"
 #include "ust-clock.h"
@@ -37,7 +38,6 @@
 #define max_t(type, a, b)      ((type) ((a) > (b) ? (a) : (b)))
 #endif
 
-#define NSEC_PER_SEC                   1000000000ULL
 #define NR_CLOCK_OFFSET_SAMPLES                10
 
 struct offset_sample {
@@ -74,7 +74,6 @@ int fls(unsigned int x)
                r -= 2;
        }
        if (!(x & 0x80000000U)) {
-               x <<= 1;
                r -= 1;
        }
        return r;
@@ -404,6 +403,9 @@ int _lttng_variant_statedump(struct ust_registry_session *session,
        }
        sanitize_ctf_identifier(identifier, variant->name);
        ret = print_tabs(session, nesting);
+       if (ret) {
+               goto end;
+       }
        ret = lttng_metadata_printf(session,
                        "} _%s;\n",
                        identifier);
@@ -875,7 +877,6 @@ int ust_metadata_session_statedump(struct ust_registry_session *session,
                uint32_t major,
                uint32_t minor)
 {
-       unsigned char *uuid_c;
        char uuid_s[UUID_STR_LEN],
                clock_uuid_s[UUID_STR_LEN];
        int ret = 0;
@@ -883,14 +884,7 @@ int ust_metadata_session_statedump(struct ust_registry_session *session,
 
        assert(session);
 
-       uuid_c = session->uuid;
-
-       snprintf(uuid_s, sizeof(uuid_s),
-               "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-               uuid_c[0], uuid_c[1], uuid_c[2], uuid_c[3],
-               uuid_c[4], uuid_c[5], uuid_c[6], uuid_c[7],
-               uuid_c[8], uuid_c[9], uuid_c[10], uuid_c[11],
-               uuid_c[12], uuid_c[13], uuid_c[14], uuid_c[15]);
+       lttng_uuid_to_str(session->uuid, uuid_s);
 
        /* For crash ABI */
        ret = lttng_metadata_printf(session,