From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 7 May 2011 15:30:29 +0000 (-0400)
Subject: Change -EOF for EOF (it is worth -1), fix assertion
X-Git-Tag: v0.1~80
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=670977d3f384db208f375255a83060d90075d626;hp=d8ea2d29b07b1db11e567f7d579553b783ee52d2

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 51011e1d..76df6ede 100644
--- 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 24b754df..625b1c09 100644
--- 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 9b918954..b5c59dde 100644
--- 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 a8f75a97..197a7e13 100644
--- 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 e8cc97b1..95c0d5e2 100644
--- 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;