trace-chunk: clean-up: mark close command properties as static const

[lttng-tools.git] / src / common / trace-chunk.c

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 908bdf9fee148836202af6738167a58dec28f20b..fb4d1672490d49b889e98646ecee7bc6bcea788a 100644 (file)
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -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;
 }