Fix: src.ctf.fs: initialize the other_entry variable

[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..a6b5315ffc067cc92547a1fadd22e5fcbe414496 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -211,7 +211,6 @@ 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 +218,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(
@@ -679,7 +680,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++) {