From e001dd28c75a2dac1130e919b0d1f7be870d1583 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 5 Dec 2023 05:09:22 +0000
Subject: [PATCH] src.ctf.fs: remove ctf_fs_trace_destroy

Remove it and the custom deleter, since ctf_fs_trace instances can now
be simply deleted.

Change-Id: I59f3f89b4b3faee45b3708245242cee009d218b7
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8287
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12325
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
---
 src/plugins/ctf/fs-src/fs.cpp | 14 --------------
 src/plugins/ctf/fs-src/fs.hpp |  7 +------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index 6c125461..7f0de79b 100644
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -255,20 +255,6 @@ end:
     }
 }
 
-static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
-{
-    if (!ctf_fs_trace) {
-        return;
-    }
-
-    delete ctf_fs_trace;
-}
-
-void ctf_fs_trace_deleter::operator()(ctf_fs_trace * const trace) noexcept
-{
-    ctf_fs_trace_destroy(trace);
-}
-
 ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger)
 {
     return bt2s::make_unique<ctf_fs_component>(parentLogger);
diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp
index bd9bfb97..9f9f605e 100644
--- a/src/plugins/ctf/fs-src/fs.hpp
+++ b/src/plugins/ctf/fs-src/fs.hpp
@@ -37,14 +37,9 @@ struct ctf_fs_metadata
     int bo = 0;
 };
 
-struct ctf_fs_trace_deleter
-{
-    void operator()(ctf_fs_trace *) noexcept;
-};
-
 struct ctf_fs_trace
 {
-    using UP = std::unique_ptr<ctf_fs_trace, ctf_fs_trace_deleter>;
+    using UP = std::unique_ptr<ctf_fs_trace>;
 
     explicit ctf_fs_trace(const bt2c::Logger& parentLogger) :
         logger {parentLogger, "PLUGIN/SRC.CTF.FS/TRACE"}
-- 
2.34.1