Use the same values for different status codes

[babeltrace.git] / include / babeltrace / graph / graph.h

diff --git a/include/babeltrace/graph/graph.h b/include/babeltrace/graph/graph.h
index c09279221c9f928115c65e917e484aa68ce20034..07ff3939727224477a619f45fa7c9dabb73edc84 100644 (file)
--- a/include/babeltrace/graph/graph.h
+++ b/include/babeltrace/graph/graph.h
@@ -38,30 +38,30 @@ struct bt_connection;
 
 enum bt_graph_status {
        /** No sink can consume at the moment. */
-       BT_GRAPH_STATUS_AGAIN = 2,
+       BT_GRAPH_STATUS_AGAIN = 11,
        /** Downstream component does not support multiple inputs. */
        BT_GRAPH_STATUS_END = 1,
        BT_GRAPH_STATUS_OK = 0,
-       /** Downstream component does not support multiple inputs. */
-       BT_GRAPH_STATUS_MULTIPLE_INPUTS_UNSUPPORTED = -1,
        /** Component is already part of another graph. */
        BT_GRAPH_STATUS_ALREADY_IN_A_GRAPH = -2,
        /** Invalid arguments. */
-       BT_GRAPH_STATUS_INVALID = -3,
+       BT_GRAPH_STATUS_INVALID = -22,
        /** No sink in graph. */
-       BT_GRAPH_STATUS_NO_SINK = -4,
+       BT_GRAPH_STATUS_NO_SINK = -6,
        /** General error. */
-       BT_GRAPH_STATUS_ERROR = -5,
+       BT_GRAPH_STATUS_ERROR = -1,
 };
 
 typedef void (*bt_graph_port_added_listener)(struct bt_port *port,
                void *data);
 typedef void (*bt_graph_port_removed_listener)(struct bt_component *component,
                struct bt_port *port, void *data);
-typedef void (*bt_graph_port_connected_listener)(struct bt_port *port,
-               void *data);
-typedef void (*bt_graph_port_disconnected_listener)(
-               struct bt_component *component, struct bt_port *port,
+typedef void (*bt_graph_ports_connected_listener)(struct bt_port *upstream_port,
+               struct bt_port *downstream_port, void *data);
+typedef void (*bt_graph_ports_disconnected_listener)(
+               struct bt_component *upstream_component,
+               struct bt_component *downstream_component,
+               struct bt_port *upstream_port, struct bt_port *downstream_port,
                void *data);
 
 extern struct bt_graph *bt_graph_create(void);
@@ -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);
 
@@ -106,13 +106,13 @@ extern enum bt_graph_status bt_graph_add_port_removed_listener(
                struct bt_graph *graph,
                bt_graph_port_removed_listener listener, void *data);
 
-extern enum bt_graph_status bt_graph_add_port_connected_listener(
+extern enum bt_graph_status bt_graph_add_ports_connected_listener(
                struct bt_graph *graph,
-               bt_graph_port_connected_listener listener, void *data);
+               bt_graph_ports_connected_listener listener, void *data);
 
-extern enum bt_graph_status bt_graph_add_port_disconnected_listener(
+extern enum bt_graph_status bt_graph_add_ports_disconnected_listener(
                struct bt_graph *graph,
-               bt_graph_port_disconnected_listener listener, void *data);
+               bt_graph_ports_disconnected_listener listener, void *data);
 
 #ifdef __cplusplus
 }