lib: graph: add "self" and some "private" APIs

[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 b693455c612a9920195defb62068039840cc42eb..8e941e21d85aeb272cdcb2afd11ee63f68d386c6 100644 (file)
--- a/cli/babeltrace-cfg-cli-args-connect.c
+++ b/cli/babeltrace-cfg-cli-args-connect.c
@@ -562,7 +562,7 @@ static int validate_all_components_connected(struct bt_config *cfg,
 
        ret = validate_all_components_connected_in_array(
                cfg->cmd_data.run.sources,
-               bt_value_borrow_from_private(connected_components),
+               bt_private_value_borrow_value(connected_components),
                error_buf, error_buf_size);
        if (ret) {
                goto end;
@@ -570,7 +570,7 @@ static int validate_all_components_connected(struct bt_config *cfg,
 
        ret = validate_all_components_connected_in_array(
                cfg->cmd_data.run.filters,
-               bt_value_borrow_from_private(connected_components),
+               bt_private_value_borrow_value(connected_components),
                error_buf, error_buf_size);
        if (ret) {
                goto end;
@@ -578,7 +578,7 @@ static int validate_all_components_connected(struct bt_config *cfg,
 
        ret = validate_all_components_connected_in_array(
                cfg->cmd_data.run.sinks,
-               bt_value_borrow_from_private(connected_components),
+               bt_private_value_borrow_value(connected_components),
                error_buf, error_buf_size);
        if (ret) {
                goto end;
@@ -619,7 +619,7 @@ static int validate_no_duplicate_connection(struct bt_config *cfg,
                        connection->downstream_comp_name->str,
                        connection->downstream_port_glob->str);
 
-               if (bt_value_map_has_entry(bt_value_borrow_from_private(
+               if (bt_value_map_has_entry(bt_private_value_borrow_value(
                                flat_connection_names),
                                flat_connection_name->str)) {
                        snprintf(error_buf, error_buf_size,
@@ -700,8 +700,7 @@ int bt_config_cli_args_create_connections(struct bt_config *cfg,
                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",