Move to kernel style SPDX license identifiers

[babeltrace.git] / src / ctf-writer / writer.c

diff --git a/src/ctf-writer/writer.c b/src/ctf-writer/writer.c
index 650d68f30d6879a50016c517b9ca092e64aad604..9b969dd02d83a43d08d7a55c5ddce635a44d0ad9 100644 (file)
--- a/src/ctf-writer/writer.c
+++ b/src/ctf-writer/writer.c
@@ -1,29 +1,9 @@
 /*
- * writer.c
- *
- * Babeltrace CTF Writer
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: 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.
+ * Babeltrace CTF Writer
  */
 
 #define BT_LOG_TAG "CTF-WRITER"
@@ -37,7 +17,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <babeltrace2/ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/object.h>
 
 #include "common/assert.h"
 #include "compat/compiler.h"
@@ -152,7 +132,7 @@ struct bt_ctf_writer *bt_ctf_writer_create(const char *path)
 
        /* Default to little-endian */
        ret = bt_ctf_writer_set_byte_order(writer, BT_CTF_BYTE_ORDER_NATIVE);
-       BT_ASSERT(ret == 0);
+       BT_ASSERT_DBG(ret == 0);
 
        /* Create trace directory if necessary and open a metadata file */
        if (g_mkdir_with_parents(path, S_IRWXU | S_IRWXG)) {
@@ -217,7 +197,7 @@ struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
 {
        struct bt_ctf_stream *stream = NULL;
        int stream_class_count;
-       bt_bool stream_class_found = BT_FALSE;
+       bt_ctf_bool stream_class_found = BT_CTF_FALSE;
        int i;
 
        if (!writer || !stream_class) {
@@ -236,7 +216,7 @@ struct bt_ctf_stream *bt_ctf_writer_create_stream(struct bt_ctf_writer *writer,
                                writer->trace, i);
 
                if (existing_stream_class == stream_class) {
-                       stream_class_found = BT_TRUE;
+                       stream_class_found = BT_CTF_TRUE;
                }
 
                BT_CTF_OBJECT_PUT_REF_AND_RESET(existing_stream_class);
@@ -447,7 +427,7 @@ const char *bt_ctf_get_byte_order_string(enum bt_ctf_byte_order byte_order)
                string = "native";
                break;
        default:
-               abort();
+               bt_common_abort();
        }
 
        return string;