X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=f1fdba178f0a773d28a2286dae9eee133c29e929;hp=272e8c45f4a6dc22270e6e7286bc64b723f448be;hb=f60efc0e475b3c2fca3b2afc584615f6c482c9e7;hpb=37fcdd1964a5e821b24da7641d34775b90b5c711

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 272e8c45..f1fdba17 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -551,15 +551,6 @@ error:
 void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags)
 {
 	pos->fd = fd;
-	pos->mmap_offset = 0;
-	pos->packet_size = 0;
-	pos->content_size = 0;
-	pos->content_size_loc = NULL;
-	pos->base_mma = NULL;
-	pos->offset = 0;
-	pos->dummy = false;
-	pos->cur_index = 0;
-	pos->packet_real_index = NULL;
 	if (fd >= 0) {
 		pos->packet_cycles_index = g_array_new(FALSE, TRUE,
 						sizeof(struct packet_index));
@@ -708,6 +699,9 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence)
 			break;
 		}
 		case SEEK_SET:
+			packet_index = &g_array_index(pos->packet_cycles_index,
+					struct packet_index, index);
+			pos->last_events_discarded = packet_index->events_discarded;
 			pos->cur_index = index;
 			file_stream->parent.prev_real_timestamp = 0;
 			file_stream->parent.prev_real_timestamp_end = 0;
@@ -1526,7 +1520,7 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
 	if (ret)
 		goto error_def;
 	/*
-	 * For now, only a single slock is supported.
+	 * For now, only a single clock per trace is supported.
 	 */
 	file_stream->parent.current_clock = td->single_clock;
 	ret = create_stream_packet_index(td, file_stream);
@@ -1755,7 +1749,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td,
 		goto error_index;
 
 	/*
-	 * For now, only a single slock is supported.
+	 * For now, only a single clock per trace is supported.
 	 */
 	file_stream->parent.current_clock = td->single_clock;