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

diff --git a/src/lib/graph/component-source.c b/src/lib/graph/component-source.c
index e62c5bd1..1bbb0e73 100644
--- a/src/lib/graph/component-source.c
+++ b/src/lib/graph/component-source.c
@@ -27,8 +27,8 @@
 #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/self-component.h>
+#include <babeltrace2/graph/component.h>
 #include <babeltrace2/graph/graph.h>
 
 #include "component-source.h"
@@ -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;
 }
@@ -119,6 +122,8 @@ enum bt_self_component_add_port_status bt_self_component_source_add_output_port(
 	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_FUNC_STATUS_OK) {
@@ -128,7 +133,6 @@ enum bt_self_component_add_port_status bt_self_component_source_add_output_port(
 	if (self_port) {
 		/* Move reference to user */
 		*self_port = (void *) port;
-		port = NULL;
 	}
 
 end: