X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-lib.c;h=6cc2b7b8b73d07b72936dfad375d19c68ead3041;hp=534e4eddd5e9ffa743b9f79dd46bdd3271863724;hb=22133895a9a6b29ec17211f8d437bc128a7e4dfc;hpb=0d0f514904a3ebb85775abceed30da0675f55cc6

diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c
index 534e4edd..6cc2b7b8 100644
--- a/converter/babeltrace-lib.c
+++ b/converter/babeltrace-lib.c
@@ -3,7 +3,9 @@
  *
  * Babeltrace Trace Converter Library
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +33,7 @@ static int read_event(struct ctf_file_stream *sin)
 {
 	int ret;
 
-	ret = sin->pos.parent.event_cb(&sin->pos.parent, &sin->stream);
+	ret = sin->pos.parent.event_cb(&sin->pos.parent, &sin->parent);
 	if (ret == EOF)
 		return EOF;
 	else if (ret) {
@@ -48,7 +50,7 @@ int stream_compare(void *a, void *b)
 {
 	struct ctf_file_stream *s_a = a, *s_b = b;
 
-	if (s_a->stream.timestamp < s_b->stream.timestamp)
+	if (s_a->parent.timestamp < s_b->parent.timestamp)
 		return 1;
 	else
 		return 0;
@@ -73,8 +75,8 @@ int convert_trace(struct trace_descriptor *td_write,
 
 		if (!stream)
 			continue;
-		for (filenr = 0; filenr < stream->files->len; filenr++) {
-			struct ctf_file_stream *file_stream = g_ptr_array_index(stream->files, filenr);
+		for (filenr = 0; filenr < stream->streams->len; filenr++) {
+			struct ctf_file_stream *file_stream = g_ptr_array_index(stream->streams, filenr);
 			ret = read_event(file_stream);
 			if (ret == EOF) {
 				ret = 0;
@@ -100,7 +102,7 @@ int convert_trace(struct trace_descriptor *td_write,
 			ret = 0;
 			break;
 		}
-		ret = sout->parent.event_cb(&sout->parent, &file_stream->stream);
+		ret = sout->parent.event_cb(&sout->parent, &file_stream->parent);
 		if (ret) {
 			fprintf(stdout, "[error] Writing event failed.\n");
 			goto end;