Move to kernel style SPDX license identifiers

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

diff --git a/src/plugins/utils/dummy/dummy.c b/src/plugins/utils/dummy/dummy.c
index 703535e7707754d4841dcddab9da4d7d04375fb3..8138aa6e0ff7ee3b9c6ae5d8818bee1b772a22b5 100644 (file)
--- a/src/plugins/utils/dummy/dummy.c
+++ b/src/plugins/utils/dummy/dummy.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:
+ * SPDX-License-Identifier: MIT
  *
- * 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.
+ * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_COMP_LOG_SELF_COMP self_comp
@@ -34,9 +18,10 @@
 static
 const char * const in_port_name = "in";
 
+static
 void destroy_private_dummy_data(struct dummy *dummy)
 {
-       bt_self_component_port_input_message_iterator_put_ref(dummy->msg_iter);
+       bt_message_iterator_put_ref(dummy->msg_iter);
        g_free(dummy);
 
 }
@@ -53,6 +38,7 @@ void dummy_finalize(bt_self_component_sink *comp)
        destroy_private_dummy_data(dummy);
 }
 
+static
 struct bt_param_validation_map_value_entry_descr dummy_params[] = {
        BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END
 };
@@ -116,23 +102,23 @@ bt_component_class_sink_graph_is_configured_method_status dummy_graph_is_configu
                bt_self_component_sink *comp)
 {
        bt_component_class_sink_graph_is_configured_method_status status;
-       bt_self_component_port_input_message_iterator_create_from_sink_component_status
+       bt_message_iterator_create_from_sink_component_status
                msg_iter_status;
        struct dummy *dummy;
-       bt_self_component_port_input_message_iterator *iterator;
+       bt_message_iterator *iterator;
 
        dummy = bt_self_component_get_data(
                bt_self_component_sink_as_self_component(comp));
        BT_ASSERT(dummy);
-       msg_iter_status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+       msg_iter_status = bt_message_iterator_create_from_sink_component(
                comp, bt_self_component_sink_borrow_input_port_by_name(comp,
                        in_port_name), &iterator);
-       if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+       if (msg_iter_status != BT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
                status = (int) msg_iter_status;
                goto end;
        }
 
-       BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_MOVE_REF(
+       BT_MESSAGE_ITERATOR_MOVE_REF(
                dummy->msg_iter, iterator);
 
        status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
@@ -155,7 +141,7 @@ bt_component_class_sink_consume_method_status dummy_consume(
 
        dummy = bt_self_component_get_data(
                bt_self_component_sink_as_self_component(component));
-       BT_ASSERT(dummy);
+       BT_ASSERT_DBG(dummy);
 
        if (G_UNLIKELY(!dummy->msg_iter)) {
                status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_END;
@@ -163,7 +149,7 @@ bt_component_class_sink_consume_method_status dummy_consume(
        }
 
        /* Consume one message  */
-       next_status = bt_self_component_port_input_message_iterator_next(
+       next_status = bt_message_iterator_next(
                dummy->msg_iter, &msgs, &count);
        switch (next_status) {
        case BT_MESSAGE_ITERATOR_NEXT_STATUS_OK: