X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fgraph%2Fcomponent-descriptor-set.c;h=631157d363fa6dab6dd041b1b55b08f0b3630d8a;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hp=b0668a5ae1e99b71227f020e1fd650ff4e027923;hpb=21a9f056fd7d86d18aa7a1700c7f47d93eb1adeb;p=babeltrace.git

diff --git a/src/lib/graph/component-descriptor-set.c b/src/lib/graph/component-descriptor-set.c
index b0668a5a..631157d3 100644
--- a/src/lib/graph/component-descriptor-set.c
+++ b/src/lib/graph/component-descriptor-set.c
@@ -1,24 +1,8 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2019 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2017 Jérémie Galarneau <jeremie.galarneau@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.
- *
- * 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.
  */
 
 #define BT_LOG_TAG "LIB/COMP-DESCR-SET"
@@ -30,7 +14,6 @@
 #include "common/common.h"
 #include <babeltrace2/types.h>
 #include <babeltrace2/value.h>
-#include <babeltrace2/value-const.h>
 #include <unistd.h>
 #include <glib.h>
 
@@ -86,6 +69,8 @@ struct bt_component_descriptor_set *bt_component_descriptor_set_create(void)
 {
 	struct bt_component_descriptor_set *comp_descr_set;
 
+	BT_ASSERT_PRE_NO_ERROR();
+
 	BT_LOGI_STR("Creating component descriptor set object.");
 	comp_descr_set = g_new0(struct bt_component_descriptor_set, 1);
 	if (!comp_descr_set) {
@@ -140,6 +125,7 @@ bt_component_descriptor_set_add_descriptor_with_initialize_method_data(
 	struct bt_component_descriptor_set_entry *entry = NULL;
 	GPtrArray *comp_descr_array = NULL;
 
+	BT_ASSERT_PRE_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(comp_descr_set, "Component descriptor set");
 	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
 	BT_ASSERT_PRE(!params || bt_value_is_map(params),
@@ -169,10 +155,10 @@ bt_component_descriptor_set_add_descriptor_with_initialize_method_data(
 	}
 
 	entry->comp_cls = (void *) comp_cls;
-	bt_object_get_no_null_check(entry->comp_cls);
+	bt_object_get_ref_no_null_check(entry->comp_cls);
 	bt_component_class_freeze(entry->comp_cls);
 	entry->params = (void *) params;
-	bt_object_get_no_null_check(entry->params);
+	bt_object_get_ref_no_null_check(entry->params);
 	bt_value_freeze(entry->params);
 	entry->init_method_data = init_method_data;
 
@@ -188,7 +174,7 @@ bt_component_descriptor_set_add_descriptor_with_initialize_method_data(
 		comp_descr_array = comp_descr_set->sinks;
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	BT_ASSERT(comp_descr_array);
@@ -214,6 +200,8 @@ bt_component_descriptor_set_add_descriptor(
 		const struct bt_component_class *comp_cls,
 		const struct bt_value *params)
 {
+	BT_ASSERT_PRE_NO_ERROR();
+
 	return bt_component_descriptor_set_add_descriptor_with_initialize_method_data(
 		comp_descr_set, comp_cls, params, NULL);
 }