Move `include/babeltrace2/ctf-writer` -> `include/babeltrace2-ctf-writer`

[babeltrace.git] / tests / ctf-writer / ctf_writer.c

diff --git a/tests/ctf-writer/ctf_writer.c b/tests/ctf-writer/ctf_writer.c
index 1ed4cc6737d764f730c1b8d2b7e00215b1be392e..73edf75c9857a550cf68914f9c45448af10ba3fd 100644 (file)
--- a/tests/ctf-writer/ctf_writer.c
+++ b/tests/ctf-writer/ctf_writer.c
@@ -19,17 +19,16 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <babeltrace2/ctf-writer/writer.h>
-#include <babeltrace2/ctf-writer/clock.h>
-#include <babeltrace2/ctf-writer/clock-class.h>
-#include <babeltrace2/ctf-writer/stream.h>
-#include <babeltrace2/ctf-writer/event.h>
-#include <babeltrace2/ctf-writer/event-types.h>
-#include <babeltrace2/ctf-writer/event-fields.h>
-#include <babeltrace2/ctf-writer/stream-class.h>
-#include <babeltrace2/ctf-writer/trace.h>
-#include <babeltrace2/ctf/events.h>
-#include <babeltrace2/value.h>
+#include <babeltrace2-ctf-writer/writer.h>
+#include <babeltrace2-ctf-writer/clock.h>
+#include <babeltrace2-ctf-writer/clock-class.h>
+#include <babeltrace2-ctf-writer/stream.h>
+#include <babeltrace2-ctf-writer/event.h>
+#include <babeltrace2-ctf-writer/event-types.h>
+#include <babeltrace2-ctf-writer/event-fields.h>
+#include <babeltrace2-ctf-writer/stream-class.h>
+#include <babeltrace2-ctf-writer/trace.h>
+#include <babeltrace2/babeltrace.h>
 #include <glib.h>
 #include <unistd.h>
 #include "compat/stdlib.h"
@@ -38,6 +37,7 @@
 #include "compat/stdio.h"
 #include <string.h>
 #include "common/assert.h"
+#include "common/uuid.h"
 #include <fcntl.h>
 #include "tap/tap.h"
 #include <math.h>
@@ -72,7 +72,7 @@ static unsigned int packet_resize_test_length = PACKET_RESIZE_TEST_DEF_LENGTH;
 
 /* Return 1 if uuids match, zero if different. */
 static
-int uuid_match(const unsigned char *uuid_a, const unsigned char *uuid_b)
+int uuid_match(const uint8_t *uuid_a, const uint8_t *uuid_b)
 {
        int ret = 0;
        int i;
@@ -1600,8 +1600,8 @@ int main(int argc, char **argv)
        struct bt_ctf_stream *stream1;
        struct bt_ctf_stream *stream;
        const char *ret_string;
-       const unsigned char *ret_uuid;
-       unsigned char tmp_uuid[16] = { 0 };
+       const uint8_t *ret_uuid;
+       bt_uuid_t tmp_uuid = { 0 };
        struct bt_ctf_field_type *packet_context_type,
                *packet_context_field_type,
                *packet_header_type,