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/doc/proposals/0006-lttng-snapshot.txt b/doc/proposals/0006-lttng-snapshot.txt
index 399fcca2e42d7fd8aff0592469ebc260bbf6dddd..1a012c438c6c3c06c27d20d97bae307732698f5c 100644 (file)
--- a/doc/proposals/0006-lttng-snapshot.txt
+++ b/doc/proposals/0006-lttng-snapshot.txt
@@ -154,7 +154,7 @@ ssize_t lttng_snapshot_list_output(struct lttng_handle *handle,
  * the date and time will be used for the directory name.
  *
  * This is a blocking call meaning that it will return only if the snapshot is
- * completed or an error occured. For now, no-wait is not supported but we keep
+ * completed or an error occurred. For now, no-wait is not supported but we keep
  * a parameter for that future case. The wait param is ignored.
  *
  * Return 0 on success or else a negative LTTNG_ERR* code.

diff --git a/include/lttng/lttng-error.h b/include/lttng/lttng-error.h
index c96322351d76ceba8b9fbb6567cd8d40d1bf0b14..72194ef2c99af143abff81763d2f14932dc5cf7f 100644 (file)
--- a/include/lttng/lttng-error.h
+++ b/include/lttng/lttng-error.h
@@ -137,7 +137,7 @@ enum lttng_error_code {
        LTTNG_ERR_PID_TRACKED            = 114, /* PID already tracked */
        LTTNG_ERR_PID_NOT_TRACKED        = 115, /* PID not tracked */
        LTTNG_ERR_INVALID_CHANNEL_DOMAIN = 116, /* Invalid channel domain */
-       LTTNG_ERR_OVERFLOW               = 117, /* Overflow occured. */
+       LTTNG_ERR_OVERFLOW               = 117, /* Overflow occurred. */
        LTTNG_ERR_SESSION_NOT_STARTED    = 118, /* Session not started */
        LTTNG_ERR_LIVE_SESSION           = 119, /* Live session unsupported */
        LTTNG_ERR_PER_PID_SESSION        = 120, /* Per-PID sessions unsupported */

diff --git a/src/bin/lttng-crash/lttng-crash.c b/src/bin/lttng-crash/lttng-crash.c
index 65fca36ae264c2e25f7d0437840a4a8f194f67b7..ba28af9afa9003f2f92decb5ade2275634b38a02 100644 (file)
--- a/src/bin/lttng-crash/lttng-crash.c
+++ b/src/bin/lttng-crash/lttng-crash.c
@@ -1137,7 +1137,7 @@ int delete_dir_recursive(const char *path)
                        ret = delete_dir_recursive(subpath);
                        free(subpath);
                        if (ret) {
-                               /* Error occured, abort traversal. */
+                               /* Error occurred, abort traversal. */
                                goto end;
                        }
                } else if (S_ISREG(st.st_mode)) {

diff --git a/src/bin/lttng/commands/disable_events.c b/src/bin/lttng/commands/disable_events.c
index e301b71b38642a0b841df04ed658fdb4bd025f0c..238f8463fec1553c4f8410091a3ebbb057752423 100644 (file)
--- a/src/bin/lttng/commands/disable_events.c
+++ b/src/bin/lttng/commands/disable_events.c
@@ -467,7 +467,7 @@ end:
                ret = ret ? ret : LTTNG_ERR_MI_IO_FAIL;
        }
 
-       /* Overwrite ret if an error occured in disable_events */
+       /* Overwrite ret if an error occurred in disable_events */
        ret = command_ret ? command_ret : ret;
 
        poptFreeContext(pc);

diff --git a/src/bin/lttng/commands/set_session.c b/src/bin/lttng/commands/set_session.c
index 4a41d9068a60bae986220e0e2db7f9aea45918f1..32e9a5d645763056ad430e6a791decb4a4439082 100644 (file)
--- a/src/bin/lttng/commands/set_session.c
+++ b/src/bin/lttng/commands/set_session.c
@@ -241,7 +241,7 @@ end:
                ret = ret ? ret : LTTNG_ERR_MI_IO_FAIL;
        }
 
-       /* Overwrite ret if an error occured during set_session() */
+       /* Overwrite ret if an error occurred during set_session() */
        ret = command_ret ? command_ret : ret;
 
        poptFreeContext(pc);

diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c
index 298bc6ef36cee6a1bac7cb362464c0dd22f9915c..b4124d51d5fc242631b062cffc7670552c75d696 100644 (file)
--- a/src/bin/lttng/commands/snapshot.c
+++ b/src/bin/lttng/commands/snapshot.c
@@ -777,7 +777,7 @@ end:
                free(session_name);
        }
 
-       /* Overwrite ret if an error occured during handle_command */
+       /* Overwrite ret if an error occurred during handle_command */
        ret = command_ret ? command_ret : ret;
        poptFreeContext(pc);
        return ret;

diff --git a/src/common/config/session-config.h b/src/common/config/session-config.h
index a53a8f91c753339daa28e29afffebd6c507c58b3..939cb6cbf0ff1cd4e76e2c819ffc2e178e241bbd 100644 (file)
--- a/src/common/config/session-config.h
+++ b/src/common/config/session-config.h
@@ -57,7 +57,7 @@ typedef int (*config_entry_handler_cb)(const struct config_entry *, void *);
  * "", only the global entries are relayed.
  *
  * Returns 0 on success. Negative values are error codes. If the return value
