/*
+ * 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"
#include "lib/logging.h"
#include "common/assert.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
#include "compat/compiler.h"
#include "common/common.h"
#include <babeltrace2/types.h>
#include <babeltrace2/value.h>
-#include <babeltrace2/value-const.h>
#include <unistd.h>
#include <glib.h>
{
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) {
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),
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);
}