Move to kernel style SPDX license identifiers

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

diff --git a/src/lib/error.h b/src/lib/error.h
index e23494d2c3931d31ca0fdcd689dd14f9ba93f652..8095a930c8b62a5317ff02ec3faae662198652f4 100644 (file)
--- a/src/lib/error.h
+++ b/src/lib/error.h
@@ -1,32 +1,15 @@
-#ifndef BABELTRACE_ERROR_INTERNAL_H
-#define BABELTRACE_ERROR_INTERNAL_H
-
 /*
- * Copyright (c) 2019 Philippe Proulx <pproulx@efficios.com>
+ * SPDX-License-Identifier: MIT
  *
- * 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.
+ * Copyright (c) 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
+#ifndef BABELTRACE_ERROR_INTERNAL_H
+#define BABELTRACE_ERROR_INTERNAL_H
+
 #include <stdarg.h>
 #include <glib.h>
-#include <babeltrace2/error-const.h>
-#include <babeltrace2/error-cause-const.h>
+#include <babeltrace2/babeltrace.h>
 #include "lib/object.h"
 #include "common/macros.h"
 
@@ -76,13 +59,13 @@ const char *bt_error_cause_actor_type_string(
 {
        switch (actor_type) {
        case BT_ERROR_CAUSE_ACTOR_TYPE_UNKNOWN:
-               return "BT_ERROR_CAUSE_ACTOR_TYPE_UNKNOWN";
+               return "UNKNOWN";
        case BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT:
-               return "BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT";
+               return "COMPONENT";
        case BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS:
-               return "BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS";
+               return "COMPONENT_CLASS";
        case BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR:
-               return "BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR";
+               return "MESSAGE_ITERATOR";
        default:
                return "(unknown)";
        }
@@ -94,25 +77,25 @@ struct bt_error *bt_error_create(void);
 BT_HIDDEN
 void bt_error_destroy(struct bt_error *error);
 
-BT_HIDDEN
+BT_HIDDEN __BT_ATTR_FORMAT_PRINTF(5, 0)
 int bt_error_append_cause_from_unknown(struct bt_error *error,
                const char *module_name, const char *file_name,
                uint64_t line_no, const char *msg_fmt, va_list args);
 
-BT_HIDDEN
+BT_HIDDEN __BT_ATTR_FORMAT_PRINTF(5, 0)
 int bt_error_append_cause_from_component(
                struct bt_error *error, bt_self_component *self_comp,
                const char *file_name, uint64_t line_no,
                const char *msg_fmt, va_list args);
 
-BT_HIDDEN
+BT_HIDDEN __BT_ATTR_FORMAT_PRINTF(5, 0)
 int bt_error_append_cause_from_component_class(
                struct bt_error *error,
                bt_self_component_class *self_comp_class,
                const char *file_name, uint64_t line_no,
                const char *msg_fmt, va_list args);
 
-BT_HIDDEN
+BT_HIDDEN __BT_ATTR_FORMAT_PRINTF(5, 0)
 int bt_error_append_cause_from_message_iterator(
                struct bt_error *error, bt_self_message_iterator *self_iter,
                const char *file_name, uint64_t line_no,