lib: make packets and packet messages optional, disabled by default

[babeltrace.git] / src / plugins / ctf / fs-sink / fs-sink-stream.c

diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.c b/src/plugins/ctf/fs-sink/fs-sink-stream.c
index 921dafa3020328c9bfdb418418603ec2cb59f6ef..4ca9ce1059bd5545fd2481d5a7dbf35dadafcdc7 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -165,7 +165,7 @@ struct fs_sink_stream *fs_sink_stream_create(struct fs_sink_trace *trace,
        stream->prev_packet_state.discarded_events_counter = UINT64_C(-1);
        stream->prev_packet_state.seq_num = UINT64_C(-1);
        ret = try_translate_stream_class_trace_ir_to_ctf_ir(trace->fs_sink,
-               trace->tc, bt_stream_borrow_class_const(ir_stream),
+               trace->trace, bt_stream_borrow_class_const(ir_stream),
                &stream->sc);
        if (ret) {
                goto error;
@@ -517,10 +517,11 @@ int write_packet_context(struct fs_sink_stream *stream)
 
        /* Other members */
        if (stream->sc->packet_context_fc) {
-               const bt_field *packet_context_field =
-                       bt_packet_borrow_context_field_const(
-                               stream->packet_state.packet);
+               const bt_field *packet_context_field;
 
+               BT_ASSERT(stream->packet_state.packet);
+               packet_context_field = bt_packet_borrow_context_field_const(
+                       stream->packet_state.packet);
                BT_ASSERT(packet_context_field);
                ret = write_struct_field(stream,
                        (void *) stream->sc->packet_context_fc,
@@ -567,9 +568,9 @@ int fs_sink_stream_open_packet(struct fs_sink_stream *stream,
        }
 
        /* Packet header: UUID */
-       for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
+       for (i = 0; i < BT_UUID_LEN; i++) {
                ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
-                       (uint64_t) stream->sc->tc->uuid[i], 8, 8, BYTE_ORDER);
+                       (uint64_t) stream->sc->trace->uuid[i], 8, 8, BYTE_ORDER);
                if (ret) {
                        BT_COMP_LOGE("Error writing packet header UUID: stream-file-name=%s",
                                stream->file_name->str);