Clean-up: replace uses of `int enabled` with boolean flags

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.cpp

diff --git a/src/bin/lttng-sessiond/cmd.cpp b/src/bin/lttng-sessiond/cmd.cpp
index 388e056e0c15dc7a8534c60ae59043bbf108a357..9ef4d379f200b0861212f434058fda12f6bd70b4 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.cpp
+++ b/src/bin/lttng-sessiond/cmd.cpp
@@ -921,7 +921,7 @@ close_sock:
                 * since the relayd connection failed thus making any tracing or/and
                 * streaming not usable.
                 */
-               consumer->enabled = 0;
+               consumer->enabled = false;
        }
        (void) relayd_close(rsock);
        free(rsock);
@@ -1149,7 +1149,7 @@ int start_kernel_session(struct ltt_kernel_session *ksess)
        /* Quiescent wait after starting trace */
        kernel_wait_quiescent();
 
-       ksess->active = 1;
+       ksess->active = true;
 
        ret = LTTNG_OK;
 
@@ -1194,7 +1194,7 @@ int stop_kernel_session(struct ltt_kernel_session *ksess)
                }
        }
 
-       ksess->active = 0;
+       ksess->active = false;
        if (error_occurred) {
                ret = LTTNG_ERR_UNK;
        } else {
@@ -1435,19 +1435,23 @@ static enum lttng_error_code cmd_enable_channel_internal(struct ltt_session *ses
                 * adhered to.
                 */
                if (domain->type == LTTNG_DOMAIN_JUL) {
-                       if (strncmp(attr->name, DEFAULT_JUL_CHANNEL_NAME, LTTNG_SYMBOL_NAME_LEN)) {
+                       if (strncmp(attr->name,
+                                   DEFAULT_JUL_CHANNEL_NAME,
+                                   LTTNG_SYMBOL_NAME_LEN - 1) != 0) {
                                ret_code = LTTNG_ERR_INVALID_CHANNEL_NAME;
                                goto error;
                        }
                } else if (domain->type == LTTNG_DOMAIN_LOG4J) {
-                       if (strncmp(attr->name, DEFAULT_LOG4J_CHANNEL_NAME, LTTNG_SYMBOL_NAME_LEN)) {
+                       if (strncmp(attr->name,
+                                   DEFAULT_LOG4J_CHANNEL_NAME,
+                                   LTTNG_SYMBOL_NAME_LEN - 1) != 0) {
                                ret_code = LTTNG_ERR_INVALID_CHANNEL_NAME;
                                goto error;
                        }
                } else if (domain->type == LTTNG_DOMAIN_PYTHON) {
                        if (strncmp(attr->name,
                                    DEFAULT_PYTHON_CHANNEL_NAME,
-                                   LTTNG_SYMBOL_NAME_LEN)) {
+                                   LTTNG_SYMBOL_NAME_LEN - 1) != 0) {
                                ret_code = LTTNG_ERR_INVALID_CHANNEL_NAME;
                                goto error;
                        }
@@ -1935,11 +1939,11 @@ int cmd_add_context(struct command_ctx *cmd_ctx,
                 * name, return an error.
                 */
                if (domain == LTTNG_DOMAIN_JUL && *channel_name &&
-                   strcmp(channel_name, DEFAULT_JUL_CHANNEL_NAME)) {
+                   strcmp(channel_name, DEFAULT_JUL_CHANNEL_NAME) != 0) {
                        ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
                        goto error;
                } else if (domain == LTTNG_DOMAIN_LOG4J && *channel_name &&
-                          strcmp(channel_name, DEFAULT_LOG4J_CHANNEL_NAME)) {
+                          strcmp(channel_name, DEFAULT_LOG4J_CHANNEL_NAME) != 0) {
                        ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
                        goto error;
                }
@@ -2754,7 +2758,7 @@ int cmd_start_trace(struct ltt_session *session)
                goto error;
        }
 
-       session->active = 1;
+       session->active = true;
        session->rotated_after_last_stop = false;
        session->cleared_after_last_stop = false;
        if (session->output_traces && !session->current_trace_chunk) {
@@ -2848,9 +2852,9 @@ int cmd_start_trace(struct ltt_session *session)
 error:
        if (ret == LTTNG_OK) {
                /* Flag this after a successful start. */
-               session->has_been_started |= 1;
+               session->has_been_started = true;
        } else {
-               session->active = 0;
+               session->active = false;
                /* Restore initial state on error. */
                session->rotated_after_last_stop = session_rotated_after_last_stop;
                session->cleared_after_last_stop = session_cleared_after_last_stop;
@@ -2896,7 +2900,7 @@ int cmd_stop_trace(struct ltt_session *session)
 
        DBG("Completed stop session \"%s\" (id %" PRIu64 ")", session->name, session->id);
        /* Flag inactive after a successful stop. */
-       session->active = 0;
+       session->active = false;
        ret = LTTNG_OK;
 
 error:
@@ -3198,7 +3202,7 @@ cmd_create_session_from_descriptor(struct lttng_session_descriptor *descriptor,
        if (ret_code != LTTNG_OK) {
                goto end;
        }
-       new_session->consumer->enabled = 1;
+       new_session->consumer->enabled = true;
        ret_code = LTTNG_OK;
 end:
        /* Release reference provided by the session_create function. */