From 1b19849c7dc6a73dbc1da5f84a82f2eb741dff58 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 2 Nov 2023 19:04:35 +0000 Subject: [PATCH] src.ctf.fs: remove ctf_fs_metadata_init and ctf_fs_metadata_fini Change-Id: Ie34c0a5c5aea60aa2fc771d35a39b61ec0eca336 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8285 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/12323 Tested-by: jenkins --- src/plugins/ctf/fs-src/fs.cpp | 2 -- src/plugins/ctf/fs-src/metadata.cpp | 11 ----------- src/plugins/ctf/fs-src/metadata.hpp | 4 ---- 3 files changed, 17 deletions(-) diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp index 41b311c1..2b2f5bc4 100644 --- a/src/plugins/ctf/fs-src/fs.cpp +++ b/src/plugins/ctf/fs-src/fs.cpp @@ -262,7 +262,6 @@ static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace) } if (ctf_fs_trace->metadata) { - ctf_fs_metadata_fini(ctf_fs_trace->metadata); delete ctf_fs_trace->metadata; } @@ -747,7 +746,6 @@ static ctf_fs_trace::UP ctf_fs_trace_create(const char *path, const char *name, ctf_fs_trace->path = path; ctf_fs_trace->metadata = new ctf_fs_metadata; - ctf_fs_metadata_init(ctf_fs_trace->metadata); ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace.get(), clkClsCfg); if (ret) { diff --git a/src/plugins/ctf/fs-src/metadata.cpp b/src/plugins/ctf/fs-src/metadata.cpp index 4a99ca7e..f19a1f47 100644 --- a/src/plugins/ctf/fs-src/metadata.cpp +++ b/src/plugins/ctf/fs-src/metadata.cpp @@ -100,14 +100,3 @@ int ctf_fs_metadata_set_trace_class(bt_self_component *self_comp, struct ctf_fs_ end: return ret; } - -int ctf_fs_metadata_init(struct ctf_fs_metadata *) -{ - /* Nothing to initialize for the moment. */ - return 0; -} - -void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata) -{ - metadata->decoder.reset(); -} diff --git a/src/plugins/ctf/fs-src/metadata.hpp b/src/plugins/ctf/fs-src/metadata.hpp index 202980bd..14d7cc19 100644 --- a/src/plugins/ctf/fs-src/metadata.hpp +++ b/src/plugins/ctf/fs-src/metadata.hpp @@ -21,10 +21,6 @@ class Logger; #define CTF_FS_METADATA_FILENAME "metadata" -int ctf_fs_metadata_init(struct ctf_fs_metadata *metadata); - -void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata); - int ctf_fs_metadata_set_trace_class(bt_self_component *self_comp, struct ctf_fs_trace *ctf_fs_trace, const ctf::src::ClkClsCfg& clkClsCfg); -- 2.34.1