Port: Fix libuuid compat on mingw

[babeltrace.git] / lib / ctf-ir / trace.c

diff --git a/lib/ctf-ir/trace.c b/lib/ctf-ir/trace.c
index fe0d362ea8d893b3fc819768545207ed426e76dc..37fa2763f93859fb265cabdfb15c40ee50c6428b 100644 (file)
--- a/lib/ctf-ir/trace.c
+++ b/lib/ctf-ir/trace.c
@@ -93,7 +93,6 @@ const unsigned int field_type_aliases_sizes[] = {
 struct bt_ctf_trace *bt_ctf_trace_create(void)
 {
        struct bt_ctf_trace *trace = NULL;
-       struct bt_ctf_field_type *packet_header_type = NULL;
 
        trace = g_new0(struct bt_ctf_trace, 1);
        if (!trace) {
@@ -102,7 +101,7 @@ struct bt_ctf_trace *bt_ctf_trace_create(void)
        }
 
        BT_LOGD_STR("Creating trace object.");
-       trace->native_byte_order = BT_CTF_BYTE_ORDER_NATIVE;
+       trace->native_byte_order = BT_CTF_BYTE_ORDER_NONE;
        bt_object_init(trace, bt_ctf_trace_destroy);
        trace->clocks = g_ptr_array_new_with_free_func(
                (GDestroyNotify) bt_put);
@@ -125,13 +124,6 @@ struct bt_ctf_trace *bt_ctf_trace_create(void)
                goto error;
        }
 
-       packet_header_type = bt_ctf_field_type_structure_create();
-       if (!packet_header_type) {
-               goto error;
-       }
-
-       BT_MOVE(trace->packet_header_type, packet_header_type);
-
        /* Create the environment array object */
        trace->environment = bt_ctf_attributes_create();
        if (!trace->environment) {
@@ -158,7 +150,6 @@ struct bt_ctf_trace *bt_ctf_trace_create(void)
 
 error:
        BT_PUT(trace);
-       bt_put(packet_header_type);
        return trace;
 }
 
@@ -247,7 +238,7 @@ int bt_ctf_trace_set_uuid(struct bt_ctf_trace *trace, const unsigned char *uuid)
                goto end;
        }
 
-       memcpy(trace->uuid, uuid, sizeof(uuid_t));
+       memcpy(trace->uuid, uuid, BABELTRACE_UUID_LEN);
        trace->uuid_set = BT_TRUE;
        BT_LOGV("Set trace's UUID: addr=%p, name=\"%s\", "
                "uuid=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\"",
@@ -1122,17 +1113,6 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
                stream_class, bt_ctf_stream_class_get_name(stream_class),
                bt_ctf_stream_class_get_id(stream_class));
 
-       /*
-        * At the end of this function we freeze the trace, so its
-        * native byte order must NOT be BT_CTF_BYTE_ORDER_NATIVE.
-        */
-       if (trace->native_byte_order == BT_CTF_BYTE_ORDER_NATIVE) {
-               BT_LOGW_STR("Invalid parameter: trace's byte order cannot be BT_CTF_BYTE_ORDER_NATIVE at this point; "
-                       "set it with bt_ctf_trace_set_native_byte_order().");
-               ret = -1;
-               goto end;
-       }
-
        current_parent_trace = bt_ctf_stream_class_get_trace(stream_class);
        if (current_parent_trace) {
                /* Stream class is already associated to a trace, abort. */
@@ -1660,8 +1640,9 @@ int append_trace_metadata(struct bt_ctf_trace *trace,
        unsigned char *uuid = trace->uuid;
        int ret = 0;
 
-       if (trace->native_byte_order == BT_CTF_BYTE_ORDER_NATIVE) {
-               BT_LOGW("Invalid parameter: trace's byte order cannot be BT_CTF_BYTE_ORDER_NATIVE at this point; "
+       if (trace->native_byte_order == BT_CTF_BYTE_ORDER_NATIVE ||
+                       trace->native_byte_order == BT_CTF_BYTE_ORDER_NONE) {
+               BT_LOGW("Invalid parameter: trace's byte order cannot be BT_CTF_BYTE_ORDER_NATIVE or BT_CTF_BYTE_ORDER_NONE at this point; "
                        "set it with bt_ctf_trace_set_native_byte_order(): "
                        "addr=%p, name=\"%s\"",
                        trace, bt_ctf_trace_get_name(trace));
@@ -1863,6 +1844,15 @@ int bt_ctf_trace_set_native_byte_order(struct bt_ctf_trace *trace,
                goto end;
        }
 
+       if (trace->is_created_by_writer &&
+                       byte_order == BT_CTF_BYTE_ORDER_NONE) {
+               BT_LOGW("Invalid parameter: BT_CTF_BYTE_ORDER_NONE byte order is not allowed for a CTF writer trace: "
+                       "addr=%p, name=\"%s\"",
+                       trace, bt_ctf_trace_get_name(trace));
+               ret = -1;
+               goto end;
+       }
+
        if (byte_order != BT_CTF_BYTE_ORDER_LITTLE_ENDIAN &&
                        byte_order != BT_CTF_BYTE_ORDER_BIG_ENDIAN &&
                        byte_order != BT_CTF_BYTE_ORDER_NETWORK) {