X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-class-sink-simple.c;h=812e3b5fe4ed86e32a6b61506669535f9fe4a7e7;hb=46c7e45bc65331d6b43ffc44c7c30265d0a03480;hp=f8ac7ad1a2ff25b3dde46c5729a76946b29a005e;hpb=43c59509042845f8d42c3e99ec74d45fa2dc0908;p=babeltrace.git

diff --git a/src/lib/graph/component-class-sink-simple.c b/src/lib/graph/component-class-sink-simple.c
index f8ac7ad1..812e3b5f 100644
--- a/src/lib/graph/component-class-sink-simple.c
+++ b/src/lib/graph/component-class-sink-simple.c
@@ -1,23 +1,7 @@
 /*
- * Copyright 2017-2019 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2017-2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/COMPONENT-CLASS-SINK-SIMPLE"
@@ -25,7 +9,7 @@
 
 #include "common/assert.h"
 #include "common/common.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include "lib/object.h"
 #include <babeltrace2/graph/component-class.h>
 #include <babeltrace2/graph/self-component-port.h>
@@ -49,6 +33,15 @@ struct simple_sink_data {
 	struct simple_sink_init_method_data init_method_data;
 };
 
+static
+void simple_sink_data_destroy(struct simple_sink_data *data)
+{
+	if (data) {
+		BT_OBJECT_PUT_REF_AND_RESET(data->msg_iter);
+		g_free(data);
+	}
+}
+
 static
 enum bt_component_class_initialize_method_status simple_sink_init(
 		bt_self_component_sink *self_comp,
@@ -79,10 +72,13 @@ enum bt_component_class_initialize_method_status simple_sink_init(
 		goto end;
 	}
 
+	/* Transfer ownership to component */
 	bt_self_component_set_data(
 		bt_self_component_sink_as_self_component(self_comp), data);
+	data = NULL;
 
 end:
+	simple_sink_data_destroy(data);
 	return status;
 }
 
@@ -92,16 +88,15 @@ void simple_sink_finalize(struct bt_self_component_sink *self_comp)
 	struct simple_sink_data *data = bt_self_component_get_data(
 		bt_self_component_sink_as_self_component(self_comp));
 
-	if (data) {
-		if (data->init_method_data.finalize_func) {
-			/* Call user's finalization function */
-			data->init_method_data.finalize_func(
-				data->init_method_data.user_data);
-		}
+	BT_ASSERT(data);
 
-		BT_OBJECT_PUT_REF_AND_RESET(data->msg_iter);
-		g_free(data);
+	if (data->init_method_data.finalize_func) {
+		/* Call user's finalization function */
+		data->init_method_data.finalize_func(
+			data->init_method_data.user_data);
 	}
+
+	simple_sink_data_destroy(data);
 }
 
 static
@@ -187,12 +182,11 @@ enum bt_component_class_sink_consume_method_status simple_sink_consume(
 	return status;
 }
 
+BT_HIDDEN
 struct bt_component_class_sink *bt_component_class_sink_simple_borrow(void)
 {
 	enum bt_component_class_set_method_status set_method_status;
 
-	BT_ASSERT_PRE_NO_ERROR();
-
 	if (simple_comp_cls) {
 		goto end;
 	}