Fix: lib: expose bt_lib_log_level symbol

[babeltrace.git] / cli / babeltrace-cfg-cli-args-connect.c

diff --git a/cli/babeltrace-cfg-cli-args-connect.c b/cli/babeltrace-cfg-cli-args-connect.c
index e9e8691a8ddcc569c624cc9b2f2f21873eaa9bd3..ff3bf91701fb3c125f5d990688243c3c500ce88e 100644 (file)
--- a/cli/babeltrace-cfg-cli-args-connect.c
+++ b/cli/babeltrace-cfg-cli-args-connect.c
@@ -21,7 +21,7 @@
  */
 
 #include <stdlib.h>
-#include <babeltrace/values.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/common-internal.h>
 #include "babeltrace-cfg.h"
 #include "babeltrace-cfg-cli-args-connect.h"
@@ -295,7 +295,8 @@ static struct bt_config_component *find_component_in_array(GPtrArray *comps,
                struct bt_config_component *comp = g_ptr_array_index(comps, i);
 
                if (strcmp(name, comp->instance_name->str) == 0) {
-                       found_comp = bt_get(comp);
+                       found_comp = comp;
+                       bt_object_get_ref(found_comp);
                        goto end;
                }
        }
@@ -340,7 +341,7 @@ static int validate_all_endpoints_exist(struct bt_config *cfg, char *error_buf,
                struct bt_config_component *comp;
 
                comp = find_component(cfg, connection->upstream_comp_name->str);
-               bt_put(comp);
+               bt_object_put_ref(comp);
                if (!comp) {
                        snprintf(error_buf, error_buf_size,
                                "Invalid connection: cannot find upstream component `%s`:\n    %s\n",
@@ -351,7 +352,7 @@ static int validate_all_endpoints_exist(struct bt_config *cfg, char *error_buf,
                }
 
                comp = find_component(cfg, connection->downstream_comp_name->str);
-               bt_put(comp);
+               bt_object_put_ref(comp);
                if (!comp) {
                        snprintf(error_buf, error_buf_size,
                                "Invalid connection: cannot find downstream component `%s`:\n    %s\n",
@@ -415,13 +416,13 @@ static int validate_connection_directions(struct bt_config *cfg,
                        goto end;
                }
 
-               BT_PUT(src_comp);
-               BT_PUT(dst_comp);
+               BT_OBJECT_PUT_REF_AND_RESET(src_comp);
+               BT_OBJECT_PUT_REF_AND_RESET(dst_comp);
        }
 
 end:
-       bt_put(src_comp);
-       bt_put(dst_comp);
+       bt_object_put_ref(src_comp);
+       bt_object_put_ref(dst_comp);
        return ret;
 }
 
@@ -506,7 +507,7 @@ end:
 }
 
 static int validate_all_components_connected_in_array(GPtrArray *comps,
-               struct bt_value *connected_components,
+               const bt_value *connected_components,
                char *error_buf, size_t error_buf_size)
 {
        int ret = 0;
@@ -534,7 +535,7 @@ static int validate_all_components_connected(struct bt_config *cfg,
 {
        size_t i;
        int ret = 0;
-       struct bt_value *connected_components = bt_value_map_create();
+       bt_value *connected_components = bt_value_map_create();
 
        if (!connected_components) {
                ret = -1;
@@ -559,28 +560,31 @@ static int validate_all_components_connected(struct bt_config *cfg,
        }
 
        ret = validate_all_components_connected_in_array(
-               cfg->cmd_data.run.sources, connected_components,
+               cfg->cmd_data.run.sources,
+               connected_components,
                error_buf, error_buf_size);
        if (ret) {
                goto end;
        }
 
        ret = validate_all_components_connected_in_array(
-               cfg->cmd_data.run.filters, connected_components,
+               cfg->cmd_data.run.filters,
+               connected_components,
                error_buf, error_buf_size);
        if (ret) {
                goto end;
        }
 
        ret = validate_all_components_connected_in_array(
-               cfg->cmd_data.run.sinks, connected_components,
+               cfg->cmd_data.run.sinks,
+               connected_components,
                error_buf, error_buf_size);
        if (ret) {
                goto end;
        }
 
 end:
-       bt_put(connected_components);
+       bt_value_put_ref(connected_components);
        return ret;
 }
 
@@ -589,7 +593,8 @@ static int validate_no_duplicate_connection(struct bt_config *cfg,
 {
        size_t i;
        int ret = 0;
-       struct bt_value *flat_connection_names = bt_value_map_create();
+       bt_value *flat_connection_names =
+               bt_value_map_create();
        GString *flat_connection_name = NULL;
 
        if (!flat_connection_names) {
@@ -614,7 +619,7 @@ static int validate_no_duplicate_connection(struct bt_config *cfg,
                        connection->downstream_port_glob->str);
 
                if (bt_value_map_has_entry(flat_connection_names,
-                               flat_connection_name->str)) {
+                                          flat_connection_name->str)) {
                        snprintf(error_buf, error_buf_size,
                                "Duplicate connection:\n    %s\n",
                                connection->arg->str);
@@ -630,7 +635,7 @@ static int validate_no_duplicate_connection(struct bt_config *cfg,
        }
 
 end:
-       bt_put(flat_connection_names);
+       bt_value_put_ref(flat_connection_names);
 
        if (flat_connection_name) {
                g_string_free(flat_connection_name, TRUE);
@@ -674,7 +679,7 @@ end:
 }
 
 int bt_config_cli_args_create_connections(struct bt_config *cfg,
-               struct bt_value *connection_args,
+               const bt_value *connection_args,
                char *error_buf, size_t error_buf_size)
 {
        int ret;
@@ -687,14 +692,13 @@ int bt_config_cli_args_create_connections(struct bt_config *cfg,
        }
 
        for (i = 0; i < bt_value_array_get_size(connection_args); i++) {
-               struct bt_value *arg_value =
-                       bt_value_array_borrow_element_by_index(
+               const bt_value *arg_value =
+                       bt_value_array_borrow_element_by_index_const(
                                connection_args, i);
                const char *arg;
                struct bt_config_connection *cfg_connection;
 
-               ret = bt_value_string_get(arg_value, &arg);
-               BT_ASSERT(ret == 0);
+               arg = bt_value_string_get(arg_value);
                cfg_connection = cfg_connection_from_arg(arg);
                if (!cfg_connection) {
                        snprintf(error_buf, error_buf_size, "Cannot parse --connect option's argument:\n    %s\n",