X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=22a55e64b50c813fa02827a31cf5c322075cd784;hp=2965f496f2fc7a0ae51d55519975cf5257e00f7a;hb=c716f83b53677d5f2e6a15463408f464006eafb7;hpb=98a0490342a1b8f8841ef52aaaef2cef11782ff1

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 2965f496..22a55e64 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -225,8 +225,8 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 {
 	struct ctf_stream_pos *pos =
 		container_of(ppos, struct ctf_stream_pos, parent);
-	struct ctf_stream_class *stream_class = stream->stream_class;
-	struct ctf_stream_event *event;
+	struct ctf_stream_declaration *stream_class = stream->stream_class;
+	struct ctf_event_definition *event;
 	uint64_t id = 0;
 	int ret;
 
@@ -337,8 +337,8 @@ error:
 static
 int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
 {
-	struct ctf_stream_class *stream_class = stream->stream_class;
-	struct ctf_stream_event *event;
+	struct ctf_stream_declaration *stream_class = stream->stream_class;
+	struct ctf_event_definition *event;
 	uint64_t id;
 	int ret;
 
@@ -898,11 +898,11 @@ end_stream:
 }
 
 static
-struct ctf_stream_event *create_event_definitions(struct ctf_trace *td,
+struct ctf_event_definition *create_event_definitions(struct ctf_trace *td,
 						  struct ctf_stream *stream,
 						  struct ctf_event *event)
 {
-	struct ctf_stream_event *stream_event = g_new0(struct ctf_stream_event, 1);
+	struct ctf_event_definition *stream_event = g_new0(struct ctf_event_definition, 1);
 
 	if (event->context_decl) {
 		struct definition *definition =
@@ -939,7 +939,7 @@ error:
 static
 int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
 {
-	struct ctf_stream_class *stream_class;
+	struct ctf_stream_declaration *stream_class;
 	int ret;
 	int i;
 
@@ -988,7 +988,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
 	g_ptr_array_set_size(stream->events_by_id, stream_class->events_by_id->len);
 	for (i = 0; i < stream->events_by_id->len; i++) {
 		struct ctf_event *event = g_ptr_array_index(stream_class->events_by_id, i);
-		struct ctf_stream_event *stream_event;
+		struct ctf_event_definition *stream_event;
 
 		if (!event)
 			continue;
@@ -1001,7 +1001,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
 
 error_event:
 	for (i = 0; i < stream->events_by_id->len; i++) {
-		struct ctf_stream_event *stream_event = g_ptr_array_index(stream->events_by_id, i);
+		struct ctf_event_definition *stream_event = g_ptr_array_index(stream->events_by_id, i);
 		if (stream_event)
 			g_free(stream_event);
 	}
@@ -1021,7 +1021,7 @@ static
 int create_stream_packet_index(struct ctf_trace *td,
 			       struct ctf_file_stream *file_stream)
 {
-	struct ctf_stream_class *stream;
+	struct ctf_stream_declaration *stream;
 	int len_index;
 	struct ctf_stream_pos *pos;
 	struct stat filestats;
@@ -1462,7 +1462,7 @@ static
 int prepare_mmap_stream_definition(struct ctf_trace *td,
 		struct ctf_file_stream *file_stream)
 {
-	struct ctf_stream_class *stream;
+	struct ctf_stream_declaration *stream;
 	uint64_t stream_id = 0;
 	int ret;
 
@@ -1601,7 +1601,7 @@ void ctf_close_trace(struct trace_descriptor *tdp)
 
 	if (td->streams) {
 		for (i = 0; i < td->streams->len; i++) {
-			struct ctf_stream_class *stream;
+			struct ctf_stream_declaration *stream;
 			int j;
 
 			stream = g_ptr_array_index(td->streams, i);