- * is positive, it represents the line number on which a parsing error occured.
+ * is positive, it represents the line number on which a parsing error occurred.
  */
 LTTNG_HIDDEN
 int config_get_section_entries(const char *path, const char *section,

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index e182c991f147baf89bcb482da2ff9b4936d775b6..5c14dd1d80be07eeda87fae696cbde7a450de8ec 100644 (file)
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -2374,7 +2374,7 @@ restart:
                                        len = ctx->on_buffer_ready(stream, ctx);
                                        /*
                                         * We don't check the return value here since if we get
-                                        * a negative len, it means an error occured thus we
+                                        * a negative len, it means an error occurred thus we
                                         * simply remove it from the poll set and free the
                                         * stream.
                                         */
@@ -2401,7 +2401,7 @@ restart:
                                                len = ctx->on_buffer_ready(stream, ctx);
                                                /*
                                                 * We don't check the return value here since if we get
-                                                * a negative len, it means an error occured thus we
+                                                * a negative len, it means an error occurred thus we
                                                 * simply remove it from the poll set and free the
                                                 * stream.
                                                 */

diff --git a/src/common/error.c b/src/common/error.c
index 84bc04facc7a5baea689d839aa0db85a0f1dfdb2..bc42577bda42d78b10f1f37189847d0cb392f993 100644 (file)
--- a/src/common/error.c
+++ b/src/common/error.c
@@ -178,7 +178,7 @@ static const char *error_string_array[] = {
        [ ERROR_INDEX(LTTNG_ERR_PID_TRACKED) ] = "PID already tracked",
        [ ERROR_INDEX(LTTNG_ERR_PID_NOT_TRACKED) ] = "PID not tracked",
        [ ERROR_INDEX(LTTNG_ERR_INVALID_CHANNEL_DOMAIN) ] = "Invalid channel domain",
-       [ ERROR_INDEX(LTTNG_ERR_OVERFLOW) ] = "Overflow occured",
+       [ ERROR_INDEX(LTTNG_ERR_OVERFLOW) ] = "Overflow occurred",
        [ ERROR_INDEX(LTTNG_ERR_SESSION_NOT_STARTED) ] = "Session not started",
        [ ERROR_INDEX(LTTNG_ERR_LIVE_SESSION) ] = "Live sessions are not supported",
        [ ERROR_INDEX(LTTNG_ERR_PER_PID_SESSION) ] = "Per-PID tracing sessions are not supported",

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 32169034095be1b9fe8889e3c9aee0906dc1e58f..b1cc03e860a0e9b10d34a5e8f528f3fcb4d90ae5 100644 (file)
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -1186,8 +1186,8 @@ int update_stream_stats(struct lttng_consumer_stream *stream)
        }
        if (discarded < stream->last_discarded_events) {
                /*
-                * Overflow has occured. We assume only one wrap-around
-                * has occured.
+                * Overflow has occurred. We assume only one wrap-around
+                * has occurred.
                 */
                stream->chan->discarded_events += (1ULL << (CAA_BITS_PER_LONG - 1)) -
                        stream->last_discarded_events + discarded;

diff --git a/src/common/readwrite.c b/src/common/readwrite.c
index 42a048fdabd2d3abaf0e32d561f9cb901930baff..0e8684e260b59ea242bd708cf4f8a0105f814702 100644 (file)
--- a/src/common/readwrite.c
+++ b/src/common/readwrite.c
@@ -28,7 +28,7 @@
  * Upon success, they return the "count" received as parameter.
  * They can return a negative value if an error occurs.
  * If a value lower than the requested "count" is returned, it means an
- * error occured.
+ * error occurred.
  * The error can be checked by querying errno.
  */
 LTTNG_HIDDEN

diff --git a/src/common/readwrite.h b/src/common/readwrite.h
index ab22fdc1eaf3dd26b5ae368227e4e0923295c096..557ed0a00408b2cf15c2a696b2f75296d421e06e 100644 (file)
--- a/src/common/readwrite.h
+++ b/src/common/readwrite.h
@@ -26,7 +26,7 @@
  * Upon success, they return the "count" received as parameter.
  * They can return a negative value if an error occurs.
  * If a value lower than the requested "count" is returned, it means an
- * error occured.
+ * error occurred.
  * The error can be checked by querying errno.
  */
 LTTNG_HIDDEN

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 89109b919a85231615fdb7f86a3c98518a9d422a..01d5ecf6505cc0667a41194d5cb1f07d06e3540b 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -2398,8 +2398,8 @@ int update_stream_stats(struct lttng_consumer_stream *stream)
        }
        if (discarded < stream->last_discarded_events) {
                /*
-                * Overflow has occured. We assume only one wrap-around
-                * has occured.
+                * Overflow has occurred. We assume only one wrap-around
+                * has occurred.
                 */
                stream->chan->discarded_events +=
                                (1ULL << (CAA_BITS_PER_LONG - 1)) -