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

[babeltrace.git] / src / ctf-writer / trace.h

diff --git a/src/ctf-writer/trace.h b/src/ctf-writer/trace.h
index ae5f1ec3918d6841a8f4f608baf750ff5122c970..63c60798b552118ddb09d91b379b7382d367b5ca 100644 (file)
--- a/src/ctf-writer/trace.h
+++ b/src/ctf-writer/trace.h
@@ -28,11 +28,11 @@
  * http://www.efficios.com/ctf
  */
 
-#include "common/babeltrace.h"
-#include "compat/uuid.h"
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/fields.h>
-#include <babeltrace2/ctf-writer/trace.h>
+#include "common/macros.h"
+#include "common/uuid.h"
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/fields.h>
+#include <babeltrace2-ctf-writer/trace.h>
 #include <babeltrace2/types.h>
 #include <glib.h>
 #include <sys/types.h>
@@ -49,8 +49,8 @@ struct bt_ctf_trace_common {
        struct bt_ctf_object base;
        GString *name;
        int frozen;
-       unsigned char uuid[BABELTRACE_UUID_LEN];
-       bt_bool uuid_set;
+       bt_uuid_t uuid;
+       bt_ctf_bool uuid_set;
        enum bt_ctf_byte_order native_byte_order;
        struct bt_ctf_private_value *environment;
        GPtrArray *clock_classes; /* Array of pointers to bt_ctf_clock_class */
@@ -67,7 +67,7 @@ struct bt_ctf_trace_common {
 };
 
 BT_HIDDEN
-bt_bool bt_ctf_trace_common_has_clock_class(struct bt_ctf_trace_common *trace,
+bt_ctf_bool bt_ctf_trace_common_has_clock_class(struct bt_ctf_trace_common *trace,
                struct bt_ctf_clock_class *clock_class);
 
 BT_HIDDEN
@@ -88,14 +88,14 @@ BT_HIDDEN
 int bt_ctf_trace_common_set_name(struct bt_ctf_trace_common *trace, const char *name);
 
 static inline
-const unsigned char *bt_ctf_trace_common_get_uuid(struct bt_ctf_trace_common *trace)
+const uint8_t *bt_ctf_trace_common_get_uuid(struct bt_ctf_trace_common *trace)
 {
        BT_CTF_ASSERT_PRE_NON_NULL(trace, "Trace");
        return trace->uuid_set ? trace->uuid : NULL;
 }
 
 BT_HIDDEN
-int bt_ctf_trace_common_set_uuid(struct bt_ctf_trace_common *trace, const unsigned char *uuid);
+int bt_ctf_trace_common_set_uuid(struct bt_ctf_trace_common *trace, const uint8_t *uuid);
 
 BT_HIDDEN
 int bt_ctf_trace_common_set_environment_field(struct bt_ctf_trace_common *trace,
@@ -117,7 +117,7 @@ int64_t bt_ctf_trace_common_get_environment_field_count(
 
        BT_CTF_ASSERT_PRE_NON_NULL(trace, "Trace");
        ret = bt_ctf_attributes_get_count(trace->environment);
-       BT_ASSERT(ret >= 0);
+       BT_ASSERT_DBG(ret >= 0);
        return ret;
 }