Move to kernel style SPDX license identifiers

[babeltrace.git] / src / lib / trace-ir / field-wrapper.c

diff --git a/src/lib/trace-ir/field-wrapper.c b/src/lib/trace-ir/field-wrapper.c
index 778d86506600a944f9eafd114823f7bae2f4bb38..a26958a72291d22b8ecb482990d1c7236651149d 100644 (file)
--- a/src/lib/trace-ir/field-wrapper.c
+++ b/src/lib/trace-ir/field-wrapper.c
@@ -1,27 +1,11 @@
 /*
- * Copyright 2018 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:
+ * SPDX-License-Identifier: MIT
  *
- * 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 2018 Philippe Proulx <pproulx@efficios.com>
  */
 
-#define BT_LOG_TAG "FIELD-WRAPPER"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/FIELD-WRAPPER"
+#include "lib/logging.h"
 
 #include "lib/object-pool.h"
 #include "lib/object.h"
@@ -39,7 +23,8 @@ struct bt_field_wrapper *bt_field_wrapper_new(void *data)
        BT_LOGD_STR("Creating empty field wrapper object.");
 
        if (!field_wrapper) {
-               BT_LOGE("Failed to allocate one field wrapper.");
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Failed to allocate one field wrapper.");
                goto end;
        }
 
@@ -72,11 +57,12 @@ struct bt_field_wrapper *bt_field_wrapper_create(
 {
        struct bt_field_wrapper *field_wrapper = NULL;
 
-       BT_ASSERT(pool);
-       BT_ASSERT(fc);
+       BT_ASSERT_DBG(pool);
+       BT_ASSERT_DBG(fc);
        field_wrapper = bt_object_pool_create_object(pool);
        if (!field_wrapper) {
-               BT_LIB_LOGE("Cannot allocate one field wrapper from field wrapper pool: "
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Cannot allocate one field wrapper from field wrapper pool: "
                        "%![pool-]+o", pool);
                goto error;
        }
@@ -84,7 +70,8 @@ struct bt_field_wrapper *bt_field_wrapper_create(
        if (!field_wrapper->field) {
                field_wrapper->field = (void *) bt_field_create(fc);
                if (!field_wrapper->field) {
-                       BT_LIB_LOGE("Cannot create field wrapper from field class: "
+                       BT_LIB_LOGE_APPEND_CAUSE(
+                               "Cannot create field wrapper from field class: "
                                "%![fc-]+F", fc);
                        goto error;
                }