From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 14 Jul 2011 13:36:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace
X-Git-Tag: v0.1~9
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=01c76b246be85b5d9c8e99813950fb194c9f714f

Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

Conflicts:
	formats/ctf/ctf.c
---

01c76b246be85b5d9c8e99813950fb194c9f714f
diff --cc formats/ctf/ctf.c
index cf9b3077,2b2e1518..098b7eb1
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@@ -897,16 -906,17 +907,16 @@@ int create_stream_packet_index(struct c
  				fprintf(stdout, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id);
  				return -EINVAL;
  			}
- 			file_stream->stream.stream_class = stream;
- 			ret = create_stream_definitions(td, &file_stream->stream);
+ 			file_stream->parent.stream_class = stream;
++			ret = create_stream_definitions(td, &file_stream->parent);
 +			if (ret)
 +				return ret;
  		}
  		first_packet = 0;
  
- 		if (file_stream->stream.stream_packet_context) {
 -		ret = create_stream_definitions(td, &file_stream->parent);
 -		if (ret)
 -			return ret;
 -
+ 		if (file_stream->parent.stream_packet_context) {
  			/* Read packet context */
- 			ret = generic_rw(&pos->parent, &file_stream->stream.stream_packet_context->p);
+ 			ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);
  			if (ret)
  				return ret;
  			/* read content size from header */