Move to kernel style SPDX license identifiers

[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 db8b86bd817c94c7d5a6dd9a56dc433c0554421a..182dc84d66d25ef781bee781020900040150282e 100644 (file)
--- a/src/plugins/utils/muxer/muxer.c
+++ b/src/plugins/utils/muxer/muxer.c
@@ -1,23 +1,7 @@
 /*
- * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_COMP_LOG_SELF_COMP (muxer_comp->self_comp)
@@ -580,7 +564,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 +836,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 +1023,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) {
@@ -1276,12 +1261,13 @@ BT_HIDDEN
 bt_message_iterator_class_initialize_method_status muxer_msg_iter_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *port)
 {
        struct muxer_comp *muxer_comp = NULL;
        struct muxer_msg_iter *muxer_msg_iter = NULL;
        bt_message_iterator_class_initialize_method_status status;
+       bt_self_component *self_comp =
+               bt_self_message_iterator_borrow_component(self_msg_iter);
 
        muxer_comp = bt_self_component_get_data(self_comp);
        BT_ASSERT(muxer_comp);