Fix: flt.utils.muxer: use return value (clock class)

[babeltrace.git] / plugins / utils / muxer / muxer.c

diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index 9fb1ae20d80f05aff0c9495e473e436b24ef2948..91124043fa2ac04cf7bad6bbe67c81259235dd10 100644 (file)
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -525,8 +525,9 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
                        msg, &clock_snapshot);
                break;
        case BT_MESSAGE_TYPE_PACKET_BEGINNING:
-               bt_message_packet_beginning_borrow_stream_class_default_clock_class_const(
-                       msg);
+               clock_class =
+                       bt_message_packet_beginning_borrow_stream_class_default_clock_class_const(
+                               msg);
                if (!clock_class) {
                        goto no_clock_snapshot;
                }
@@ -535,8 +536,9 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
                        msg, &clock_snapshot);
                break;
        case BT_MESSAGE_TYPE_PACKET_END:
-               bt_message_packet_end_borrow_stream_class_default_clock_class_const(
-                       msg);
+               clock_class =
+                       bt_message_packet_end_borrow_stream_class_default_clock_class_const(
+                               msg);
                if (!clock_class) {
                        goto no_clock_snapshot;
                }
@@ -545,8 +547,9 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
                        msg, &clock_snapshot);
                break;
        case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
-               bt_message_discarded_events_borrow_stream_class_default_clock_class_const(
-                       msg);
+               clock_class =
+                       bt_message_discarded_events_borrow_stream_class_default_clock_class_const(
+                               msg);
                if (!clock_class) {
                        goto no_clock_snapshot;
                }
@@ -555,8 +558,9 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
                        msg, &clock_snapshot);
                break;
        case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
-               bt_message_discarded_packets_borrow_stream_class_default_clock_class_const(
-                       msg);
+               clock_class =
+                       bt_message_discarded_packets_borrow_stream_class_default_clock_class_const(
+                               msg);
                if (!clock_class) {
                        goto no_clock_snapshot;
                }
@@ -565,8 +569,9 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
                        msg, &clock_snapshot);
                break;
        case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
-               bt_message_stream_activity_beginning_borrow_stream_class_default_clock_class_const(
-                       msg);
+               clock_class =
+                       bt_message_stream_activity_beginning_borrow_stream_class_default_clock_class_const(
+                               msg);
                if (!clock_class) {
                        goto no_clock_snapshot;
                }
@@ -579,8 +584,9 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
 
                break;
        case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
-               bt_message_stream_activity_end_borrow_stream_class_default_clock_class_const(
-                       msg);
+               clock_class =
+                       bt_message_stream_activity_end_borrow_stream_class_default_clock_class_const(
+                               msg);
                if (!clock_class) {
                        goto no_clock_snapshot;
                }
@@ -910,13 +916,13 @@ bt_self_message_iterator_status validate_muxer_upstream_msg_iters(
        bt_self_message_iterator_status status =
                BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
        size_t i;
-       bool is_ended = false;
 
        BT_LOGV("Validating muxer's upstream message iterator wrappers: "
                "muxer-msg-iter-addr=%p", muxer_msg_iter);
 
        for (i = 0; i < muxer_msg_iter->active_muxer_upstream_msg_iters->len;
                        i++) {
+               bool is_ended = false;
                struct muxer_upstream_msg_iter *muxer_upstream_msg_iter =
                        g_ptr_array_index(
                                muxer_msg_iter->active_muxer_upstream_msg_iters,