Tests: Move TAP helpers to tests/utils/tap

[babeltrace.git] / formats / ctf-text / ctf-text.c

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index f60fde62f5fa794b749f91e0201fc92672f0a389..48ce31b8691081319e7ee35762d87c8a47b579be 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -265,7 +265,7 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
        /* Print events discarded */
        if (stream->events_discarded) {
                fflush(pos->fp);
-               ctf_print_discarded(stderr, stream);
+               ctf_print_discarded(stderr, stream, 0);
                stream->events_discarded = 0;
        }
 
@@ -316,12 +316,12 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
                pos->last_cycles_timestamp = stream->cycles_timestamp;
        }
 
-       if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
+       if ((opt_trace_field || opt_all_fields) && stream_class->trace->parent.path[0] != '\0') {
                set_field_names_print(pos, ITEM_HEADER);
                if (pos->print_names) {
                        fprintf(pos->fp, "trace = ");
                }
-               fprintf(pos->fp, "%s", stream_class->trace->path);
+               fprintf(pos->fp, "%s", stream_class->trace->parent.path);
                if (pos->print_names)
                        fprintf(pos->fp, ", ");
                else
@@ -561,6 +561,7 @@ struct bt_trace_descriptor *ctf_text_open_trace(const char *path, int flags,
                pos->fp = fp;
                pos->parent.rw_table = write_dispatch_table;
                pos->parent.event_cb = ctf_text_write_event;
+               pos->parent.trace = &pos->trace_descriptor;
                pos->print_names = 0;
                break;
        case O_RDONLY: