X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=c90436c574270e2716372853b4a4c86dbbc80578;hb=84f3bd075b45f762b0dea5c1d48bc17a3f3c5365;hp=9246dc7ced5045986363355a4e67bcc30c151110;hpb=348a81dcf7b6944b10a813d93dcaf86fdb5194f6;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c index 9246dc7ce..c90436c57 100644 --- a/src/bin/lttng-sessiond/consumer.c +++ b/src/bin/lttng-sessiond/consumer.c @@ -893,10 +893,6 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, msg->u.ask_channel.buffer_credentials.uid = UINT32_MAX; msg->u.ask_channel.buffer_credentials.gid = UINT32_MAX; - if (monitor) { - assert(trace_chunk); - } - if (trace_chunk) { uint64_t chunk_id; enum lttng_trace_chunk_status chunk_status; @@ -1702,7 +1698,7 @@ int consumer_create_trace_chunk(struct consumer_socket *socket, const struct lttng_directory_handle *chunk_directory_handle; int chunk_dirfd; const char *chunk_name; - bool chunk_name_overriden; + bool chunk_name_overridden; uint64_t chunk_id; time_t creation_timestamp; char creation_timestamp_buffer[ISO8601_STR_LEN]; @@ -1722,14 +1718,14 @@ int consumer_create_trace_chunk(struct consumer_socket *socket, } chunk_status = lttng_trace_chunk_get_name(chunk, &chunk_name, - &chunk_name_overriden); + &chunk_name_overridden); if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK && chunk_status != LTTNG_TRACE_CHUNK_STATUS_NONE) { ERR("Failed to get name of trace chunk"); ret = -LTTNG_ERR_FATAL; goto error; } - if (chunk_name_overriden) { + if (chunk_name_overridden) { ret = lttng_strncpy(msg.u.create_trace_chunk.override_name, chunk_name, sizeof(msg.u.create_trace_chunk.override_name));