X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace-cfg-cli-args-connect.c;h=ff3bf91701fb3c125f5d990688243c3c500ce88e;hb=6d224992f91f8bb689b43cb745b9ca55007495bf;hp=e72ff30e9701715a7dfb7bf4db49ad17bc1ca15e;hpb=05e2128659970c32648a01255ed870449f05d518;p=babeltrace.git

diff --git a/cli/babeltrace-cfg-cli-args-connect.c b/cli/babeltrace-cfg-cli-args-connect.c
index e72ff30e..ff3bf917 100644
--- a/cli/babeltrace-cfg-cli-args-connect.c
+++ b/cli/babeltrace-cfg-cli-args-connect.c
@@ -507,7 +507,7 @@ end:
 }
 
 static int validate_all_components_connected_in_array(GPtrArray *comps,
-		const struct bt_value *connected_components,
+		const bt_value *connected_components,
 		char *error_buf, size_t error_buf_size)
 {
 	int ret = 0;
@@ -535,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;
@@ -584,7 +584,7 @@ static int validate_all_components_connected(struct bt_config *cfg,
 	}
 
 end:
-	bt_object_put_ref(connected_components);
+	bt_value_put_ref(connected_components);
 	return ret;
 }
 
@@ -593,7 +593,7 @@ static int validate_no_duplicate_connection(struct bt_config *cfg,
 {
 	size_t i;
 	int ret = 0;
-	struct bt_value *flat_connection_names =
+	bt_value *flat_connection_names =
 		bt_value_map_create();
 	GString *flat_connection_name = NULL;
 
@@ -635,7 +635,7 @@ static int validate_no_duplicate_connection(struct bt_config *cfg,
 	}
 
 end:
-	bt_object_put_ref(flat_connection_names);
+	bt_value_put_ref(flat_connection_names);
 
 	if (flat_connection_name) {
 		g_string_free(flat_connection_name, TRUE);
@@ -679,7 +679,7 @@ end:
 }
 
 int bt_config_cli_args_create_connections(struct bt_config *cfg,
-		const struct bt_value *connection_args,
+		const bt_value *connection_args,
 		char *error_buf, size_t error_buf_size)
 {
 	int ret;
@@ -692,7 +692,7 @@ int bt_config_cli_args_create_connections(struct bt_config *cfg,
 	}
 
 	for (i = 0; i < bt_value_array_get_size(connection_args); i++) {
-		const struct bt_value *arg_value =
+		const bt_value *arg_value =
 			bt_value_array_borrow_element_by_index_const(
 				connection_args, i);
 		const char *arg;