Typo: occurences -> occurrences

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I719e26febd639f3b047b6aa6361fc6734088e871

diff --git a/configure.ac b/configure.ac
index 74a471b34a8be41d040f1607b77040b596d72a2a..33b69e43a5c109308e16816475acbe149d12e29c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -204,7 +204,7 @@ AS_IF([test "x$libtool_fixup" = "xyes"],
            [
            libtool_m4="$srcdir/m4/libtool.m4"
            libtool_flag_pattern=".*link_all_deplibs\s*,\s*\$1\s*)"
-           AC_MSG_CHECKING([for occurence(s) of link_all_deplibs = no in $libtool_m4])
+           AC_MSG_CHECKING([for occurrence(s) of link_all_deplibs = no in $libtool_m4])
            libtool_flag_pattern_count=$($GREP -c "$libtool_flag_pattern\s*=\s*no" $libtool_m4)
            AS_IF([test $libtool_flag_pattern_count -ne 0],
            [

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index e884cdc8a03cc18a1ab06a5570a730fbc9f9144a..1a30366606065d248f0aaf05f915c18701683322 100644 (file)
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -2036,7 +2036,7 @@ int viewer_get_metadata(struct relay_connection *conn)
 
        /*
         * Either this is the first time the metadata file is read, or a
-        * rotation of the corresponding relay stream has occured.
+        * rotation of the corresponding relay stream has occurred.
         */
        if (!vstream->stream_file.handle && len > 0) {
                struct fs_handle *fs_handle;

diff --git a/src/bin/lttng-sessiond/event-notifier-error-accounting.c b/src/bin/lttng-sessiond/event-notifier-error-accounting.c
index e7b2def91c4b2675d7500c6c8c664e39e1339fb6..356cbc4d6a004edd73dcf36279399bc9b7b7ab09 100644 (file)
--- a/src/bin/lttng-sessiond/event-notifier-error-accounting.c
+++ b/src/bin/lttng-sessiond/event-notifier-error-accounting.c
@@ -488,7 +488,7 @@ error_create_counter_data:
        lttng_ust_ctl_destroy_counter(daemon_counter);
 error_create_daemon_counter:
 error_shm_alloc:
-       /* Error occured before per-cpu SHMs were handed-off to ustctl. */
+       /* Error occurred before per-cpu SHMs were handed-off to ustctl. */
        if (cpu_counter_fds) {
                for (i = 0; i < entry->nr_counter_cpu_fds; i++) {
                        if (cpu_counter_fds[i] < 0) {

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 97ce92683b8a48212ba70be7bb5ddd616b10d40c..991d59315e2f62f691ddaf0267f48412bd81d4c7 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1342,7 +1342,7 @@ static struct ust_app_event_notifier_rule *alloc_ust_app_event_notifier_rule(
        case LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_NONE:
                break;
        default:
-               /* Error occured. */
+               /* Error occurred. */
                ERR("Failed to generate exclusions from trigger while allocating an event notifier rule");
                goto error_put_trigger;
        }

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 44cc31404b42dc460b2e3c3a8638622f457f4a56..7f0140b424b2d1dec5857ba2f98f46a6f1b17b16 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -1865,7 +1865,7 @@ function validate_trace
                        pass "Validate trace for event $i, $traced events"
                else
                        fail "Validate trace for event $i"
-                       diag "Found $traced occurences of $i"
+                       diag "Found $traced occurrences of $i"
                fi
        done
        ret=$?
@@ -1893,7 +1893,7 @@ function validate_trace_count
                        pass "Validate trace for event $i, $traced events"
                else
                        fail "Validate trace for event $i"
-                       diag "Found $traced occurences of $i"
+                       diag "Found $traced occurrences of $i"
                fi
                cnt=$(($cnt + $traced))
        done
@@ -1923,7 +1923,7 @@ function validate_trace_count_range_incl_min_excl_max
                        pass "Validate trace for event $i, $traced events"
                else
                        fail "Validate trace for event $i"
-                       diag "Found $traced occurences of $i"
+                       diag "Found $traced occurrences of $i"
                fi
                cnt=$(($cnt + $traced))
        done
@@ -1957,7 +1957,7 @@ function validate_trace_exp()
                pass "Validate trace for expression '${event_exp}', $traced events"
        else
                fail "Validate trace for expression '${event_exp}'"
-               diag "Found $traced occurences of '${event_exp}'"
+               diag "Found $traced occurrences of '${event_exp}'"
        fi
        ret=$?
        return $ret