Fix: typo 'occured' -> 'occurred'

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 1e2e9050fef2d6d77ca78e9767a2fea759ba99be..09aeb33e0120b4be549a44934efb2f104b4474a9 100644 (file)
--- 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 0f76ac71581935ab39c3c8fd57d1c29983aca2a2..2aea2ea747d3639dc507144fed844ddf870ed453 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2732,7 +2732,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);
 
@@ -2769,7 +2769,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;
                }
        }
 
@@ -2822,7 +2822,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 f29c1ef17da90762bf225d2a3e8ba8f5b81ee306..040ae5f28a355bd235e91ca4630887de823c6b9c 100644 (file)
--- 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 3e06e93110801116d2441b59a0b1ddc13b3650ae..f78e8ea25adf53bed9ad917e87338deaac328c95 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -860,7 +860,7 @@ int handle_notification_channel(int fd,
        status = lttng_notification_channel_has_pending_notification(
                        rotate_notification_channel, &notification_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;
        }
@@ -978,7 +978,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");
+                                       ERR("[rotation-thread] Error occurred while handling activity on notification channel socket");
                                        goto error;
                                }
                        }

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index 1f0aeb94e90198ecbbcd4592088690dab245eea7..b1ca2504e6d86b722fef2bc0c4c3b7ae048e7872 100644 (file)
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -123,7 +123,7 @@ struct ltt_session {
        struct lttng_ht_node_u64 node;
        /*
         * The current archive id corresponds to the number of session rotations
-        * that have occured for this session. The archive id
+        * that have occurred for this session. The archive id
         * is used to tag the "generation" of a stream. This tag allows the
         * consumer and relay daemons to track when a given stream was created
         * during the lifetime of a session.
@@ -192,7 +192,7 @@ struct ltt_session {
        /*
         * Keep a state if this session was rotated after the last stop command.
         * We only allow one rotation after a stop. At destroy, we also need to
-        * know if a rotation occured since the last stop to rename the current
+        * know if a rotation occurred since the last stop to rename the current
         * chunk.
         */
        bool rotated_after_last_stop;

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 913533561d7a04d0617dc9796583343b6c8fc068..fbf523399be0a1dd187e9167734e4b4b2596866c 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -140,7 +140,7 @@ struct ust_app_channel {
        /*
         * Unique key used to identify the channel on the consumer side.
         * 0 is a reserved 'invalid' value used to indicate that the consumer
-        * does not know about this channel (i.e. an error occured).
+        * does not know about this channel (i.e. an error occurred).
         */
        uint64_t key;
        /* Id of the tracing channel set on creation. */

diff --git a/src/bin/lttng/commands/enable_rotation.c b/src/bin/lttng/commands/enable_rotation.c
index 918662661a83ec83f3c3fb580a7564b0482a7992..85dae5681f251b398752cd204928116d32560983 100644 (file)
--- a/src/bin/lttng/commands/enable_rotation.c
+++ b/src/bin/lttng/commands/enable_rotation.c
@@ -106,7 +106,7 @@ static enum cmd_error_code add_schedule(const char *session_name,
                ret = CMD_ERROR;
                goto end;
        default:
-               ERR("Unknown error occured setting %s rotation schedule",
+               ERR("Unknown error occurred setting %s rotation schedule",
                                schedule_type_name);
                ret = CMD_ERROR;
                goto end;

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index b890416cac1d96db4fe481c27f9f395e4a14707d..9bed7b55b8114357382f983ecd4ff2ebb63aaa31 100644 (file)
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -1174,7 +1174,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
                if (pending < 0) {
                        /*
-                        * An error occured while running the command;
+                        * An error occurred while running the command;
                         * don't send the 'pending' flag as the sessiond
                         * will not read it.
                         */
@@ -1218,7 +1218,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
                if (pending < 0) {
                        /*
-                        * An error occured while running the command;
+                        * An error occurred while running the command;
                         * don't send the 'pending' flag as the sessiond
                         * will not read it.
                         */

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 73d27b57b04effa5ad3307576e3b1461be63699c..46f330052aa8c04fdd440b6f4dd30485634678c5 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -2026,7 +2026,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
                if (pending < 0) {
                        /*
-                        * An error occured while running the command;
+                        * An error occurred while running the command;
                         * don't send the 'pending' flag as the sessiond
                         * will not read it.
                         */
@@ -2070,7 +2070,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
                if (pending < 0) {
                        /*
-                        * An error occured while running the command;
+                        * An error occurred while running the command;
                         * don't send the 'pending' flag as the sessiond
                         * will not read it.
                         */