Typo: occured -> occurred
A message that is not in the archive (sent off-list or not yet received): [email protected]
Merged in master and stable-2.10.
Thanks!
Jérémie
Quoted 62 lines · Michael Jeanson
Signed-off-by Michael Jeanson <[email protected]>--- include/lttng/notification/channel-internal.h | 2 +- src/bin/lttng-sessiond/notification-thread-events.c | 6 +++--- src/bin/lttng-sessiond/notification-thread.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)include/lttng/notification/channel-internal.h +1
-1@@ -70,7 +70,7 @@ struct pending_notification {* - Synchronous: commands emitted by the client to which a reply is expected * (e.g. subscribing/unsubscribing to conditions), * - Asynchronous: notifications which are sent by the lttng_endpoint to the -* client as one of the subscribed condition has occured. +* client as one of the subscribed condition has occurred. * * The nature of this hybrid communication mode means that asynchronous messages * (e.g. notifications) may be interleaved between synchronous messages (e.g. a src/bin/lttng-sessiond/notification-thread-events.c +3
-3@@ -1368,7 +1368,7 @@ int handle_notification_thread_client_disconnect_all(int handle_notification_thread_trigger_unregister_all (struct notification_thread_state *state) { -bool error_occured = false; +bool error_occurred = false;struct cds_lfht_iter iter;struct lttng_trigger_ht_element *trigger_ht_element;@@ -1377,10 +1377,10 @@ int handle_notification_thread_trigger_unregister_all(int ret =handle_notification_thread_command_unregister_trigger ( state, trigger_ht_element->trigger,NULL );if (ret) { - error_occured = true; + error_occurred = true; } } -return error_occured ?-1 :0 ; +return error_occurred ?-1 :0 ; } staticsrc/bin/lttng-sessiond/notification-thread.c +1
-2@@ -569,7 +569,7 @@ int handle_channel_monitoring_pipe(int fd, uint32_t revents, ret =handle_notification_thread_channel_sample ( state, fd, domain);if (ret) { -ERR ("[notification-thread] Consumer sample handling error occured" ); +ERR ("[notification-thread] Consumer sample handling error occurred" ); ret =-1 ; goto end; } --2.7.4
Signature · 7 lines
Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev