bt2: add `StringValue.__contains__()` method

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

diff --git a/src/ctf-writer/trace.c b/src/ctf-writer/trace.c
index f7ef692d13abf66be23ae43456253ec56dec6573..e9a96247cdfd78900d7e8769d0ffe522931e4ccf 100644 (file)
--- a/src/ctf-writer/trace.c
+++ b/src/ctf-writer/trace.c
@@ -29,9 +29,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <babeltrace2/ctf-writer/event.h>
-#include <babeltrace2/ctf-writer/object.h>
-#include <babeltrace2/ctf-writer/utils.h>
+#include <babeltrace2-ctf-writer/event.h>
+#include <babeltrace2-ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/utils.h>
 #include <babeltrace2/types.h>
 
 #include "common/assert.h"
@@ -205,7 +205,7 @@ int bt_ctf_trace_common_set_uuid(struct bt_ctf_trace_common *trace,
        }
 
        bt_uuid_copy(trace->uuid, uuid);
-       trace->uuid_set = BT_TRUE;
+       trace->uuid_set = BT_CTF_TRUE;
        BT_LOGT("Set trace's UUID: addr=%p, name=\"%s\", "
                "uuid=\"" BT_UUID_FMT "\"",
                trace, bt_ctf_trace_common_get_name(trace),
@@ -899,7 +899,7 @@ int bt_ctf_trace_common_add_stream_class(struct bt_ctf_trace_common *trace,
        struct bt_ctf_field_type_common *packet_context_type = NULL;
        struct bt_ctf_field_type_common *event_header_type = NULL;
        struct bt_ctf_field_type_common *stream_event_ctx_type = NULL;
-       int64_t event_class_count;
+       int64_t event_class_count = 0;
        struct bt_ctf_trace_common *current_parent_trace = NULL;
        struct bt_ctf_clock_class *expected_clock_class =
                bt_ctf_object_get_ref(init_expected_clock_class);
@@ -1256,7 +1256,7 @@ end:
 }
 
 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)
 {
        struct bt_ctf_search_query query = { .value = clock_class, .found = 0 };