src.ctf.fs: add status conversion function

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

diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
index a6712cb74ab9ae2a419728cc4088f169c4a7b752..ac3bdb31e73d28002f946e3717fb106105814dfb 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -1,28 +1,10 @@
 /*
- * fs.c
- *
- * Babeltrace CTF file system Reader Component
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2015-2017 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@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.
+ * Babeltrace CTF file system Reader Component
  */
 
 #define BT_COMP_LOG_SELF_COMP self_comp
@@ -207,11 +189,29 @@ void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
                bt_self_message_iterator_get_data(it));
 }
 
+static
+bt_message_iterator_class_initialize_method_status
+ctf_msg_iter_medium_status_to_msg_iter_initialize_status
+       (enum ctf_msg_iter_medium_status status)
+{
+       switch (status) {
+       case CTF_MSG_ITER_MEDIUM_STATUS_EOF:
+       case CTF_MSG_ITER_MEDIUM_STATUS_AGAIN:
+       case CTF_MSG_ITER_MEDIUM_STATUS_ERROR:
+               return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
+       case CTF_MSG_ITER_MEDIUM_STATUS_MEMORY_ERROR:
+               return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
+       case CTF_MSG_ITER_MEDIUM_STATUS_OK:
+               return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
+       }
+
+       bt_common_abort();
+}
+
 BT_HIDDEN
 bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_message_iterator_configuration *config,
-               bt_self_component *self_comp,
                bt_self_component_port_output *self_port)
 {
        struct ctf_fs_port_data *port_data;
@@ -219,6 +219,8 @@ bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init(
        bt_message_iterator_class_initialize_method_status status;
        bt_logging_level log_level;
        enum ctf_msg_iter_medium_status medium_status;
+       bt_self_component *self_comp =
+               bt_self_message_iterator_borrow_component(self_msg_iter);
 
        port_data = bt_self_component_port_get_data(
                bt_self_component_port_output_as_self_component_port(
@@ -246,7 +248,7 @@ bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init(
        if (medium_status != CTF_MSG_ITER_MEDIUM_STATUS_OK) {
                BT_MSG_ITER_LOGE_APPEND_CAUSE(self_msg_iter,
                        "Failed to create ctf_fs_ds_group_medops");
-               status = (int) medium_status;
+               status = ctf_msg_iter_medium_status_to_msg_iter_initialize_status(medium_status);
                goto error;
        }
 
@@ -679,7 +681,7 @@ void ds_index_insert_ds_index_entry_sorted(
        struct ctf_fs_ds_index_entry *entry)
 {
        guint i;
-       struct ctf_fs_ds_index_entry *other_entry;
+       struct ctf_fs_ds_index_entry *other_entry = NULL;
 
        /* Find the spot where to insert this index entry. */
        for (i = 0; i < index->entries->len; i++) {