src.ctf.fs: remove ctf_fs_ds_group_medops_data_destroy

Remove it, simply delete `data` in the custom deleter.  Note that we
still use a custom deleter because ctf_fs_ds_group_medops_data is in the
.cpp file, and therefore not visible to other compilation units.  We
could move it to the .hpp to avoid this, but it's going to be removed
soon anyway, so it's not worth it.

Change-Id: Ib5741e0e0a535cb84b2a4e27ff6ff9620eaaebce
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8273
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12311
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/plugins/ctf/fs-src/data-stream-file.cpp b/src/plugins/ctf/fs-src/data-stream-file.cpp
index 73d4751bb150e01c6c2737e2698c0e4fceedbd3e..caad4b58123d1d341e5ca82c685d317a6fcfd740 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.cpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.cpp
@@ -377,21 +377,9 @@ end:
     return status;
 }
 
-void ctf_fs_ds_group_medops_data_destroy(struct ctf_fs_ds_group_medops_data *data)
-{
-    if (!data) {
-        goto end;
-    }
-
-    delete data;
-
-end:
-    return;
-}
-
 void ctf_fs_ds_group_medops_data_deleter::operator()(ctf_fs_ds_group_medops_data *data) noexcept
 {
-    ctf_fs_ds_group_medops_data_destroy(data);
+    delete data;
 }
 
 enum ctf_msg_iter_medium_status ctf_fs_ds_group_medops_data_create(

diff --git a/src/plugins/ctf/fs-src/data-stream-file.hpp b/src/plugins/ctf/fs-src/data-stream-file.hpp
index d5db8cfcc82189c24b848f6178e642fdb5dcea02..b9e37198074c1c81a2527bbe75da528e1ad62208 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.hpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.hpp
@@ -196,6 +196,4 @@ ctf_fs_ds_group_medops_data_create(struct ctf_fs_ds_file_group *ds_file_group,
 
 void ctf_fs_ds_group_medops_data_reset(struct ctf_fs_ds_group_medops_data *data);
 
-void ctf_fs_ds_group_medops_data_destroy(struct ctf_fs_ds_group_medops_data *data);
-
 #endif /* CTF_FS_DS_FILE_H */