X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=inline;f=src%2Fcommon%2Ftrace-chunk.c;h=9f0919a8896b7756121ffe18d6580e0550637f37;hb=4e42a5ac4102053ced991911a781be77959ddf55;hp=e853d7366ccc1115a7630b894a5bc9c7e53beb04;hpb=41b235984d17069c74c21686fb8faf0aaf47d91c;p=lttng-tools.git

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index e853d7366..9f0919a88 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -410,7 +410,7 @@ bool is_valid_chunk_name(const char *name)
 		return false;
 	}
 
-	len = strnlen(name, LTTNG_NAME_MAX);
+	len = lttng_strnlen(name, LTTNG_NAME_MAX);
 	if (len == 0 || len == LTTNG_NAME_MAX) {
 		return false;
 	}
@@ -656,7 +656,7 @@ int add_top_level_directory_unique(struct lttng_trace_chunk *chunk,
 	}
 
 	if (!found) {
-		char *copy = strndup(new_path, new_path_top_level_len);
+		char *copy = lttng_strndup(new_path, new_path_top_level_len);
 
 		DBG("Adding new top-level directory \"%s\" to trace chunk \"%s\"",
 				new_path, chunk->name ? : "(unnamed)");
@@ -1096,7 +1096,7 @@ end:
 	return registry;
 error:
 	lttng_trace_chunk_registry_destroy(registry);
-	goto end;
+	return NULL;
 }
 
 LTTNG_HIDDEN