X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-metadata.c;h=a657f7c5d3d26b62472e66ecef3f188e987ee121;hb=db1da059574b86008035b12968446863ab6de866;hp=c1a80c746847a3161f28c143c487f5ccfcde194f;hpb=395d6b02dda3db1acd08936f49c1dc8efc48e613;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index c1a80c746..a657f7c5d 100644
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -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,