X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_graph_topo.c;h=058393a2b091503afc8fac29826b26dc46d8a105;hb=6f79a7cf4f5f065267895765f2277c6a12437f37;hp=92ebac80b5baab7a68fbafc8c0b3a131fd963374;hpb=0d107cdd376ff07c7bc6da9dfd46d57463442df1;p=babeltrace.git

diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c
index 92ebac80..058393a2 100644
--- a/tests/lib/test_graph_topo.c
+++ b/tests/lib/test_graph_topo.c
@@ -320,7 +320,7 @@ void src_port_connected(struct bt_private_component *private_component,
 		struct bt_private_port *self_private_port,
 		struct bt_port *other_port)
 {
-	struct bt_private_port *port;
+	int ret;
 
 	struct event event = {
 		.type = COMP_PORT_CONNECTED,
@@ -337,10 +337,9 @@ void src_port_connected(struct bt_private_component *private_component,
 
 	switch (current_test) {
 	case TEST_SRC_ADDS_PORT_IN_PORT_CONNECTED:
-		port = bt_private_component_source_add_output_private_port(
-			private_component, "hello", NULL);
-		assert(port);
-		bt_put(port);
+		ret = bt_private_component_source_add_output_private_port(
+			private_component, "hello", NULL, NULL);
+		assert(ret == 0);
 		break;
 	default:
 		break;
@@ -377,12 +376,11 @@ static
 enum bt_component_status src_init(struct bt_private_component *priv_comp,
 	struct bt_value *params, void *init_method_data)
 {
-	void *priv_port;
+	int ret;
 
-	priv_port = bt_private_component_source_add_output_private_port(
-		priv_comp, "out", NULL);
-	assert(priv_port);
-	bt_put(priv_port);
+	ret = bt_private_component_source_add_output_private_port(
+		priv_comp, "out", NULL, NULL);
+	assert(ret == 0);
 	return BT_COMPONENT_STATUS_OK;
 }
 
@@ -450,12 +448,11 @@ static
 enum bt_component_status sink_init(struct bt_private_component *priv_comp,
 	struct bt_value *params, void *init_method_data)
 {
-	void *priv_port;
+	int ret;
 
-	priv_port = bt_private_component_sink_add_input_private_port(priv_comp,
-		"in", NULL);
-	assert(priv_port);
-	bt_put(priv_port);
+	ret = bt_private_component_sink_add_input_private_port(priv_comp,
+		"in", NULL, NULL);
+	assert(ret == 0);
 	return BT_COMPONENT_STATUS_OK;
 }
 
@@ -650,6 +647,7 @@ void test_sink_removes_port_in_port_connected_then_src_removes_disconnected_port
 	struct bt_port *sink_def_port;
 	struct bt_connection *conn;
 	struct event event;
+	enum bt_graph_status status;
 	size_t src_accept_port_connection_pos;
 	size_t sink_accept_port_connection_pos;
 	size_t src_port_connected_pos;
@@ -670,7 +668,9 @@ void test_sink_removes_port_in_port_connected_then_src_removes_disconnected_port
 	assert(src_def_port);
 	sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
 	assert(sink_def_port);
-	conn = bt_graph_connect_ports(graph, src_def_port, sink_def_port);
+	status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+		&conn);
+	assert(status == 0);
 	assert(conn);
 
 	/* We're supposed to have 5 events so far */
@@ -812,6 +812,7 @@ void test_sink_removes_port_in_port_connected(void)
 	struct bt_port *sink_def_port;
 	struct bt_connection *conn;
 	struct event event;
+	enum bt_graph_status status;
 	size_t src_accept_port_connection_pos;
 	size_t sink_accept_port_connection_pos;
 	size_t src_port_connected_pos;
@@ -831,8 +832,9 @@ void test_sink_removes_port_in_port_connected(void)
 	assert(src_def_port);
 	sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
 	assert(sink_def_port);
-	conn = bt_graph_connect_ports(graph, src_def_port, sink_def_port);
-	assert(conn);
+	status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+		&conn);
+	assert(status == 0);
 
 	/* We're supposed to have 5 events so far */
 	ok(events->len == 5, "we have the expected number of events (before consume)");
@@ -958,6 +960,7 @@ void test_src_adds_port_in_port_connected(void)
 	struct bt_port *src_hello_port;
 	struct bt_connection *conn;
 	struct event event;
+	enum bt_graph_status status;
 	size_t src_accept_port_connection_pos;
 	size_t sink_accept_port_connection_pos;
 	size_t src_port_connected_pos;
@@ -974,8 +977,9 @@ void test_src_adds_port_in_port_connected(void)
 	assert(src_def_port);
 	sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
 	assert(sink_def_port);
-	conn = bt_graph_connect_ports(graph, src_def_port, sink_def_port);
-	assert(conn);
+	status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+		&conn);
+	assert(status == 0);
 	src_hello_port = bt_component_source_get_output_port_by_name(src,
 		"hello");
 	assert(src_hello_port);
@@ -1065,6 +1069,7 @@ void test_simple(void)
 	struct bt_port *sink_def_port;
 	struct bt_connection *conn;
 	struct event event;
+	enum bt_graph_status status;
 	size_t src_accept_port_connection_pos;
 	size_t sink_accept_port_connection_pos;
 	size_t src_port_connected_pos;
@@ -1079,8 +1084,9 @@ void test_simple(void)
 	assert(src_def_port);
 	sink_def_port = bt_component_sink_get_input_port_by_name(sink, "in");
 	assert(sink_def_port);
-	conn = bt_graph_connect_ports(graph, src_def_port, sink_def_port);
-	assert(conn);
+	status = bt_graph_connect_ports(graph, src_def_port, sink_def_port,
+		&conn);
+	assert(status == 0);
 
 	/* We're supposed to have 5 events */
 	ok(events->len == 5, "we have the expected number of events");