From 4181bd5d9b5d7fbc34f05cd263ce7abfd207820e Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 18 Jun 2022 22:50:16 -0400 Subject: [PATCH] src.ctf.lttng-live: use std::string in list_append_session Use `fmt::format` to create a temporary `std::string`. Change-Id: I2a930cff82e4f43ff303f62a7371eb67d8144c04 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8414 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/12350 Tested-by: jenkins --- src/plugins/ctf/lttng-live/viewer-connection.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/plugins/ctf/lttng-live/viewer-connection.cpp b/src/plugins/ctf/lttng-live/viewer-connection.cpp index 8431c2a4..5001545e 100644 --- a/src/plugins/ctf/lttng-live/viewer-connection.cpp +++ b/src/plugins/ctf/lttng-live/viewer-connection.cpp @@ -510,7 +510,6 @@ static int list_append_session(bt_value *results, GString *base_url, bt_value_map_insert_entry_status insert_status; bt_value_array_append_element_status append_status; bt_value *map = NULL; - GString *url = NULL; bool found = false; /* @@ -539,13 +538,10 @@ static int list_append_session(bt_value *results, GString *base_url, * key = "url", * value = , */ - url = g_string_new(base_url->str); - g_string_append(url, "/host/"); - g_string_append(url, session->hostname); - g_string_append_c(url, '/'); - g_string_append(url, session->session_name); - - insert_status = bt_value_map_insert_string_entry(map, "url", url->str); + insert_status = bt_value_map_insert_string_entry( + map, "url", + fmt::format("{}/host/{}/{}", base_url->str, session->hostname, session->session_name) + .c_str()); if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) { BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Error inserting \"url\" entry."); ret = -1; @@ -631,9 +627,6 @@ static int list_append_session(bt_value *results, GString *base_url, } end: - if (url) { - g_string_free(url, true); - } BT_VALUE_PUT_REF_AND_RESET(map); return ret; } -- 2.34.1