src.ctf.fs: make ctf_msg_iter_create return a unique_ptr

[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 b1ac21d1e47e067576691c1199f5f945d2adb09e..490de46dbabc24ec9953bd03d1f02ed58b79a40f 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -232,11 +232,13 @@ ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter,
             goto error;
         }
 
-        msg_iter_data->msg_iter = ctf_msg_iter_create(
-            msg_iter_data->ds_file_group->ctf_fs_trace->metadata->tc,
-            bt_common_get_page_size(static_cast<int>(msg_iter_data->logger.level())) * 8,
-            ctf_fs_ds_group_medops, msg_iter_data->msg_iter_medops_data.get(), self_msg_iter,
-            msg_iter_data->logger);
+        msg_iter_data->msg_iter =
+            ctf_msg_iter_create(
+                msg_iter_data->ds_file_group->ctf_fs_trace->metadata->tc,
+                bt_common_get_page_size(static_cast<int>(msg_iter_data->logger.level())) * 8,
+                ctf_fs_ds_group_medops, msg_iter_data->msg_iter_medops_data.get(), self_msg_iter,
+                msg_iter_data->logger)
+                .release();
         if (!msg_iter_data->msg_iter) {
             BT_CPPLOGE_APPEND_CAUSE_SPEC(msg_iter_data->logger,
                                          "Cannot create a CTF message iterator.");
@@ -512,9 +514,10 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const
 
     /* Create a temporary iterator to read the ds_file. */
     msg_iter = ctf_msg_iter_create(
-        ctf_fs_trace->metadata->tc,
-        bt_common_get_page_size(static_cast<int>(ctf_fs_trace->logger.level())) * 8,
-        ctf_fs_ds_file_medops, ds_file.get(), nullptr, ctf_fs_trace->logger);
+                   ctf_fs_trace->metadata->tc,
+                   bt_common_get_page_size(static_cast<int>(ctf_fs_trace->logger.level())) * 8,
+                   ctf_fs_ds_file_medops, ds_file.get(), nullptr, ctf_fs_trace->logger)
+                   .release();
     if (!msg_iter) {
         BT_CPPLOGE_STR_SPEC(ctf_fs_trace->logger, "Cannot create a CTF message iterator.");
         goto error;
@@ -1117,9 +1120,10 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace,
     BT_ASSERT(ctf_fs_trace->metadata->tc);
 
     msg_iter = ctf_msg_iter_create(
-        ctf_fs_trace->metadata->tc,
-        bt_common_get_page_size(static_cast<int>(ctf_fs_trace->logger.level())) * 8,
-        ctf_fs_ds_file_medops, ds_file.get(), NULL, ctf_fs_trace->logger);
+                   ctf_fs_trace->metadata->tc,
+                   bt_common_get_page_size(static_cast<int>(ctf_fs_trace->logger.level())) * 8,
+                   ctf_fs_ds_file_medops, ds_file.get(), NULL, ctf_fs_trace->logger)
+                   .release();
     if (!msg_iter) {
         /* ctf_msg_iter_create() logs errors. */
         ret = -1;