X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=908bdf9fee148836202af6738167a58dec28f20b;hp=40e612800a5c8e6dd31442593d27e94eea81fbbc;hb=1f2292f6d16cea53dc94c0e16ab08eb71b70b938;hpb=f7399c50a8c8c65ecb53107e63a5e8f13424c63a

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 40e612800..908bdf9fe 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -91,8 +91,8 @@ struct lttng_trace_chunk {
 
 /* A trace chunk is uniquely identified by its (session id, chunk id) tuple. */
 struct lttng_trace_chunk_registry_element {
-	uint64_t session_id;
 	struct lttng_trace_chunk chunk;
+	uint64_t session_id;
 	/* Weak and only set when added. */
 	struct lttng_trace_chunk_registry *registry;
 	struct cds_lfht_node trace_chunk_registry_ht_node;
@@ -165,8 +165,9 @@ char *generate_chunk_name(uint64_t chunk_id, time_t creation_timestamp,
 {
 	int ret = 0;
 	char *new_name= NULL;
-	char start_datetime[sizeof("YYYYmmddTHHMMSS+HHMM")] = {};
-	char end_datetime_suffix[sizeof("-YYYYmmddTHHMMSS+HHMM")] = {};
+	char start_datetime[ISO8601_STR_LEN] = {};
+	/* Add 1 for a '-' prefix. */
+	char end_datetime_suffix[ISO8601_STR_LEN + 1] = {};
 
 	ret = time_to_iso8601_str(
 			creation_timestamp,
@@ -180,7 +181,7 @@ char *generate_chunk_name(uint64_t chunk_id, time_t creation_timestamp,
 		ret = time_to_iso8601_str(
 				*close_timestamp,
 				end_datetime_suffix + 1,
-				sizeof(end_datetime_suffix));
+				sizeof(end_datetime_suffix) - 1);
 		if (ret) {
 			ERR("Failed to format trace chunk end date time");
 			goto error;
@@ -656,7 +657,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 +1097,7 @@ end:
 	return registry;
 error:
 	lttng_trace_chunk_registry_destroy(registry);
-	goto end;
+	return NULL;
 }
 
 LTTNG_HIDDEN