Standardize `strcmp(a, b) == 0` instead of `!strcmp(a, b)`

[babeltrace.git] / src / cli / babeltrace2.c

diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c
index fa37cf18f8db30f932fd76d1ba3c383bbb2bff0a..6f6a1f37d5991d01b7cf8b564855ed81313732ac 100644 (file)
--- a/src/cli/babeltrace2.c
+++ b/src/cli/babeltrace2.c
@@ -173,7 +173,8 @@ int query(struct bt_config *cfg, const bt_component_class *comp_cls,
        }
 
        if (canceled) {
-               BT_LOGI("Canceled by user before executing the query: "
+               BT_CLI_LOGW_APPEND_CAUSE(
+                       "Canceled by user before executing the query: "
                        "comp-cls-addr=%p, comp-cls-name=\"%s\", "
                        "query-obj=\"%s\"", comp_cls,
                        bt_component_class_get_name(comp_cls), obj);
@@ -198,7 +199,8 @@ int query(struct bt_config *cfg, const bt_component_class *comp_cls,
 
                        if (usleep(sleep_time_us)) {
                                if (bt_query_executor_is_canceled(the_query_executor)) {
-                                       BT_LOGI("Query was canceled by user: "
+                                       BT_CLI_LOGW_APPEND_CAUSE(
+                                               "Query was canceled by user: "
                                                "comp-cls-addr=%p, comp-cls-name=\"%s\", "
                                                "query-obj=\"%s\"", comp_cls,
                                                bt_component_class_get_name(comp_cls),
@@ -1481,8 +1483,8 @@ gboolean port_id_equal(gconstpointer v1, gconstpointer v2)
        const struct port_id *id1 = v1;
        const struct port_id *id2 = v2;
 
-       return !strcmp(id1->instance_name, id2->instance_name) &&
-               !strcmp(id1->port_name, id2->port_name);
+       return strcmp(id1->instance_name, id2->instance_name) == 0 &&
+               strcmp(id1->port_name, id2->port_name) == 0;
 }
 
 static
@@ -1793,7 +1795,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component(
                case BT_GRAPH_CONNECT_PORTS_STATUS_OK:
                        break;
                case BT_GRAPH_CONNECT_PORTS_STATUS_CANCELED:
-                       BT_LOGI_STR("Graph was canceled by user.");
+                       BT_CLI_LOGW_APPEND_CAUSE("Graph was canceled by user.");
                        break;
                default:
                        BT_CLI_LOGE_APPEND_CAUSE(
@@ -2520,7 +2522,8 @@ int cmd_run(struct bt_config *cfg)
        }
 
        if (canceled) {
-               BT_LOGI_STR("Canceled by user before creating components.");
+               BT_CLI_LOGW_APPEND_CAUSE(
+                       "Canceled by user before creating components.");
                goto error;
        }
 
@@ -2533,7 +2536,8 @@ int cmd_run(struct bt_config *cfg)
        }
 
        if (canceled) {
-               BT_LOGI_STR("Canceled by user before connecting components.");
+               BT_CLI_LOGW_APPEND_CAUSE(
+                       "Canceled by user before connecting components.");
                goto error;
        }
 
@@ -2547,7 +2551,8 @@ int cmd_run(struct bt_config *cfg)
        }
 
        if (canceled) {
-               BT_LOGI_STR("Canceled by user before running the graph.");
+               BT_CLI_LOGW_APPEND_CAUSE(
+                       "Canceled by user before running the graph.");
                goto error;
        }
 
@@ -2571,11 +2576,12 @@ int cmd_run(struct bt_config *cfg)
                case BT_GRAPH_RUN_STATUS_OK:
                        break;
                case BT_GRAPH_RUN_STATUS_CANCELED:
-                       BT_LOGI_STR("Graph was canceled by user.");
+                       BT_CLI_LOGW_APPEND_CAUSE("Graph was canceled by user.");
                        goto error;
                case BT_GRAPH_RUN_STATUS_AGAIN:
                        if (bt_graph_is_canceled(ctx.graph)) {
-                               BT_LOGI_STR("Graph was canceled by user.");
+                               BT_CLI_LOGW_APPEND_CAUSE(
+                                       "Graph was canceled by user.");
                                goto error;
                        }
 
@@ -2586,7 +2592,8 @@ int cmd_run(struct bt_config *cfg)
 
                                if (usleep(cfg->cmd_data.run.retry_duration_us)) {
                                        if (bt_graph_is_canceled(ctx.graph)) {
-                                               BT_LOGI_STR("Graph was canceled by user.");
+                                               BT_CLI_LOGW_APPEND_CAUSE(
+                                                       "Graph was canceled by user.");
                                                goto error;
                                        }
                                }
@@ -2630,7 +2637,7 @@ void warn_command_name_and_directory_clash(struct bt_config *cfg)
        if (g_file_test(cfg->command_name,
                        G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
                _bt_log_write_d(_BT_LOG_SRCLOC_FUNCTION, __FILE__, __LINE__,
-                               BT_LOG_WARN, BT_LOG_TAG,
+                               BT_LOG_WARNING, BT_LOG_TAG,
                                "The `%s` command was executed. "
                                "If you meant to convert a trace located in "
                                "the local `%s` directory, please use:\n\n"