X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=6bb31e55f4efb31346fcdc8ee14457565734a619;hb=f18fbdeb7c7777d5473ab12efd828ce82b06948e;hp=c3249a01775b9280d99936f7a6970a543fdcff24;hpb=caf929fa6105f9dbea79e3c05f9a9cbc7944028a;p=babeltrace.git

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index c3249a01..6bb31e55 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -781,7 +781,7 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence)
 			 * case, the collection is not there, so we
 			 * cannot print the timestamps.
 			 */
-			if ((&file_stream->parent)->stream_class->trace->collection) {
+			if ((&file_stream->parent)->stream_class->trace->parent.collection) {
 				/*
 				 * When a stream reaches the end of the
 				 * file, we need to show the number of
@@ -1472,7 +1472,7 @@ begin:
 
 			field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
 			packet_index.timestamp_begin = bt_get_unsigned_int(field);
-			if (file_stream->parent.stream_class->trace->collection) {
+			if (file_stream->parent.stream_class->trace->parent.collection) {
 				packet_index.timestamp_begin =
 					ctf_get_real_timestamp(
 						&file_stream->parent,
@@ -1487,7 +1487,7 @@ begin:
 
 			field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
 			packet_index.timestamp_end = bt_get_unsigned_int(field);
-			if (file_stream->parent.stream_class->trace->collection) {
+			if (file_stream->parent.stream_class->trace->parent.collection) {
 				packet_index.timestamp_end =
 					ctf_get_real_timestamp(
 						&file_stream->parent,
@@ -2093,7 +2093,7 @@ void ctf_set_context(struct bt_trace_descriptor *descriptor,
 	struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
 			parent);
 
-	td->ctx = ctx;
+	td->parent.ctx = ctx;
 }
 
 static
@@ -2103,7 +2103,7 @@ void ctf_set_handle(struct bt_trace_descriptor *descriptor,
 	struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
 			parent);
 
-	td->handle = handle;
+	td->parent.handle = handle;
 }
 
 static