X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=fb4d1672490d49b889e98646ecee7bc6bcea788a;hb=606846ba9588920704ccaa53d1127ecc1dcdaa80;hp=f7a4372b42df11140e0d9ced34c15d60ff6534fd;hpb=6e7e504882cc5ca7549459d1ecafa69d3242d2d5;p=lttng-tools.git

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index f7a4372b4..fb4d16724 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;
@@ -104,11 +104,13 @@ struct lttng_trace_chunk_registry {
 	struct cds_lfht *ht;
 };
 
-const char *close_command_names[] = {
+static const
+char *close_command_names[] = {
 	[LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED] =
 		"move to completed chunk folder",
 };
 
+static const
 chunk_close_command close_command_funcs[] = {
 	[LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED] =
 			lttng_trace_chunk_move_to_completed,
@@ -989,7 +991,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_close_command(
 	if (close_command < LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED ||
 			close_command >= LTTNG_TRACE_CHUNK_COMMAND_TYPE_MAX) {
 		status = LTTNG_TRACE_CHUNK_STATUS_INVALID_ARGUMENT;
-		goto end_unlock;
+		goto end;
 	}
 
 	pthread_mutex_lock(&chunk->lock);
@@ -1003,7 +1005,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_close_command(
         }
 	LTTNG_OPTIONAL_SET(&chunk->close_command, close_command);
 	pthread_mutex_unlock(&chunk->lock);
-end_unlock:
+end:
 	return status;
 }