bt_self_component_source_as_self_component(component)));
}
-gchar *ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group)
+bt2c::GCharUP ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group)
{
GString *name = g_string_new(NULL);
g_string_append_printf(name, " | %s", ds_file_info->path->str);
}
- return g_string_free(name, FALSE);
+ return bt2c::GCharUP {g_string_free(name, FALSE)};
}
static int create_one_port_for_trace(struct ctf_fs_component *ctf_fs,
{
int ret = 0;
struct ctf_fs_port_data *port_data = NULL;
- gchar *port_name;
- port_name = ctf_fs_make_port_name(ds_file_group);
+ bt2c::GCharUP port_name = ctf_fs_make_port_name(ds_file_group);
if (!port_name) {
goto error;
}
- BT_CPPLOGI_SPEC(ctf_fs->logger, "Creating one port named `{}`", port_name);
+ BT_CPPLOGI_SPEC(ctf_fs->logger, "Creating one port named `{}`", port_name.get());
/* Create output port for this file */
port_data = new ctf_fs_port_data;
port_data->ctf_fs = ctf_fs;
port_data->ds_file_group = ds_file_group;
- ret = bt_self_component_source_add_output_port(self_comp_src, port_name, port_data, NULL);
+ ret = bt_self_component_source_add_output_port(self_comp_src, port_name.get(), port_data, NULL);
if (ret) {
goto error;
}
ret = -1;
end:
- g_free(port_name);
-
port_data_destroy(port_data);
return ret;
}
#include <babeltrace2/babeltrace.h>
+#include "cpp-common/bt2c/glib-up.hpp"
#include "cpp-common/bt2c/logging.hpp"
#include "metadata.hpp"
/*
* Generate the port name to be used for a given data stream file group.
- *
- * The result must be freed using g_free by the caller.
*/
-gchar *ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group);
+bt2c::GCharUP ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group);
#endif /* BABELTRACE_PLUGIN_CTF_FS_H */
int ret = 0;
bt_value_map_insert_entry_status insert_status;
struct ctf_fs_ds_index_entry *first_ds_index_entry, *last_ds_index_entry;
- gchar *port_name = NULL;
+ bt2c::GCharUP port_name;
/*
* Since each `struct ctf_fs_ds_file_group` has a sorted array of
goto end;
}
- insert_status = bt_value_map_insert_string_entry(group_info, "port-name", port_name);
+ insert_status = bt_value_map_insert_string_entry(group_info, "port-name", port_name.get());
if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
ret = -1;
goto end;
}
end:
- g_free(port_name);
return ret;
}