X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fplugins%2Ftest-utils-muxer.c;h=e9d2dca0a27a1caeff627fb6994a06653665be5e;hb=a256a42d2324f0ba50153f29e2f7ef513a9905c0;hp=a706b99b4b8577bca24ee426cd1fbf0f2c8cab31;hpb=090a4c0ac02fab83b9ad13bc2abb81534820f7f4;p=babeltrace.git

diff --git a/tests/plugins/test-utils-muxer.c b/tests/plugins/test-utils-muxer.c
index a706b99b..e9d2dca0 100644
--- a/tests/plugins/test-utils-muxer.c
+++ b/tests/plugins/test-utils-muxer.c
@@ -988,7 +988,6 @@ void do_std_test(enum test test, const char *name,
 	struct bt_graph *graph;
 	int64_t i;
 	int64_t count;
-	void *conn;
 	enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
 
 	clear_test_events();
@@ -1010,10 +1009,9 @@ void do_std_test(enum test test, const char *name,
 			downstream_port = bt_component_filter_get_input_port_by_index(
 				muxer_comp, i);
 			assert(downstream_port);
-			conn = bt_graph_connect_ports(graph,
-				upstream_port, downstream_port);
-			assert(conn);
-			bt_put(conn);
+			graph_status = bt_graph_connect_ports(graph,
+				upstream_port, downstream_port, NULL);
+			assert(graph_status == 0);
 			bt_put(upstream_port);
 			bt_put(downstream_port);
 		}
@@ -1025,9 +1023,9 @@ void do_std_test(enum test test, const char *name,
 	assert(upstream_port);
 	downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
 	assert(downstream_port);
-	conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
-	assert(conn);
-	bt_put(conn);
+	graph_status = bt_graph_connect_ports(graph, upstream_port,
+		downstream_port, NULL);
+	assert(graph_status == 0);
 	bt_put(upstream_port);
 	bt_put(downstream_port);
 
@@ -1345,9 +1343,9 @@ void connect_port_to_first_avail_muxer_port(struct bt_graph *graph,
 		struct bt_component *muxer_comp)
 {
 	struct bt_port *avail_muxer_port = NULL;
-	void *conn;
 	int64_t i;
 	int64_t count;
+	enum bt_graph_status graph_status;
 
 	count = bt_component_filter_get_input_port_count(muxer_comp);
 	assert(count >= 0);
@@ -1367,9 +1365,9 @@ void connect_port_to_first_avail_muxer_port(struct bt_graph *graph,
 		}
 	}
 
-	conn = bt_graph_connect_ports(graph, source_port, avail_muxer_port);
-	assert(conn);
-	bt_put(conn);
+	graph_status = bt_graph_connect_ports(graph, source_port,
+		avail_muxer_port, NULL);
+	assert(graph_status == 0);
 	bt_put(avail_muxer_port);
 }
 
@@ -1405,7 +1403,6 @@ void test_single_end_then_multiple_full(void)
 	struct bt_graph *graph;
 	int64_t i;
 	int64_t count;
-	void *conn;
 	int ret;
 	enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
 	struct graph_listener_data graph_listener_data;
@@ -1501,9 +1498,9 @@ void test_single_end_then_multiple_full(void)
 	assert(upstream_port);
 	downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
 	assert(downstream_port);
-	conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
-	assert(conn);
-	bt_put(conn);
+	graph_status = bt_graph_connect_ports(graph, upstream_port,
+		downstream_port, NULL);
+	assert(graph_status == 0);
 	bt_put(upstream_port);
 	bt_put(downstream_port);
 
@@ -1533,7 +1530,6 @@ void test_single_again_end_then_multiple_full(void)
 	struct bt_graph *graph;
 	int64_t i;
 	int64_t count;
-	void *conn;
 	int ret;
 	enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
 	struct graph_listener_data graph_listener_data;
@@ -1630,9 +1626,9 @@ void test_single_again_end_then_multiple_full(void)
 	assert(upstream_port);
 	downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
 	assert(downstream_port);
-	conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
-	assert(conn);
-	bt_put(conn);
+	graph_status = bt_graph_connect_ports(graph, upstream_port,
+		downstream_port, NULL);
+	assert(graph_status == 0);
 	bt_put(upstream_port);
 	bt_put(downstream_port);