X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_graph_topo.c;h=185c6c2259c601c0e255acc1de4bb37009a0ca4b;hb=5c5632787fc9cafa602c89a28966bcfd01ec0204;hp=e83d6b09cba43d2ba19508bcc9d2312645a10239;hpb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;p=babeltrace.git

diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c
index e83d6b09..185c6c22 100644
--- a/tests/lib/test_graph_topo.c
+++ b/tests/lib/test_graph_topo.c
@@ -304,14 +304,12 @@ enum bt_component_status accept_port_connection(
 	struct event event = {
 		.type = COMP_ACCEPT_PORT_CONNECTION,
 		.data.comp_accept_port_connection = {
-			.comp = bt_component_from_private(private_component),
-			.self_port = bt_port_from_private(self_private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.self_port = bt_port_borrow_from_private(self_private_port),
 			.other_port = other_port,
 		},
 	};
 
-	bt_put(event.data.comp_accept_port_connection.comp);
-	bt_put(event.data.comp_accept_port_connection.self_port);
 	append_event(&event);
 	return BT_COMPONENT_STATUS_OK;
 }
@@ -326,14 +324,12 @@ void src_port_connected(struct bt_private_component *private_component,
 	struct event event = {
 		.type = COMP_PORT_CONNECTED,
 		.data.comp_port_connected = {
-			.comp = bt_component_from_private(private_component),
-			.self_port = bt_port_from_private(self_private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.self_port = bt_port_borrow_from_private(self_private_port),
 			.other_port = other_port,
 		},
 	};
 
-	bt_put(event.data.comp_port_connected.comp);
-	bt_put(event.data.comp_port_connected.self_port);
 	append_event(&event);
 
 	switch (current_test) {
@@ -355,13 +351,11 @@ void src_port_disconnected(struct bt_private_component *private_component,
 	struct event event = {
 		.type = COMP_PORT_DISCONNECTED,
 		.data.comp_port_disconnected = {
-			.comp = bt_component_from_private(private_component),
-			.port = bt_port_from_private(private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.port = bt_port_borrow_from_private(private_port),
 		},
 	};
 
-	bt_put(event.data.comp_port_disconnected.comp);
-	bt_put(event.data.comp_port_disconnected.port);
 	append_event(&event);
 
 	switch (current_test) {
@@ -417,14 +411,12 @@ void sink_port_connected(struct bt_private_component *private_component,
 	struct event event = {
 		.type = COMP_PORT_CONNECTED,
 		.data.comp_port_connected = {
-			.comp = bt_component_from_private(private_component),
-			.self_port = bt_port_from_private(self_private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.self_port = bt_port_borrow_from_private(self_private_port),
 			.other_port = other_port,
 		},
 	};
 
-	bt_put(event.data.comp_port_connected.comp);
-	bt_put(event.data.comp_port_connected.self_port);
 	append_event(&event);
 }
 
@@ -435,13 +427,11 @@ void sink_port_disconnected(struct bt_private_component *private_component,
 	struct event event = {
 		.type = COMP_PORT_DISCONNECTED,
 		.data.comp_port_disconnected = {
-			.comp = bt_component_from_private(private_component),
-			.port = bt_port_from_private(private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.port = bt_port_borrow_from_private(private_port),
 		},
 	};
 
-	bt_put(event.data.comp_port_disconnected.comp);
-	bt_put(event.data.comp_port_disconnected.port);
 	append_event(&event);
 }