Change-Id: Ifdb2c818f66efbc328b095408ae2834646fba4fe
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8310
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12337
Tested-by: jenkins <jenkins@lttng.org>
int ret;
bt2c::GCharUP directory;
bt2c::GCharUP basename;
int ret;
bt2c::GCharUP directory;
bt2c::GCharUP basename;
- GString *index_basename = NULL;
+ std::string index_basename;
bt2c::GCharUP index_file_path;
GMappedFile *mapped_file = NULL;
gsize filesize;
bt2c::GCharUP index_file_path;
GMappedFile *mapped_file = NULL;
gsize filesize;
- index_basename = g_string_new(basename.get());
- if (!index_basename) {
- BT_CPPLOGE_STR_SPEC(ds_file->logger, "Cannot allocate index file basename string");
- goto error;
- }
-
- g_string_append(index_basename, ".idx");
- index_file_path.reset(g_build_filename(directory.get(), "index", index_basename->str, NULL));
+ index_basename = fmt::format("{}.idx", basename.get());
+ index_file_path.reset(g_build_filename(directory.get(), "index", index_basename.c_str(), NULL));
mapped_file = g_mapped_file_new(index_file_path.get(), FALSE, NULL);
if (!mapped_file) {
BT_CPPLOGD_SPEC(ds_file->logger, "Cannot create new mapped file {}", index_file_path.get());
mapped_file = g_mapped_file_new(index_file_path.get(), FALSE, NULL);
if (!mapped_file) {
BT_CPPLOGD_SPEC(ds_file->logger, "Cannot create new mapped file {}", index_file_path.get());
- if (index_basename) {
- g_string_free(index_basename, TRUE);
- }
if (mapped_file) {
g_mapped_file_unref(mapped_file);
}
if (mapped_file) {
g_mapped_file_unref(mapped_file);
}