From a78ae01c1491f86f939269b4a89a4864b0de9d14 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 9 Jun 2022 11:32:46 -0400 Subject: [PATCH] src.ctf.fs: use std::string in path_is_ctf_trace Change-Id: I796d135f7daee29a4481e61cf073e8bbd2e0f05f Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8292 Reviewed-by: Philippe Proulx --- src/plugins/ctf/fs-src/fs.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp index 4e0fb27b8..87a641b78 100644 --- a/src/plugins/ctf/fs-src/fs.cpp +++ b/src/plugins/ctf/fs-src/fs.cpp @@ -776,23 +776,18 @@ end: static int path_is_ctf_trace(const char *path) { - GString *metadata_path = g_string_new(NULL); int ret = 0; - if (!metadata_path) { - ret = -1; - goto end; - } - - g_string_printf(metadata_path, "%s" G_DIR_SEPARATOR_S "%s", path, CTF_FS_METADATA_FILENAME); + std::string metadata_path = path; + metadata_path += G_DIR_SEPARATOR; + metadata_path += CTF_FS_METADATA_FILENAME; - if (g_file_test(metadata_path->str, G_FILE_TEST_IS_REGULAR)) { + if (g_file_test(metadata_path.c_str(), G_FILE_TEST_IS_REGULAR)) { ret = 1; goto end; } end: - g_string_free(metadata_path, TRUE); return ret; } -- 2.34.1