lib: remove unused _NO_SINK graph status

[babeltrace.git] / lib / graph / graph.c

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index b7d04b0a674b2d8fb44aa7659e9bc44e440206ca..219ca277ae6a197ea4d2e604cd9730db35745ac4 100644 (file)
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -82,6 +82,9 @@ struct bt_graph_listener_ports_connected {
        do {                                                            \
                size_t i;                                               \
                                                                        \
+               if (!_listeners) {                                      \
+                       break;                                          \
+               }                                                       \
                for (i = 0; i < (_listeners)->len; i++) {               \
                        _type *listener =                               \
                                &g_array_index((_listeners), _type, i); \
@@ -688,7 +691,7 @@ enum bt_graph_status bt_graph_consume(struct bt_graph *graph)
                "Graph is in a faulty state: %!+g", graph);
        bt_graph_set_can_consume(graph, false);
        status = bt_graph_configure(graph);
-       if (status) {
+       if (unlikely(status)) {
                /* bt_graph_configure() logs errors */
                goto end;
        }
@@ -712,7 +715,7 @@ enum bt_graph_status bt_graph_run(struct bt_graph *graph)
                "Graph is in a faulty state: %!+g", graph);
        bt_graph_set_can_consume(graph, false);
        status = bt_graph_configure(graph);
-       if (status) {
+       if (unlikely(status)) {
                /* bt_graph_configure() logs errors */
                goto end;
        }
@@ -749,8 +752,6 @@ enum bt_graph_status bt_graph_run(struct bt_graph *graph)
                        if (graph->sinks_to_consume->length > 1) {
                                status = BT_GRAPH_STATUS_OK;
                        }
-               } else if (status == BT_GRAPH_STATUS_NO_SINK) {
-                       goto end;
                }
        } while (status == BT_GRAPH_STATUS_OK);