Skip to contentSkip to conversation

Typo: Stoping -> Stopping

PATCH New Michael Jeanson 2 participants 3 messages May 24, 2016 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 2/2 Typo: Stoping -> Stopping

---
 doc/man/lttng-stop.1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
doc/man/lttng-stop.1.txt +1 -1
index 6405d7b..e2997e6 100644
@@ -18,7 +18,7 @@ DESCRIPTION
 The `lttng stop` command stops the various LTTng tracers for a given
 active tracing session.
 
-Stoping the LTTng tracers has the effect that all enabled event rules
+Stopping the LTTng tracers has the effect that all enabled event rules
 within enabled channels cannot make event sources _emit_ trace events
 anymore.
 
Signature · 6 lines
2.7.4

_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
#2 lore raw

Re: [PATCH lttng-tools 1/2] Typo: occured -> occurred

In reply to a message not in the archive

Merged in master and stable-2.8, thanks!

Jérémie

Quoted 202 lines · Michael Jeanson
---
 doc/proposals/0006-lttng-snapshot.txt        | 2 +-
 include/lttng/lttng-error.h                  | 2 +-
 src/bin/lttng-crash/lttng-crash.c            | 2 +-
 src/bin/lttng/commands/disable_events.c      | 2 +-
 src/bin/lttng/commands/set_session.c         | 2 +-
 src/bin/lttng/commands/snapshot.c            | 2 +-
 src/common/config/session-config.h           | 2 +-
 src/common/consumer/consumer.c               | 4 ++--
 src/common/error.c                           | 2 +-
 src/common/kernel-consumer/kernel-consumer.c | 4 ++--
 src/common/readwrite.c                       | 2 +-
 src/common/readwrite.h                       | 2 +-
 src/common/ust-consumer/ust-consumer.c       | 4 ++--
 13 files changed, 16 insertions(+), 16 deletions(-)
doc/proposals/0006-lttng-snapshot.txt +1 -1
index 399fcca..1a012c4 100644
@@ -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.
include/lttng/lttng-error.h +1 -1
index c963223..72194ef 100644
@@ -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 */
src/bin/lttng-crash/lttng-crash.c +1 -1
index 65fca36..ba28af9 100644
@@ -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)) {
src/bin/lttng/commands/disable_events.c +1 -1
index e301b71..238f846 100644
@@ -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);
src/bin/lttng/commands/set_session.c +1 -1
index 4a41d90..32e9a5d 100644
@@ -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);
src/bin/lttng/commands/snapshot.c +1 -1
index c8a7ba0..d948226 100644
@@ -636,7 +636,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;
src/common/config/session-config.h +1 -1
index a53a8f9..939cb6c 100644
@@ -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,
src/common/consumer/consumer.c +2 -2
index e182c99..5c14dd1 100644
@@ -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.
                                                 */
src/common/error.c +1 -1
index 84bc04f..bc42577 100644
@@ -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",
src/common/kernel-consumer/kernel-consumer.c +2 -2
index 3216903..b1cc03e 100644
@@ -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;
src/common/readwrite.c +1 -1
index 42a048f..0e8684e 100644
@@ -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
src/common/readwrite.h +1 -1
index ab22fdc..557ed0a 100644
@@ -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
src/common/ust-consumer/ust-consumer.c +2 -3
index 89109b9..01d5ecf 100644
@@ -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)) -
--

2.7.4

Signature · 7 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw

Merged in master and stable-2.8, thanks!

Jérémie

Quoted 21 lines · Michael Jeanson
---
 doc/man/lttng-stop.1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
doc/man/lttng-stop.1.txt +1 -2
index 6405d7b..e2997e6 100644
@@ -18,7 +18,7 @@ DESCRIPTION
 The `lttng stop` command stops the various LTTng tracers for a given
 active tracing session.
 
-Stoping the LTTng tracers has the effect that all enabled event rules
+Stopping the LTTng tracers has the effect that all enabled event rules
 within enabled channels cannot make event sources _emit_ trace events
 anymore.
 
--

2.7.4

Signature · 7 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev