Typo: occured -> occurred
A message that is not in the archive (sent off-list or not yet received): [email protected]
Merged in master and stable-2.11.
Thanks!
Jérémie
Quoted 72 lines · Michael Jeanson
Signed-off-by Michael Jeanson <[email protected]>--- include/lttng/session.h | 2 +- src/bin/lttng-sessiond/cmd.c | 2 +- src/bin/lttng-sessiond/rotation-thread.c | 4 ++-- src/bin/lttng-sessiond/session.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)include/lttng/session.h +1
-1@@ -163,7 +163,7 @@ extern int lttng_destroy_session(const char *name);* an lttng_destruction_handle which can be used to wait for the completion * of the session's destruction. The lttng_destroy_handle can also be used * obtain the status and archive location of any implicit session -* rotation that may have occured during the session's destruction. +* rotation that may have occurred during the session's destruction. * * Returns LTTNG_OK on success. The returned handle is owned by the caller * and must be free'd using lttng_destruction_handle_destroy(). src/bin/lttng-sessiond/cmd.c +1
-1@@ -4983,7 +4983,7 @@ int cmd_rotate_get_info(struct ltt_session *session,switch (rotation_state) {case LTTNG_ROTATION_STATE_NO_ROTATION : -DBG ("Reporting that no rotation has occured within the lifetime of session \"%s\"" , +DBG ("Reporting that no rotation has occurred within the lifetime of session \"%s\"" , session->name); goto end;case LTTNG_ROTATION_STATE_EXPIRED :src/bin/lttng-sessiond/rotation-thread.c +2
-2@@ -385,7 +385,7 @@ void check_session_rotation_pending_on_consumers(struct ltt_session *session, &exists_status);if (ret) {pthread_mutex_unlock (socket->lock); -ERR ("Error occured while checking rotation status on consumer daemon" ); +ERR ("Error occurred while checking rotation status on consumer daemon" ); goto end; }@@ -414,7 +414,7 @@ skip_ust: &exists_status);if (ret) {pthread_mutex_unlock (socket->lock); -ERR ("Error occured while checking rotation status on consumer daemon" ); +ERR ("Error occurred while checking rotation status on consumer daemon" ); goto end; }src/bin/lttng-sessiond/session.c +1
-1@@ -1163,7 +1163,7 @@ int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid)* * Be careful of the result passed to this function. For instance, * on failure to launch a rotation, a client will expect the rotation -* state to be set to "NO_ROTATION". If an error occured while the +* state to be set to "NO_ROTATION". If an error occurred while the * rotation was "ONGOING", result should be set to "ERROR", which will * allow a client to report it. * Signature · 1 line
2.17.1