flt.utils.muxer: initialize variable to silence -Wmaybe-uninitialized warning

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

diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c
index 2554d2705a561c23b64ff6c2162d53bc62f642dc..d1f4955099f72031284166a913ded30197e4d681 100644 (file)
--- a/src/plugins/utils/muxer/muxer.c
+++ b/src/plugins/utils/muxer/muxer.c
@@ -580,7 +580,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
 
                break;
        case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
-               clock_snapshot = bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
+               clock_snapshot = bt_message_message_iterator_inactivity_borrow_clock_snapshot_const(
                        msg);
                break;
        default:
@@ -852,7 +852,7 @@ muxer_msg_iter_youngest_upstream_msg_iter(
                                BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY)) {
                        const bt_clock_snapshot *cs;
 
-                       cs = bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
+                       cs = bt_message_message_iterator_inactivity_borrow_clock_snapshot_const(
                                msg);
                        ret = validate_clock_class(muxer_msg_iter, muxer_comp,
                                bt_clock_snapshot_borrow_clock_class_const(cs));
@@ -1039,7 +1039,8 @@ bt_message_iterator_class_next_method_status muxer_msg_iter_do_next_one(
 {
        bt_message_iterator_class_next_method_status status;
        struct muxer_upstream_msg_iter *muxer_upstream_msg_iter = NULL;
-       int64_t next_return_ts;
+       /* Initialize to avoid -Wmaybe-uninitialized warning with gcc 4.8. */
+       int64_t next_return_ts = 0;
 
        status = validate_muxer_upstream_msg_iters(muxer_msg_iter);
        if (status != BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) {