X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fplugins%2Futils%2Fmuxer%2Fmuxer.h;h=23a4c8aa20f75dedd6df3d02611e7e6f82045fb0;hp=da5c0252f3dc6892b79e10b27d78550f02b55dcc;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=21a9f056fd7d86d18aa7a1700c7f47d93eb1adeb

diff --git a/src/plugins/utils/muxer/muxer.h b/src/plugins/utils/muxer/muxer.h
index da5c0252..23a4c8aa 100644
--- a/src/plugins/utils/muxer/muxer.h
+++ b/src/plugins/utils/muxer/muxer.h
@@ -1,29 +1,13 @@
-#ifndef BABELTRACE_PLUGINS_UTILS_MUXER_H
-#define BABELTRACE_PLUGINS_UTILS_MUXER_H
-
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  * 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.
- *
- * 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.
  */
 
+#ifndef BABELTRACE_PLUGINS_UTILS_MUXER_H
+#define BABELTRACE_PLUGINS_UTILS_MUXER_H
+
 #include <stdint.h>
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"
@@ -38,10 +22,9 @@ BT_HIDDEN
 void muxer_finalize(bt_self_component_filter *self_comp);
 
 BT_HIDDEN
-bt_component_class_message_iterator_initialize_method_status muxer_msg_iter_init(
+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_filter *self_comp,
 		bt_self_component_port_output *self_port);
 
 BT_HIDDEN
@@ -49,7 +32,7 @@ void muxer_msg_iter_finalize(
 		bt_self_message_iterator *self_msg_iter);
 
 BT_HIDDEN
-bt_component_class_message_iterator_next_method_status muxer_msg_iter_next(
+bt_message_iterator_class_next_method_status muxer_msg_iter_next(
 		bt_self_message_iterator *self_msg_iter,
 		bt_message_array_const msgs, uint64_t capacity,
 		uint64_t *count);
@@ -61,12 +44,12 @@ bt_component_class_port_connected_method_status muxer_input_port_connected(
 		const bt_port_output *other_port);
 
 BT_HIDDEN
-bt_component_class_message_iterator_can_seek_beginning_method_status
+bt_message_iterator_class_can_seek_beginning_method_status
 muxer_msg_iter_can_seek_beginning(
 		bt_self_message_iterator *message_iterator, bt_bool *can_seek);
 
 BT_HIDDEN
-bt_component_class_message_iterator_seek_beginning_method_status muxer_msg_iter_seek_beginning(
+bt_message_iterator_class_seek_beginning_method_status muxer_msg_iter_seek_beginning(
 		bt_self_message_iterator *message_iterator);
 
 #endif /* BABELTRACE_PLUGINS_UTILS_MUXER_H */