bt_graph_connect() -> bt_graph_connect_ports()

This is more explicit.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 5aa7255620c6f07e2e6c796b6365e10116e56e89..5cbd51ff18e4cb86334b495350549bfe30a5ec31 100644 (file)
--- 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 c09279221c9f928115c65e917e484aa68ce20034..c42802491647dd4d705966c9fb9fffe219496bf5 100644 (file)
--- 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 7f0a4258dca9457d1353987cbc2c6aa012c4fbe4..1fb465ae094eae9510c97e553f9ae776766026f6 100644 (file)
--- 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;
                        }