Change -EOF for EOF (it is worth -1), fix assertion

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c
index 51011e1d2906de9e55440f4c101b4e8c5c3b2ac9..76df6edee2f8f1f85ba1cb70ec7bd4964bc7b278 100644 (file)
--- a/converter/babeltrace-lib.c
+++ b/converter/babeltrace-lib.c
@@ -36,8 +36,8 @@ int convert_event(struct ctf_text_stream_pos *sout,
        int len_index;
        int ret;
 
-       if (sin->pos.offset == -EOF)
-               return -EOF;
+       if (sin->pos.offset == EOF)
+               return EOF;
 
        /* Hide event payload struct brackets */
        sout->depth = -1;
@@ -119,7 +119,7 @@ int convert_stream(struct ctf_text_stream_pos *sout,
        /* TODO: order events by timestamps across streams */
        for (;;) {
                ret = convert_event(sout, sin);
-               if (ret == -EOF)
+               if (ret == EOF)
                        break;
                else if (ret) {
                        fprintf(stdout, "[error] Printing event failed.\n");

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 24b754df034192cdb4f617dbeb23b50901eda22f..625b1c097a9de02eab852e1d4d9e9c6273177fa3 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -189,7 +189,7 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
                        assert(0);
                }
                if (pos->cur_index >= pos->packet_index->len) {
-                       pos->offset = -EOF;
+                       pos->offset = EOF;
                        return;
                }
                index = &g_array_index(pos->packet_index, struct packet_index,

diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c
index 9b918954d269dbb4d04c83f2f4146cec7a5b83f1..b5c59ddea1bf4dc9704e096f53c6e5cdc5cc0c74 100644 (file)
--- a/formats/ctf/types/integer.c
+++ b/formats/ctf/types/integer.c
@@ -40,11 +40,11 @@ int _aligned_integer_read(struct stream_pos *ppos,
        int rbo = (integer_declaration->byte_order != BYTE_ORDER);      /* reverse byte order */
 
        ctf_align_pos(pos, integer_declaration->p.alignment);
-       assert(!(pos->offset % CHAR_BIT));
 
        if (!ctf_pos_access_ok(pos, integer_declaration->len))
                return -EFAULT;
 
+       assert(!(pos->offset % CHAR_BIT));
        if (!integer_declaration->signedness) {
                switch (integer_declaration->len) {
                case 8:
@@ -142,11 +142,11 @@ int _aligned_integer_write(struct stream_pos *ppos,
        int rbo = (integer_declaration->byte_order != BYTE_ORDER);      /* reverse byte order */
 
        ctf_align_pos(pos, integer_declaration->p.alignment);
-       assert(!(pos->offset % CHAR_BIT));
 
        if (!ctf_pos_access_ok(pos, integer_declaration->len))
                return -EFAULT;
 
+       assert(!(pos->offset % CHAR_BIT));
        if (pos->dummy)
                goto end;
        if (!integer_declaration->signedness) {

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index a8f75a976a00dc7a08733dc252dd7a0243d07a30..197a7e135f276825ae9e29f85a70b20636755c13 100644 (file)
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -35,7 +35,7 @@ int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
        ctf_align_pos(pos, string_declaration->p.alignment);
 
        srcaddr = ctf_get_pos_addr(pos);
-       if (pos->offset == -EOF)
+       if (pos->offset == EOF)
                return -EFAULT;
        /* Not counting \0 */
        max_len = pos->packet_size - pos->offset - 1;

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index e8cc97b10e64274bc670d45ee5833f0810088a7c..95c0d5e2659056aeee33b1d09d0f23ce8a7fe2a4 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -20,6 +20,7 @@
  */
 
 #include <babeltrace/types.h>
+#include <babeltrace/babeltrace.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -53,7 +54,7 @@ struct ctf_stream_pos {
        size_t content_size;    /* current content size, in bits */
        uint32_t *content_size_loc; /* pointer to current content size */
        char *base;             /* mmap base address */
-       ssize_t offset;         /* offset from base, in bits. -EOF for end of file. */
+       ssize_t offset;         /* offset from base, in bits. EOF for end of file. */
        size_t cur_index;       /* current index in packet index */
 
        int dummy;              /* dummy position, for length calculation */
@@ -91,7 +92,8 @@ void ctf_fini_pos(struct ctf_stream_pos *pos);
 static inline
 void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 {
-       if (pos->offset == -EOF)
+       printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset);
+       if (pos->offset == EOF)
                return;
 
        if (pos->fd >= 0) {
@@ -99,11 +101,16 @@ void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
                      && (pos->offset + bit_offset >= pos->content_size))
                    || ((pos->prot == PROT_WRITE)
                      && (pos->offset + bit_offset >= pos->packet_size))) {
+                       printf_debug("ctf_move_pos_slow (before call): %zd\n",
+                                    pos->offset);
                        ctf_move_pos_slow(pos, bit_offset, SEEK_CUR);
+                       printf_debug("ctf_move_pos_slow (after call): %zd\n",
+                                    pos->offset);
                        return;
                }
        }
        pos->offset += bit_offset;
+       printf_debug("ctf_move_pos after increment: %zd\n", pos->offset);
 }
 
 /*
@@ -154,7 +161,7 @@ void ctf_pos_pad_packet(struct ctf_stream_pos *pos)
 static inline
 int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len)
 {
-       if (pos->offset == -EOF)
+       if (pos->offset == EOF)
                return 0;
        if (pos->offset + bit_len > pos->packet_size)
                return 0;