Signed-off-by: Michael Jeanson
---
src/bin/lttng-relayd/main.c | 4 ++--
src/bin/lttng-sessiond/cmd.c| 6 +++---
src/bin/lttng-sessiond/notification-thread-events.c | 4 ++--
src/bin/lttng-sessiond/rotation-thread.c| 4 ++--
src/bin/lttng-sessiond/session.h| 4 ++--
src/bin/lttng-sessiond/ust-app.h| 2 +-
src/bin/lttng/commands/enable_rotation.c| 2 +-
src/common/kernel-consumer/kernel-consumer.c| 4 ++--
src/common/ust-consumer/ust-consumer.c | 4 ++--
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 1e2e9050f..09aeb33e0 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -85,7 +85,7 @@ NULL
enum relay_connection_status {
RELAY_CONNECTION_STATUS_OK,
- /* An error occured while processing an event on the connection. */
+ /* An error occurred while processing an event on the connection. */
RELAY_CONNECTION_STATUS_ERROR,
/* Connection closed/shutdown cleanly. */
RELAY_CONNECTION_STATUS_CLOSED,
@@ -1640,7 +1640,7 @@ int rotate_truncate_stream(struct relay_stream *stream)
/*
* Rewind the current tracefile to the position at which the rotation
-* should have occured.
+* should have occurred.
*/
lseek_ret = lseek(stream->stream_fd->fd,
stream->pos_after_last_complete_data_index, SEEK_SET);
diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 545269525..de6f67d48 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2725,7 +2725,7 @@ int cmd_stop_trace(struct ltt_session *session)
struct ltt_kernel_channel *kchan;
struct ltt_kernel_session *ksession;
struct ltt_ust_session *usess;
- bool error_occured = false;
+ bool error_occurred = false;
assert(session);
@@ -2762,7 +2762,7 @@ int cmd_stop_trace(struct ltt_session *session)
* This error should not prevent the user from stopping
* the session. However, it will be reported at the end.
*/
- error_occured = true;
+ error_occurred = true;
}
}
@@ -2815,7 +2815,7 @@ int cmd_stop_trace(struct ltt_session *session)
/* Flag inactive after a successful stop. */
session->active = 0;
- ret = !error_occured ? LTTNG_OK : LTTNG_ERR_UNK;
+ ret = !error_occurred ? LTTNG_OK : LTTNG_ERR_UNK;
error:
return ret;
diff --git a/src/bin/lttng-sessiond/notification-thread-events.c
b/src/bin/lttng-sessiond/notification-thread-events.c
index f29c1ef17..040ae5f28 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -1533,7 +1533,7 @@ int handle_notification_thread_command_add_channel(
session_info = find_or_create_session_info(state, session_name,
session_uid, session_gid);
if (!session_info) {
- /* Allocation error or an internal error occured. */
+ /* Allocation error or an internal error occurred. */
goto error;
}
@@ -1698,7 +1698,7 @@ int handle_notification_thread_command_session_rotation(
session_info = find_or_create_session_info(state, session_name,
session_uid, session_gid);
if (!session_info) {
- /* Allocation error or an internal error occured. */
+ /* Allocation error or an internal error occurred. */
ret = -1;
cmd_result = LTTNG_ERR_NOMEM;
goto end;
diff --git a/src/bin/lttng-sessiond/rotation-thread.c
b/src/bin/lttng-sessiond/rotation-thread.c
index df70f8fd5..cf0e7ed97 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -857,7 +857,7 @@ int handle_notification_channel(int fd,
status = lttng_notification_channel_has_pending_notification(
rotate_notification_channel, ¬ification_pending);
if (status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
- ERR("[rotation-thread ]Error occured while checking for pending
notification");
+ ERR("[rotation-thread ]Error occurred while checking for
pending notification");
ret = -1;
goto end;
}
@@ -975,7 +975,7 @@ void *thread_rotation(void *data)
ret = handle_notification_channel(fd, handle,
&thread);
if (ret) {
- ERR("[rotation-thread] Error occured
while handling activity on notification channel socket");
+