Cleanup: comment mismatch with code

[babeltrace.git] / converter / babeltrace-log.c

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 563a90f57f1df018d5f75cd18e70a633aea8811b..14d46964da1b11d593ef5f02827bc0c1c9c997c1 100644 (file)
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -45,7 +45,7 @@
 
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/types.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
 #include <babeltrace/endian.h>
 
 #define USEC_PER_SEC 1000000UL
@@ -123,7 +123,7 @@ void write_packet_header(struct ctf_stream_pos *pos, unsigned char *uuid)
        ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
        ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
        assert(!ctf_pos_packet(&dummy));
-       
+
        ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT);
        *(uint32_t *) ctf_get_pos_addr(pos) = 0xC1FC1FC1;
        ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT);
@@ -149,7 +149,7 @@ void write_packet_context(struct ctf_stream_pos *pos)
        ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
        ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
        assert(!ctf_pos_packet(&dummy));
-       
+
        ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
        *(uint64_t *) ctf_get_pos_addr(pos) = ~0ULL;    /* Not known yet */
        pos->content_size_loc = (uint64_t *) ctf_get_pos_addr(pos);
@@ -160,7 +160,7 @@ void write_packet_context(struct ctf_stream_pos *pos)
        ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
        ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
        assert(!ctf_pos_packet(&dummy));
-       
+
        ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
        *(uint64_t *) ctf_get_pos_addr(pos) = pos->packet_size;
        ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
@@ -358,7 +358,7 @@ int main(int argc, char **argv)
 
        metadata_fd = openat(dir_fd, "metadata", O_RDWR|O_CREAT,
                             S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP);
-       if (fd < 0) {
+       if (metadata_fd < 0) {
                perror("openat");
                goto error_closedatastream;
        }