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>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12328
Tested-by: jenkins <jenkins@lttng.org>
-static int set_trace_name(bt_trace *trace, const char *name_suffix, const bt2c::Logger& logger)
+static int set_trace_name(bt_trace *trace, const char *name_suffix)
{
int ret = 0;
const bt_value *val;
{
int ret = 0;
const bt_value *val;
- GString *name;
-
- name = g_string_new(NULL);
- if (!name) {
- BT_CPPLOGE_STR_SPEC(logger, "Failed to allocate a GString.");
- ret = -1;
- goto end;
- }
/*
* Check if we have a trace environment string value named `hostname`.
/*
* Check if we have a trace environment string value named `hostname`.
*/
val = bt_trace_borrow_environment_entry_value_by_name_const(trace, "hostname");
if (val && bt_value_is_string(val)) {
*/
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);
- g_string_append_c(name, G_DIR_SEPARATOR);
+ name += G_DIR_SEPARATOR;
- g_string_append(name, name_suffix);
- ret = bt_trace_set_name(trace, name->str);
+ ret = bt_trace_set_name(trace, name.c_str());
- if (name) {
- g_string_free(name, TRUE);
- }
-
- ret = set_trace_name(ctf_fs_trace->trace->libObjPtr(), name, ctf_fs_trace->logger);
+ ret = set_trace_name(ctf_fs_trace->trace->libObjPtr(), name);