X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-filter.c;h=5efff1ab75bb9ae3ca1babb38f1eaea99e464876;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hp=ab48fb75f379f0cc4481c2977db672e176ec157a;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/lib/graph/component-filter.c b/src/lib/graph/component-filter.c
index ab48fb75..5efff1ab 100644
--- a/src/lib/graph/component-filter.c
+++ b/src/lib/graph/component-filter.c
@@ -21,8 +21,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COMP-FILTER"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/COMPONENT-FILTER"
+#include "lib/logging.h"
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
@@ -35,6 +35,7 @@
 #include "component-filter.h"
 #include "component.h"
 #include "component-class.h"
+#include "lib/func-status.h"
 
 BT_HIDDEN
 void bt_component_filter_destroy(struct bt_component *component)
@@ -111,18 +112,18 @@ bt_self_component_filter_borrow_output_port_by_index(
 		(void *) comp, index);
 }
 
-enum bt_self_component_status bt_self_component_filter_add_output_port(
+enum bt_self_component_add_port_status bt_self_component_filter_add_output_port(
 		struct bt_self_component_filter *self_comp,
 		const char *name, void *user_data,
 		struct bt_self_component_port_output **self_port)
 {
 	struct bt_component *comp = (void *) self_comp;
-	enum bt_self_component_status status;
+	enum bt_self_component_add_port_status status;
 	struct bt_port *port = NULL;
 
 	/* bt_component_add_output_port() logs details and errors */
 	status = bt_component_add_output_port(comp, name, user_data, &port);
-	if (status != BT_SELF_COMPONENT_STATUS_OK) {
+	if (status != BT_FUNC_STATUS_OK) {
 		goto end;
 	}
 
@@ -179,18 +180,18 @@ bt_self_component_filter_borrow_input_port_by_index(
 		(void *) component, index);
 }
 
-enum bt_self_component_status bt_self_component_filter_add_input_port(
+enum bt_self_component_add_port_status bt_self_component_filter_add_input_port(
 		struct bt_self_component_filter *self_comp,
 		const char *name, void *user_data,
 		struct bt_self_component_port_input **self_port)
 {
-	enum bt_self_component_status status;
+	enum bt_self_component_add_port_status status;
 	struct bt_port *port = NULL;
 	struct bt_component *comp = (void *) self_comp;
 
 	/* bt_component_add_input_port() logs details/errors */
 	status = bt_component_add_input_port(comp, name, user_data, &port);
-	if (status != BT_SELF_COMPONENT_STATUS_OK) {
+	if (status != BT_FUNC_STATUS_OK) {
 		goto end;
 	}