Add MIT-licensed priority heap, based on CLRS, chap. 6

[babeltrace.git] / converter / babeltrace-lib.c

diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c
index 8f29c5a87d8c818c7dca8ffa2d6513bf45380ddd..aba421999f31b1b061a598083cf750e4e1dcf13e 100644 (file)
--- a/converter/babeltrace-lib.c
+++ b/converter/babeltrace-lib.c
@@ -35,14 +35,14 @@ int convert_stream(struct ctf_text_stream_pos *sout,
        /* For each event, print header, context, payload */
        /* TODO: order events by timestamps across streams */
        for (;;) {
-               ret = sin->pos.parent.event_cb(&sin->pos.parent, sin->stream);
+               ret = sin->pos.parent.event_cb(&sin->pos.parent, &sin->stream);
                if (ret == EOF)
                        break;
                else if (ret) {
                        fprintf(stdout, "[error] Reading event failed.\n");
                        goto error;
                }
-               ret = sout->parent.event_cb(&sout->parent, sin->stream);
+               ret = sout->parent.event_cb(&sout->parent, &sin->stream);
                if (ret) {
                        fprintf(stdout, "[error] Writing event failed.\n");
                        goto error;
@@ -66,7 +66,7 @@ int convert_trace(struct trace_descriptor *td_write,
 
        /* For each stream (TODO: order events by timestamp) */
        for (stream_id = 0; stream_id < tin->streams->len; stream_id++) {
-               struct ctf_stream *stream = g_ptr_array_index(tin->streams, stream_id);
+               struct ctf_stream_class *stream = g_ptr_array_index(tin->streams, stream_id);
 
                if (!stream)
                        continue;