Move to kernel style SPDX license identifiers

[babeltrace.git] / src / lib / error.c

diff --git a/src/lib/error.c b/src/lib/error.c
index b19fe1dab6f0e7ddf4f788abf40b91ffcb12d0ad..21e92c4cac0c0358ba6bf7297c166649f5014be7 100644 (file)
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -1,23 +1,7 @@
 /*
- * Copyright (c) 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 (c) 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/ERROR"
@@ -25,8 +9,7 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <babeltrace2/error-const.h>
-#include <babeltrace2/error-cause-const.h>
+#include <babeltrace2/babeltrace.h>
 
 #include "error.h"
 #include "graph/message/iterator.h"
@@ -262,7 +245,7 @@ void append_component_class_id_str(GString *str,
                type_str = "sink";
                break;
        default:
-               abort();
+               bt_common_abort();
        }
 
        if (comp_class_id->plugin_name->len > 0) {
@@ -364,12 +347,13 @@ end:
        return cause;
 }
 
+static
 struct bt_error_cause_message_iterator_actor *
 create_error_cause_message_iterator_actor(struct bt_message_iterator *iter,
                const char *file_name, uint64_t line_no)
 {
        struct bt_error_cause_message_iterator_actor *cause;
-       struct bt_self_component_port_input_message_iterator *input_port_iter;
+       struct bt_message_iterator *input_port_iter;
        int ret;
 
        BT_LOGD_STR("Creating error cause object (message iterator actor).");
@@ -379,8 +363,6 @@ create_error_cause_message_iterator_actor(struct bt_message_iterator *iter,
         * message iterator, which is a self component port input
         * message iterator.
         */
-       BT_ASSERT(iter->type ==
-               BT_MESSAGE_ITERATOR_TYPE_SELF_COMPONENT_PORT_INPUT);
        input_port_iter = (void *) iter;
        cause = g_new0(struct bt_error_cause_message_iterator_actor, 1);
        if (!cause) {
@@ -487,10 +469,10 @@ int bt_error_append_cause_from_unknown(struct bt_error *error,
        struct bt_error_cause *cause = NULL;
        int status = BT_FUNC_STATUS_OK;
 
-       BT_ASSERT_PRE_NON_NULL(error, "Error");
-       BT_ASSERT_PRE_NON_NULL(module_name, "Module name");
-       BT_ASSERT_PRE_NON_NULL(file_name, "Function name");
-       BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+       BT_ASSERT(error);
+       BT_ASSERT(module_name);
+       BT_ASSERT(file_name);
+       BT_ASSERT(msg_fmt);
        BT_LOGD("Appending error cause from unknown actor: "
                "module-name=\"%s\", func-name=\"%s\", line-no=%" PRIu64,
                module_name, file_name, line_no);
@@ -520,10 +502,10 @@ int bt_error_append_cause_from_component(
        struct bt_error_cause_component_actor *cause = NULL;
        int status = BT_FUNC_STATUS_OK;
 
-       BT_ASSERT_PRE_NON_NULL(error, "Error");
-       BT_ASSERT_PRE_NON_NULL(self_comp, "Component");
-       BT_ASSERT_PRE_NON_NULL(file_name, "Function name");
-       BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+       BT_ASSERT(error);
+       BT_ASSERT(self_comp);
+       BT_ASSERT(file_name);
+       BT_ASSERT(msg_fmt);
        BT_LIB_LOGD("Appending error cause from component actor: %![comp-]+c",
                self_comp);
        cause = create_error_cause_component_actor((void *) self_comp,
@@ -554,10 +536,10 @@ int bt_error_append_cause_from_component_class(
        struct bt_error_cause_component_class_actor *cause = NULL;
        int status = BT_FUNC_STATUS_OK;
 
-       BT_ASSERT_PRE_NON_NULL(error, "Error");
-       BT_ASSERT_PRE_NON_NULL(self_comp_class, "Component class");
-       BT_ASSERT_PRE_NON_NULL(file_name, "Function name");
-       BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+       BT_ASSERT(error);
+       BT_ASSERT(self_comp_class);
+       BT_ASSERT(file_name);
+       BT_ASSERT(msg_fmt);
        BT_LIB_LOGD("Appending error cause from component class actor: "
                "%![comp-cls-]+C", self_comp_class);
        cause = create_error_cause_component_class_actor(
@@ -587,10 +569,10 @@ int bt_error_append_cause_from_message_iterator(
        struct bt_error_cause_message_iterator_actor *cause = NULL;
        int status = BT_FUNC_STATUS_OK;
 
-       BT_ASSERT_PRE_NON_NULL(error, "Error");
-       BT_ASSERT_PRE_NON_NULL(self_iter, "Message iterator");
-       BT_ASSERT_PRE_NON_NULL(file_name, "Function name");
-       BT_ASSERT_PRE_NON_NULL(msg_fmt, "Message format string");
+       BT_ASSERT(error);
+       BT_ASSERT(self_iter);
+       BT_ASSERT(file_name);
+       BT_ASSERT(msg_fmt);
        BT_LIB_LOGD("Appending error cause from message iterator actor: "
                "%![comp-]+i", self_iter);
        cause = create_error_cause_message_iterator_actor(