Move `src/plugins/comp-logging.h` -> `src/logging/comp-logging.h`

[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 a6f39a376b53a76a13ed84381fd3687da966e715..a8bf2dc73b848d8c93af460ae3d0daba184b198c 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (stream->trace->fs_sink->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (stream->log_level)
 #define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/STREAM"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include <stdio.h>
@@ -206,11 +206,11 @@ int write_int_field(struct fs_sink_stream *stream,
 
        if (fc->is_signed) {
                ret = bt_ctfser_write_signed_int(&stream->ctfser,
-                       bt_field_signed_integer_get_value(field),
+                       bt_field_integer_signed_get_value(field),
                        fc->base.base.alignment, fc->base.size, BYTE_ORDER);
        } else {
                ret = bt_ctfser_write_unsigned_int(&stream->ctfser,
-                       bt_field_unsigned_integer_get_value(field),
+                       bt_field_integer_unsigned_get_value(field),
                        fc->base.base.alignment, fc->base.size, BYTE_ORDER);
        }
 
@@ -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,