All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Jeanson <mjeanson@efficios.com>
To: lttng-dev@lists.lttng.org
Cc: jgalar@efficios.com
Subject: [PATCH lttng-tools] Typo: occured -> occurred
Date: Fri, 16 Jun 2017 14:09:21 -0400	[thread overview]
Message-ID: <1497636561-399-1-git-send-email-mjeanson__35206.7370353781$1497637351$gmane$org@efficios.com> (raw)

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 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(-)

diff --git a/include/lttng/notification/channel-internal.h b/include/lttng/notification/channel-internal.h
index efe502f..0779d73 100644
--- a/include/lttng/notification/channel-internal.h
+++ b/include/lttng/notification/channel-internal.h
@@ -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
diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index ab1224a..751e665 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -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;
 }
 
 static
diff --git a/src/bin/lttng-sessiond/notification-thread.c b/src/bin/lttng-sessiond/notification-thread.c
index 7bd6536..c652b6e 100644
--- a/src/bin/lttng-sessiond/notification-thread.c
+++ b/src/bin/lttng-sessiond/notification-thread.c
@@ -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

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

             reply	other threads:[~2017-06-16 18:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-16 18:09 Michael Jeanson [this message]
     [not found] <1497636561-399-1-git-send-email-mjeanson@efficios.com>
2017-06-21 12:28 ` [PATCH lttng-tools] Typo: occured -> occurred Jérémie Galarneau
2017-08-02 18:26 Michael Jeanson
     [not found] <1501698378-6934-1-git-send-email-mjeanson@efficios.com>
2017-08-03 16:23 ` Jérémie Galarneau
2019-10-18 21:40 Michael Jeanson
     [not found] <20191018214006.6126-1-mjeanson@efficios.com>
2019-10-19  3:26 ` Jérémie Galarneau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='1497636561-399-1-git-send-email-mjeanson__35206.7370353781$1497637351$gmane$org@efficios.com' \
    --to=mjeanson@efficios.com \
    --cc=jgalar@efficios.com \
    --cc=lttng-dev@lists.lttng.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.