From: Jérémie Galarneau Date: Fri, 17 Jan 2025 21:59:36 +0000 (+0000) Subject: Clean-up typos: encoutered -> encountered X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b3c7d24509729897a269e69196adfa77c5c610de;p=lttng-tools.git Clean-up typos: encoutered -> encountered For some reason, this typo is present all over the project. I'll practice writting that word over the week-end. Change-Id: Ifc6b0d205de8792c1a96cbac009fd5abdfb36199 Signed-off-by: Jérémie Galarneau --- diff --git a/src/bin/lttng-relayd/stream.cpp b/src/bin/lttng-relayd/stream.cpp index b4c1a9216..866162895 100644 --- a/src/bin/lttng-relayd/stream.cpp +++ b/src/bin/lttng-relayd/stream.cpp @@ -207,7 +207,7 @@ static int rotate_truncate_stream(struct relay_stream *stream) struct lttng_trace_chunk *previous_chunk = nullptr; if (!LTTNG_OPTIONAL_GET(stream->ongoing_rotation).next_trace_chunk) { - ERR("Protocol error encoutered in %s(): stream rotation " + ERR("Protocol error encountered in %s(): stream rotation " "sequence number is before the current sequence number " "and the next trace chunk is unset. Honoring this " "rotation command would result in data loss", diff --git a/src/bin/lttng-sessiond/action-executor.cpp b/src/bin/lttng-sessiond/action-executor.cpp index 6f75b07b4..395aa9a13 100644 --- a/src/bin/lttng-sessiond/action-executor.cpp +++ b/src/bin/lttng-sessiond/action-executor.cpp @@ -249,7 +249,7 @@ static int client_handle_transmission_status(struct notification_client *client, client->id); break; default: - ERR("Fatal error encoutered while sending notification to client, client_id = %" PRIu64, + ERR("Fatal error encountered while sending notification to client, client_id = %" PRIu64, client->id); ret = -1; goto end; diff --git a/src/bin/lttng-sessiond/notification-thread-events.cpp b/src/bin/lttng-sessiond/notification-thread-events.cpp index f3a456f08..683edca62 100644 --- a/src/bin/lttng-sessiond/notification-thread-events.cpp +++ b/src/bin/lttng-sessiond/notification-thread-events.cpp @@ -3502,7 +3502,7 @@ end: int handle_notification_thread_client_disconnect_all(struct notification_thread_state *state) { - bool error_encoutered = false; + bool error_encountered = false; DBG("Closing all client connections"); @@ -3514,11 +3514,11 @@ int handle_notification_thread_client_disconnect_all(struct notification_thread_ ret = notification_thread_client_disconnect(client, state); if (ret) { - error_encoutered = true; + error_encountered = true; } } - return error_encoutered ? 1 : 0; + return error_encountered ? 1 : 0; } int handle_notification_thread_trigger_unregister_all(struct notification_thread_state *state) @@ -4742,7 +4742,7 @@ dispatch_one_event_notifier_notification(struct notification_thread_state *state case ACTION_EXECUTOR_STATUS_INVALID: case ACTION_EXECUTOR_STATUS_ERROR: /* Fatal error, shut down everything. */ - ERR("Fatal error encoutered while enqueuing action to the action executor"); + ERR("Fatal error encountered while enqueuing action to the action executor"); ret = -1; goto end_unlock; default: diff --git a/src/bin/lttng-sessiond/ust-registry-session.cpp b/src/bin/lttng-sessiond/ust-registry-session.cpp index 0e9fd135f..ff002811f 100644 --- a/src/bin/lttng-sessiond/ust-registry-session.cpp +++ b/src/bin/lttng-sessiond/ust-registry-session.cpp @@ -129,7 +129,7 @@ void destroy_channel(lsu::registry_channel *chan, bool notify) noexcept ust_registry_channel_destroy_event(chan, event); } } catch (const lttng::out_of_range& ex) { - ERR_FMT("Corrupted channel events hash table encoutered while destroying channel: {}", + ERR_FMT("Corrupted channel events hash table encountered while destroying channel: {}", ex.what()); } } diff --git a/src/bin/lttng/commands/list.cpp b/src/bin/lttng/commands/list.cpp index 5ccebbd1e..40d24141a 100644 --- a/src/bin/lttng/commands/list.cpp +++ b/src/bin/lttng/commands/list.cpp @@ -1650,7 +1650,7 @@ static int list_process_attr_tracker(enum lttng_process_attr process_attr) ret = CMD_SUCCESS; goto end; default: - ERR("Unknown tracking policy encoutered while listing the %s process attribute tracker of session `%s`", + ERR("Unknown tracking policy encountered while listing the %s process attribute tracker of session `%s`", lttng_process_attr_to_string(process_attr), the_handle->session_name); ret = CMD_FATAL; diff --git a/src/common/conditions/event-rule-matches.cpp b/src/common/conditions/event-rule-matches.cpp index 64f00859c..af850b5c7 100644 --- a/src/common/conditions/event-rule-matches.cpp +++ b/src/common/conditions/event-rule-matches.cpp @@ -650,7 +650,7 @@ static struct lttng_event_expr *event_expr_from_payload(struct lttng_payload_vie break; } default: - ERR("Invalid event expression type encoutered while deserializing event expression: type = %" PRIu64, + ERR("Invalid event expression type encountered while deserializing event expression: type = %" PRIu64, type); goto error; } diff --git a/tests/regression/tools/live/live_test.cpp b/tests/regression/tools/live/live_test.cpp index 9c9838ac7..eb4f2ea7b 100644 --- a/tests/regression/tools/live/live_test.cpp +++ b/tests/regression/tools/live/live_test.cpp @@ -521,7 +521,7 @@ static int get_next_index() if (first_packet_stream_id < 0) { /* * Initialize the first packet stream id. That is, - * the first active stream encoutered. + * the first active stream encountered. */ first_packet_offset = be64toh(rp.offset); first_packet_len = be64toh(rp.packet_size) / CHAR_BIT;