lib: rename include dir to babeltrace2

[babeltrace.git] / lib / graph / component-sink.c

diff --git a/lib/graph/component-sink.c b/lib/graph/component-sink.c
index 30c15609723adfa14ca096867fedc4e8443830db..1887fbfd3bb68edea03d9387fc7895010bb940d2 100644 (file)
--- a/lib/graph/component-sink.c
+++ b/lib/graph/component-sink.c
@@ -22,17 +22,17 @@
  */
 
 #define BT_LOG_TAG "COMP-SINK"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/value.h>
-#include <babeltrace/graph/self-component-sink.h>
-#include <babeltrace/graph/component-sink-const.h>
-#include <babeltrace/graph/component-sink-internal.h>
-#include <babeltrace/graph/component-internal.h>
-#include <babeltrace/graph/graph.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/value.h>
+#include <babeltrace2/graph/self-component-sink.h>
+#include <babeltrace2/graph/component-sink-const.h>
+#include <babeltrace2/graph/component-sink-internal.h>
+#include <babeltrace2/graph/component-internal.h>
+#include <babeltrace2/graph/graph.h>
 
 BT_HIDDEN
 void bt_component_sink_destroy(struct bt_component *component)
@@ -117,14 +117,13 @@ enum bt_self_component_status bt_self_component_sink_add_input_port(
                const char *name, void *user_data,
                struct bt_self_component_port_input **self_port)
 {
-       int status = BT_SELF_COMPONENT_STATUS_OK;
+       enum bt_self_component_status status;
        struct bt_port *port = NULL;
        struct bt_component *comp = (void *) self_comp;
 
        /* bt_component_add_input_port() logs details/errors */
-       port = (void *) bt_component_add_input_port(comp, name, user_data);
-       if (!port) {
-               status = BT_SELF_COMPONENT_STATUS_NOMEM;
+       status = bt_component_add_input_port(comp, name, user_data, &port);
+       if (status != BT_SELF_COMPONENT_STATUS_OK) {
                goto end;
        }