X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-metadata.c;h=c29ed348b05fe006492d32345992aa47e1f2bd40;hp=7c6cbc63d8370e29d7caf3ac7a2363c385c657b6;hb=a2b988e2cc31f76365b600ca4e3a26604de00022;hpb=8de8806159d9d2544e2bc3091cc3c98abe4d97ad

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index 7c6cbc63d..c29ed348b 100644
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -85,8 +85,10 @@ int get_count_order(unsigned int count)
 	int order;
 
 	order = fls(count) - 1;
-	if (count & (count - 1))
+	if (count & (count - 1)) {
 		order++;
+	}
+	assert(order >= 0);
 	return order;
 }
 
@@ -220,7 +222,7 @@ void sanitize_ctf_identifier(char *out, const char *in)
 static
 int print_escaped_ctf_string(struct ust_registry_session *session, const char *string)
 {
-	int ret;
+	int ret = 0;
 	size_t i;
 	char cur;
 
@@ -1006,8 +1008,8 @@ int ust_metadata_session_statedump(struct ust_registry_session *session,
 		uint32_t major,
 		uint32_t minor)
 {
-	char uuid_s[UUID_STR_LEN],
-		clock_uuid_s[UUID_STR_LEN];
+	char uuid_s[LTTNG_UUID_STR_LEN],
+		clock_uuid_s[LTTNG_UUID_STR_LEN];
 	int ret = 0;
 
 	assert(session);