Move to kernel style SPDX license identifiers

[babeltrace.git] / src / plugins / ctf / fs-sink / fs-sink.c

diff --git a/src/plugins/ctf/fs-sink/fs-sink.c b/src/plugins/ctf/fs-sink/fs-sink.c
index 9f1ef423b84684ca0403454a9a37fc5458c43e14..235ff8de65bd6d7b520bade6fc2df63884002813 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink.c
+++ b/src/plugins/ctf/fs-sink/fs-sink.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 (fs_sink->self_comp)
@@ -147,7 +131,7 @@ void destroy_fs_sink_comp(struct fs_sink_comp *fs_sink)
                fs_sink->traces = NULL;
        }
 
-       BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
+       BT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
                fs_sink->upstream_iter);
        g_free(fs_sink);
 
@@ -466,7 +450,7 @@ bt_component_class_sink_consume_method_status handle_packet_beginning_msg(
                 */
                if (stream->prev_packet_state.end_cs == UINT64_C(-1)) {
                        BT_COMP_LOGE("Incompatible discarded packets message "
-                               "occuring before the stream's first packet: "
+                               "occurring before the stream's first packet: "
                                "stream-id=%" PRIu64 ", stream-name=\"%s\", "
                                "trace-name=\"%s\", path=\"%s/%s\"",
                                bt_stream_get_id(ir_stream),
@@ -645,7 +629,7 @@ bt_component_class_sink_consume_method_status handle_stream_beginning_msg(
        /*
         * Not supported: discarded events or discarded packets support
         * without packets support. Packets are the way to know where
-        * discarded events/packets occured in CTF 1.8.
+        * discarded events/packets occurred in CTF 1.8.
         */
        if (!bt_stream_class_supports_packets(ir_sc)) {
                BT_ASSERT(!bt_stream_class_supports_discarded_packets(ir_sc));
@@ -820,7 +804,7 @@ bt_component_class_sink_consume_method_status handle_discarded_events_msg(
        if (stream->packet_state.is_open &&
                        stream->sc->discarded_events_has_ts) {
                BT_COMP_LOGE("Unsupported discarded events message with "
-                       "default clock snapshots occuring within a packet: "
+                       "default clock snapshots occurring within a packet: "
                        "stream-id=%" PRIu64 ", stream-name=\"%s\", "
                        "trace-name=\"%s\", path=\"%s/%s\"",
                        bt_stream_get_id(ir_stream),
@@ -991,7 +975,7 @@ bt_component_class_sink_consume_method_status ctf_fs_sink_consume(
        BT_ASSERT_DBG(fs_sink->upstream_iter);
 
        /* Consume messages */
-       next_status = bt_self_component_port_input_message_iterator_next(
+       next_status = bt_message_iterator_next(
                fs_sink->upstream_iter, &msgs, &msg_count);
        if (next_status < 0) {
                status = (int) next_status;
@@ -1090,17 +1074,17 @@ ctf_fs_sink_graph_is_configured(
                bt_self_component_sink *self_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 fs_sink_comp *fs_sink = bt_self_component_get_data(
                        bt_self_component_sink_as_self_component(self_comp));
 
        msg_iter_status =
-               bt_self_component_port_input_message_iterator_create_from_sink_component(
+               bt_message_iterator_create_from_sink_component(
                        self_comp,
                        bt_self_component_sink_borrow_input_port_by_name(
                                self_comp, in_port_name), &fs_sink->upstream_iter);
-       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;
        }