X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=d24f1cb73e69433736cf007a004550621c28d05a;hb=45807148b2641aa049f821a7c71c4c7246c7692e;hp=01035f3d0be119d1d24798481b3b71a883ca8a73;hpb=ca334c7230d120ffe211efbfd6efe467b5d4d794;p=babeltrace.git

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 01035f3d..d24f1cb7 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -426,9 +426,9 @@ void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream,
 	}
 	fprintf(fp, "] in trace UUID ");
 	print_uuid(fp, stream->stream_class->trace->uuid);
-	if (stream->stream_class->trace->path[0])
+	if (stream->stream_class->trace->parent.path[0])
 		fprintf(fp, ", at path: \"%s\"",
-			stream->stream_class->trace->path);
+			stream->stream_class->trace->parent.path);
 
 	fprintf(fp, ", within stream id %" PRIu64, stream->stream_id);
 	if (stream->path[0])
@@ -1711,8 +1711,8 @@ int ctf_open_trace_read(struct ctf_trace *td,
 		ret = -errno;
 		goto error_dirfd;
 	}
-	strncpy(td->path, path, sizeof(td->path));
-	td->path[sizeof(td->path) - 1] = '\0';
+	strncpy(td->parent.path, path, sizeof(td->parent.path));
+	td->parent.path[sizeof(td->parent.path) - 1] = '\0';
 
 	/*
 	 * Keep the metadata file separate.
@@ -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