src.ctf.fs: introduce and use ctf_fs_msg_iter_data::UP

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

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index d6d6bf5349ba8e248711520956ef07ed7423308c..22baaf3b39736f4caa3dfe1247acfd931cfa6b53 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -35,15 +35,6 @@ struct tracer_info
     int64_t patch;
 };
 
-static void ctf_fs_msg_iter_data_destroy(struct ctf_fs_msg_iter_data *msg_iter_data)
-{
-    if (!msg_iter_data) {
-        return;
-    }
-
-    delete msg_iter_data;
-}
-
 static bt_message_iterator_class_next_method_status
 ctf_fs_iterator_next_one(struct ctf_fs_msg_iter_data *msg_iter_data, const bt_message **out_msg)
 {
@@ -176,8 +167,8 @@ ctf_fs_iterator_seek_beginning(bt_self_message_iterator *it)
 
 void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
 {
-    ctf_fs_msg_iter_data_destroy(
-        (struct ctf_fs_msg_iter_data *) bt_self_message_iterator_get_data(it));
+    ctf_fs_msg_iter_data::UP {
+        (static_cast<ctf_fs_msg_iter_data *>(bt_self_message_iterator_get_data(it)))};
 }
 
 static bt_message_iterator_class_initialize_method_status
@@ -211,7 +202,7 @@ ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter,
             bt_self_component_port_output_as_self_component_port(self_port));
         BT_ASSERT(port_data);
 
-        ctf_fs_msg_iter_data *msg_iter_data = new ctf_fs_msg_iter_data {self_msg_iter};
+        auto msg_iter_data = bt2s::make_unique<ctf_fs_msg_iter_data>(self_msg_iter);
         msg_iter_data->ds_file_group = port_data->ds_file_group;
 
         medium_status = ctf_fs_ds_group_medops_data_create(msg_iter_data->ds_file_group,
@@ -247,8 +238,7 @@ ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter,
             bt_self_message_iterator_configuration_set_can_seek_forward(config, true);
         }
 
-        bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data);
-        msg_iter_data = NULL;
+        bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data.release());
 
         status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
         goto end;
@@ -257,7 +247,6 @@ error:
         bt_self_message_iterator_set_data(self_msg_iter, NULL);
 
 end:
-        ctf_fs_msg_iter_data_destroy(msg_iter_data);
         return status;
     } catch (const std::bad_alloc&) {
         return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;