lib: graph API: remove "listener removed" callback parameters

[babeltrace.git] / src / lib / graph / graph.h

diff --git a/src/lib/graph/graph.h b/src/lib/graph/graph.h
index e18e63ffb0022a6d07c73a7e2d3d2589b4ce6647..dcc15260c6a2daef4f82a8d02c083c9ee794cffb 100644 (file)
--- a/src/lib/graph/graph.h
+++ b/src/lib/graph/graph.h
@@ -36,6 +36,7 @@
 #include "lib/object-pool.h"
 #include "common/assert.h"
 #include "common/common.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <glib.h>
 
@@ -105,7 +106,6 @@ struct bt_graph {
         */
        struct bt_interrupter *default_interrupter;
 
-       bool in_remove_listener;
        bool has_sink;
 
        /*
@@ -127,10 +127,6 @@ struct bt_graph {
                GArray *filter_output_port_added;
                GArray *filter_input_port_added;
                GArray *sink_input_port_added;
-               GArray *source_filter_ports_connected;
-               GArray *source_sink_ports_connected;
-               GArray *filter_filter_ports_connected;
-               GArray *filter_sink_ports_connected;
        } listeners;
 
        /* Pool of `struct bt_message_event *` */
@@ -174,11 +170,6 @@ BT_HIDDEN
 enum bt_graph_listener_func_status bt_graph_notify_port_added(struct bt_graph *graph,
                struct bt_port *port);
 
-BT_HIDDEN
-enum bt_graph_listener_func_status bt_graph_notify_ports_connected(
-               struct bt_graph *graph, struct bt_port *upstream_port,
-               struct bt_port *downstream_port);
-
 BT_HIDDEN
 void bt_graph_remove_connection(struct bt_graph *graph,
                struct bt_connection *connection);
@@ -256,6 +247,7 @@ int bt_graph_configure(struct bt_graph *graph)
                                comp_status == BT_FUNC_STATUS_MEMORY_ERROR,
                                "Unexpected returned status: status=%s",
                                bt_common_func_status_string(comp_status));
+                       BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(comp_status);
                        if (comp_status != BT_FUNC_STATUS_OK) {
                                if (comp_status < 0) {
                                        BT_LIB_LOGW_APPEND_CAUSE(