From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 3 Aug 2011 17:38:17 +0000 (-0400)
Subject: Skip padding from metadata end of packet
X-Git-Tag: v0.3~2
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=ddbc52af0c37d5a259f1921fa42bf21097f44793

Skip padding from metadata end of packet

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

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index fee9a557..23a2179b 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -568,10 +568,19 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 		toread -= readlen;
 		if (!toread) {
 			ret = 0;	/* continue reading next packet */
-			break;
+			goto read_padding;
 		}
 	}
 	return ret;
+
+read_padding:
+	toread = (header.packet_size - header.content_size) / CHAR_BIT;
+	ret = fseek(in, toread, SEEK_CUR);
+	if (ret < 0) {
+		fprintf(stdout, "[warning] Missing padding at end of file\n");
+		ret = 0;
+	}
+	return ret;
 }
 
 static