X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-metadata.c;h=a657f7c5d3d26b62472e66ecef3f188e987ee121;hb=92fe5ca1528abfa90cc26f767d274dbff61ffc61;hp=fb1f1152180aad9d714831a9dfc70e1ec2f2a4ee;hpb=157b2d445425611ab8ada02e34204cd9134c2acc;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index fb1f11521..a657f7c5d 100644
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -403,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);
@@ -874,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;
@@ -882,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,