src.ctf.fs: make ctf_fs_trace::path an std::string

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

diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp
index 9058c793f72fea59b87e90367d30e46944faf8fe..3762fcdefb174633df9106c8fdd9ecc7d4281f35 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.hpp
+++ b/src/plugins/ctf/fs-src/fs.hpp
@@ -58,13 +58,11 @@ struct ctf_fs_trace
     /* Owned by this */
     struct ctf_fs_metadata *metadata = nullptr;
 
-    /* Owned by this */
-    bt_trace *trace = nullptr;
+    bt2::Trace::Shared trace;
 
     std::vector<ctf_fs_ds_file_group::UP> ds_file_groups;
 
-    /* Owned by this */
-    GString *path = nullptr;
+    std::string path;
 
     /* Next automatic stream ID when not provided by packet header */
     uint64_t next_stream_id = 0;
@@ -101,6 +99,8 @@ struct ctf_fs_component
 
 struct ctf_fs_msg_iter_data
 {
+    using UP = std::unique_ptr<ctf_fs_msg_iter_data>;
+
     explicit ctf_fs_msg_iter_data(bt_self_message_iterator *selfMsgIter) :
         self_msg_iter {selfMsgIter}, logger {bt2::SelfMessageIterator {self_msg_iter},
                                              "PLUGIN/SRC.CTF.FS/MSG-ITER"}