Move to kernel style SPDX license identifiers

[babeltrace.git] / src / plugins / text / details / details.c

diff --git a/src/plugins/text/details/details.c b/src/plugins/text/details/details.c
index 88b7fe326d5eaa533de6aabbfe693ddaf04dc814..7bee1ae813393df0280b9d1499084468797ec9fb 100644 (file)
--- a/src/plugins/text/details/details.c
+++ b/src/plugins/text/details/details.c
@@ -1,23 +1,7 @@
 /*
- * Copyright 2019 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 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_COMP_LOG_SELF_COMP (details_comp->self_comp)
@@ -25,6 +9,8 @@
 #define BT_LOG_TAG "PLUGIN/SINK.TEXT.DETAILS"
 #include "logging/comp-logging.h"
 
+#include <stdbool.h>
+
 #include <babeltrace2/babeltrace.h>
 
 #include "common/common.h"
@@ -33,15 +19,6 @@
 #include "write.h"
 #include "plugins/common/param-validation/param-validation.h"
 
-#define LOG_WRONG_PARAM_TYPE(_name, _value, _exp_type)                 \
-       do {                                                            \
-               BT_COMP_LOGE("Wrong `%s` parameter type: type=%s, "     \
-                       "expected-type=%s",                             \
-                       (_name), bt_common_value_type_string(           \
-                               bt_value_get_type(_value)),             \
-                       bt_common_value_type_string(_exp_type));        \
-       } while (0)
-
 #define IN_PORT_NAME "in"
 #define COLOR_PARAM_NAME "color"
 #define WITH_METADATA_PARAM_NAME "with-metadata"
@@ -160,7 +137,7 @@ void destroy_details_comp(struct details_comp *details_comp)
                details_comp->str = NULL;
        }
 
-       BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
+       BT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
                details_comp->msg_iter);
        g_free(details_comp);
 
@@ -382,7 +359,7 @@ bt_component_class_initialize_method_status details_init(
                status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
                break;
        default:
-               abort();
+               bt_common_abort();
        }
 
        details_comp = create_details_comp(comp);
@@ -417,9 +394,9 @@ bt_component_class_sink_graph_is_configured_method_status
 details_graph_is_configured(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;
-       bt_self_component_port_input_message_iterator *iterator;
+       bt_message_iterator *iterator;
        struct details_comp *details_comp;
        bt_self_component_port_input *in_port;
 
@@ -436,15 +413,15 @@ details_graph_is_configured(bt_self_component_sink *comp)
                goto end;
        }
 
-       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(
                details_comp->msg_iter, iterator);
 
        status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
@@ -467,11 +444,11 @@ details_consume(bt_self_component_sink *comp)
 
        details_comp = bt_self_component_get_data(
                bt_self_component_sink_as_self_component(comp));
-       BT_ASSERT(details_comp);
-       BT_ASSERT(details_comp->msg_iter);
+       BT_ASSERT_DBG(details_comp);
+       BT_ASSERT_DBG(details_comp->msg_iter);
 
        /* Consume messages */
-       next_status = bt_self_component_port_input_message_iterator_next(
+       next_status = bt_message_iterator_next(
                details_comp->msg_iter, &msgs, &count);
        switch (next_status) {
        case BT_MESSAGE_ITERATOR_NEXT_STATUS_OK:
@@ -516,7 +493,7 @@ details_consume(bt_self_component_sink *comp)
                ret = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_MEMORY_ERROR;
                goto end;
        default:
-               abort();
+               bt_common_abort();
        }
 
 end: