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

Conflicts:
	formats/ctf/ctf.c

diff --cc formats/ctf/ctf.c
index cf9b3077edf54889a942f165fc8d5a2cb27f1f8e,2b2e15185275b68699467ea62f07aa8ef35bca1b..098b7eb15d7d4589880243ed7d0ecdc66c7b4152
--- 1/formats/ctf/ctf.c
--- 2/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 */