src.ctf.lttng-live: use std::string in list_append_session

Change-Id: I2a930cff82e4f43ff303f62a7371eb67d8144c04
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8414
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.cpp b/src/plugins/ctf/lttng-live/viewer-connection.cpp
index b0bee11af51ba3bfceb35ba72b8e40c4a52e1d1f..2546d7953f5abb799728acd438279ea70f550b2f 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.cpp
+++ b/src/plugins/ctf/lttng-live/viewer-connection.cpp
@@ -600,8 +600,8 @@ 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;
+    std::string url;
 
     /*
      * If the session already exists, add the stream count to it,
@@ -628,13 +628,13 @@ static int list_append_session(bt_value *results, GString *base_url,
      * key = "url",
      * value = <string>,
      */
-    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);
+    url = base_url->str;
+    url += "/host/";
+    url += session->hostname;
+    url += '/';
+    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", url.c_str());
     if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
         BT_CLOGE_APPEND_CAUSE("Error inserting \"url\" entry.");
         ret = -1;
@@ -715,9 +715,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;
 }