X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=c6f751ea4d97b7353dd44341608ba1377a7007e9;hp=5a8b26a8076ec4c26cdbdf3390403cf61b6f3e0f;hb=185987b146f25ac4e9fbfe087ac835d37d12d1b7;hpb=34b69bb69b18f70cf3f3c38a8d36eaae07725e54

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 5a8b26a8..c6f751ea 100644
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -276,13 +276,15 @@ void trace_string(char *line, struct ctf_stream_pos *pos, size_t len)
 	printf_debug("read: %s\n", line);
 
 	for (;;) {
+		int packet_filled = 0;
+
 		ctf_dummy_pos(pos, &dummy);
 		write_event_header(&dummy, line, &tline, len, &tlen, &ts);
 		if (!ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT))
-			goto error;
+			packet_filled = 1;
 		if (!ctf_move_pos(&dummy, tlen * CHAR_BIT))
-			goto error;
-		if (ctf_pos_packet(&dummy)) {
+			packet_filled = 1;
+		if (packet_filled || ctf_pos_packet(&dummy)) {
 			ctf_pos_pad_packet(pos);
 			write_packet_header(pos, s_uuid);
 			write_packet_context(pos);
@@ -325,6 +327,7 @@ void trace_text(FILE *input, int output)
 		fprintf(stderr, "Error in ctf_init_pos\n");
 		return;
 	}
+	ctf_packet_seek(&pos.parent, 0, SEEK_CUR);
 	write_packet_header(&pos, s_uuid);
 	write_packet_context(&pos);
 	for (;;) {