X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-source.c;h=1bbb0e73aa5fe9506a187f0174be5e3cf917a6f4;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=404da6917a7233b4123de42d861007aa8751a3b6;hpb=350ad6c1c5f45a4e90c33e3c1354125c209bbf02;p=babeltrace.git

diff --git a/src/lib/graph/component-source.c b/src/lib/graph/component-source.c
index 404da691..1bbb0e73 100644
--- a/src/lib/graph/component-source.c
+++ b/src/lib/graph/component-source.c
@@ -22,20 +22,20 @@
  */
 
 #define BT_LOG_TAG "LIB/COMPONENT-SOURCE"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
 #include "compat/compiler.h"
-#include <babeltrace2/graph/self-component-source.h>
-#include <babeltrace2/graph/component-source-const.h>
-#include <babeltrace2/graph/message-iterator-const.h>
+#include <babeltrace2/graph/self-component.h>
+#include <babeltrace2/graph/component.h>
 #include <babeltrace2/graph/graph.h>
 
 #include "component-source.h"
 #include "component.h"
 #include "port.h"
 #include "message/iterator.h"
+#include "lib/func-status.h"
 
 BT_HIDDEN
 void bt_component_source_destroy(struct bt_component *component)
@@ -48,9 +48,12 @@ struct bt_component *bt_component_source_create(
 {
 	struct bt_component_source *source = NULL;
 
+	BT_ASSERT_PRE_NO_ERROR();
+
 	source = g_new0(struct bt_component_source, 1);
 	if (!source) {
-		BT_LOGE_STR("Failed to allocate one source component.");
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to allocate one source component.");
 		goto end;
 	}
 
@@ -64,12 +67,12 @@ bt_component_source_borrow_class_const(
 {
 	struct bt_component_class *cls;
 
-	BT_ASSERT_PRE_NON_NULL(component, "Component");
+	BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
 
 	cls = component->parent.class;
 
-	BT_ASSERT(cls);
-	BT_ASSERT(cls->type == BT_COMPONENT_CLASS_TYPE_SOURCE);
+	BT_ASSERT_DBG(cls);
+	BT_ASSERT_DBG(cls->type == BT_COMPONENT_CLASS_TYPE_SOURCE);
 
 	return (bt_component_class_source *) cls;
 }
@@ -110,25 +113,26 @@ bt_self_component_source_borrow_output_port_by_index(
 		(void *) comp, index);
 }
 
-enum bt_self_component_status bt_self_component_source_add_output_port(
+enum bt_self_component_add_port_status bt_self_component_source_add_output_port(
 		struct bt_self_component_source *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_ASSERT_PRE_NO_ERROR();
+
 	/* 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;
 	}
 
 	if (self_port) {
 		/* Move reference to user */
 		*self_port = (void *) port;
-		port = NULL;
 	}
 
 end: