From: Simon Marchi <simon.marchi@efficios.com>
Date: Thu, 9 Jun 2022 13:34:22 +0000 (-0400)
Subject: src.ctf.fs: remove ctf_fs_ds_file_group_destroy
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=235f9fd9c82c5fa4b0c71b77c424aa83d3399bd6

src.ctf.fs: remove ctf_fs_ds_file_group_destroy

Remove ctf_fs_ds_file_group_destroy and the custom deleter, now that
ctf_fs_ds_file_group can be simply deleted.

Change-Id: I41100be8a99276ef17df4c9aa37a7f4db0275869
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8257
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12295
---

diff --git a/src/plugins/ctf/fs-src/data-stream-file.cpp b/src/plugins/ctf/fs-src/data-stream-file.cpp
index 06e4b5f1..97e688e4 100644
--- a/src/plugins/ctf/fs-src/data-stream-file.cpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.cpp
@@ -896,20 +896,6 @@ ctf_fs_ds_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t beg
     return ds_file_info;
 }
 
-static void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group)
-{
-    if (!ds_file_group) {
-        return;
-    }
-
-    delete ds_file_group;
-}
-
-void ctf_fs_ds_file_group_deleter::operator()(ctf_fs_ds_file_group *group) noexcept
-{
-    ctf_fs_ds_file_group_destroy(group);
-}
-
 ctf_fs_ds_file_group::UP ctf_fs_ds_file_group_create(struct ctf_fs_trace *ctf_fs_trace,
                                                      struct ctf_stream_class *sc,
                                                      uint64_t stream_instance_id,
diff --git a/src/plugins/ctf/fs-src/data-stream-file.hpp b/src/plugins/ctf/fs-src/data-stream-file.hpp
index f01ab7e9..fed80c61 100644
--- a/src/plugins/ctf/fs-src/data-stream-file.hpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.hpp
@@ -116,14 +116,9 @@ struct ctf_fs_ds_index
     std::vector<ctf_fs_ds_index_entry::UP> entries;
 };
 
-struct ctf_fs_ds_file_group_deleter
-{
-    void operator()(struct ctf_fs_ds_file_group *group) noexcept;
-};
-
 struct ctf_fs_ds_file_group
 {
-    using UP = std::unique_ptr<ctf_fs_ds_file_group, ctf_fs_ds_file_group_deleter>;
+    using UP = std::unique_ptr<ctf_fs_ds_file_group>;
 
     /*
      * This is an _ordered_ array of data stream file infos which