From 77a54f99f128532186fca790be63a24332495c9d Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 28 Mar 2017 22:31:45 -0400 Subject: [PATCH] bt_graph_connect() -> bt_graph_connect_ports() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is more explicit. Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- converter/babeltrace.c | 4 ++-- include/babeltrace/graph/graph.h | 2 +- lib/component/graph.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 5aa72556..5cbd51ff 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -598,7 +598,7 @@ int connect_source_sink(struct bt_graph *graph, goto end; } - connection = bt_graph_connect(graph, source_port, + connection = bt_graph_connect_ports(graph, source_port, trimmer_input_port); if (!connection) { fprintf(stderr, "Failed to connect source to trimmer. Aborting...\n"); @@ -610,7 +610,7 @@ int connect_source_sink(struct bt_graph *graph, BT_MOVE(to_sink_port, source_port); } - connection = bt_graph_connect(graph, to_sink_port, sink_port); + connection = bt_graph_connect_ports(graph, to_sink_port, sink_port); if (!connection) { fprintf(stderr, "Failed to connect to sink. Aborting...\n"); ret = -1; diff --git a/include/babeltrace/graph/graph.h b/include/babeltrace/graph/graph.h index c0927922..c4280249 100644 --- a/include/babeltrace/graph/graph.h +++ b/include/babeltrace/graph/graph.h @@ -70,7 +70,7 @@ extern struct bt_graph *bt_graph_create(void); * Creates a connection between two components using the two ports specified * and adds the connection and components (if not already added) to the graph. */ -extern struct bt_connection *bt_graph_connect(struct bt_graph *graph, +extern struct bt_connection *bt_graph_connect_ports(struct bt_graph *graph, struct bt_port *upstream, struct bt_port *downstream); diff --git a/lib/component/graph.c b/lib/component/graph.c index 7f0a4258..1fb465ae 100644 --- a/lib/component/graph.c +++ b/lib/component/graph.c @@ -145,7 +145,7 @@ error: goto end; } -struct bt_connection *bt_graph_connect(struct bt_graph *graph, +struct bt_connection *bt_graph_connect_ports(struct bt_graph *graph, struct bt_port *upstream_port, struct bt_port *downstream_port) { @@ -473,8 +473,8 @@ enum bt_graph_status bt_graph_add_component_as_sibling(struct bt_graph *graph, goto error_disconnect; } - new_connection = bt_graph_connect(graph, upstream_port, - new_port); + new_connection = bt_graph_connect_ports(graph, + upstream_port, new_port); if (!new_connection) { goto error_disconnect; } @@ -510,8 +510,8 @@ enum bt_graph_status bt_graph_add_component_as_sibling(struct bt_graph *graph, goto error_disconnect; } - new_connection = bt_graph_connect(graph, new_port, - downstream_port); + new_connection = bt_graph_connect_ports(graph, + new_port, downstream_port); if (!new_connection) { goto error_disconnect; } -- 2.34.1