From b4dec6b207a680ed5c2deb1437eeafecf3bda09d Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 5 Dec 2023 03:21:28 +0000 Subject: [PATCH] src.ctf.fs: make get_file return ctf_fs_file::UP Change-Id: I9f115907d062db0a227a49adb7d5786342ca4147 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8263 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/12301 --- src/plugins/ctf/fs-src/metadata.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/plugins/ctf/fs-src/metadata.cpp b/src/plugins/ctf/fs-src/metadata.cpp index 01997017..4957bbf9 100644 --- a/src/plugins/ctf/fs-src/metadata.cpp +++ b/src/plugins/ctf/fs-src/metadata.cpp @@ -35,9 +35,9 @@ end: return fp; } -static struct ctf_fs_file *get_file(const char *trace_path, const bt2c::Logger& logger) +static ctf_fs_file::UP get_file(const char *trace_path, const bt2c::Logger& logger) { - struct ctf_fs_file *file = ctf_fs_file_create(logger).release(); + auto file = ctf_fs_file_create(logger); if (!file) { goto error; @@ -46,17 +46,14 @@ static struct ctf_fs_file *get_file(const char *trace_path, const bt2c::Logger& g_string_append(file->path, trace_path); g_string_append(file->path, G_DIR_SEPARATOR_S CTF_FS_METADATA_FILENAME); - if (ctf_fs_file_open(file, "rb")) { + if (ctf_fs_file_open(file.get(), "rb")) { goto error; } goto end; error: - if (file) { - ctf_fs_file_destroy(file); - file = NULL; - } + file.reset(); end: return file; @@ -66,14 +63,13 @@ int ctf_fs_metadata_set_trace_class(bt_self_component *self_comp, struct ctf_fs_ const ctf::src::ClkClsCfg& clkClsCfg) { int ret = 0; - struct ctf_fs_file *file = NULL; ctf_metadata_decoder_config decoder_config {ctf_fs_trace->logger}; decoder_config.self_comp = self_comp; decoder_config.clkClsCfg = clkClsCfg; decoder_config.create_trace_class = true; - file = get_file(ctf_fs_trace->path->str, ctf_fs_trace->logger); + const auto file = get_file(ctf_fs_trace->path->str, ctf_fs_trace->logger); if (!file) { BT_CPPLOGE_SPEC(ctf_fs_trace->logger, "Cannot create metadata file object."); ret = -1; @@ -101,7 +97,6 @@ int ctf_fs_metadata_set_trace_class(bt_self_component *self_comp, struct ctf_fs_ BT_ASSERT(ctf_fs_trace->metadata->tc); end: - ctf_fs_file_destroy(file); return ret; } -- 2.34.1