src.ctf.fs: use std::string in set_trace_name

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

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index 2319f277b9e074e145a28412d0627f962d4081cb..4e0fb27b8e8a46b0e187d5cc0fc09b06161aa3bd 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -693,14 +693,7 @@ static int set_trace_name(bt_trace *trace, const char *name_suffix,
 {
     int ret = 0;
     const bt_value *val;
-    GString *name;
-
-    name = g_string_new(NULL);
-    if (!name) {
-        BT_CLOGE_STR("Failed to allocate a GString.");
-        ret = -1;
-        goto end;
-    }
+    std::string name;
 
     /*
      * Check if we have a trace environment string value named `hostname`.
@@ -708,18 +701,18 @@ static int set_trace_name(bt_trace *trace, const char *name_suffix,
      */
     val = bt_trace_borrow_environment_entry_value_by_name_const(trace, "hostname");
     if (val && bt_value_is_string(val)) {
-        g_string_append(name, bt_value_string_get(val));
+        name += bt_value_string_get(val);
 
         if (name_suffix) {
-            g_string_append_c(name, G_DIR_SEPARATOR);
+            name += G_DIR_SEPARATOR;
         }
     }
 
     if (name_suffix) {
-        g_string_append(name, name_suffix);
+        name += name_suffix;
     }
 
-    ret = bt_trace_set_name(trace, name->str);
+    ret = bt_trace_set_name(trace, name.c_str());
     if (ret) {
         goto end;
     }
@@ -727,10 +720,6 @@ static int set_trace_name(bt_trace *trace, const char *name_suffix,
     goto end;
 
 end:
-    if (name) {
-        g_string_free(name, TRUE);
-    }
-
     return ret;
 }