From: Jérémie Galarneau Date: Wed, 18 Sep 2019 16:30:22 +0000 (-0400) Subject: trace-chunk: clean-up: misleading label name X-Git-Tag: v2.12.0-rc1~372 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6def6cd7c0d7fc16c679898ccf170d8a45d68ab4;p=lttng-tools.git trace-chunk: clean-up: misleading label name The 'end_unlock' label in lttng_trace_chunk_set_close_command() no longer needs to unlock the chunk (and doesn't do it). Rename it to 'end' to alleviate any confusion in the future. Signed-off-by: Jérémie Galarneau --- diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c index 908bdf9fe..29977cabb 100644 --- a/src/common/trace-chunk.c +++ b/src/common/trace-chunk.c @@ -989,7 +989,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 +1003,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; }