Always evaluate BT_ASSERT(); add BT_ASSERT_DBG() for debug mode only

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

diff --git a/src/ctf-writer/writer.c b/src/ctf-writer/writer.c
index 650d68f30d6879a50016c517b9ca092e64aad604..246d4ca10a739d37e7a64290c393d6b44009264a 100644 (file)
--- a/src/ctf-writer/writer.c
+++ b/src/ctf-writer/writer.c
@@ -37,7 +37,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 +152,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 +217,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 +236,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);