src.ctf.fs: make ctf_fs_make_port_name return std::string

[babeltrace.git] / src / plugins / ctf / fs-src / query.cpp

diff --git a/src/plugins/ctf/fs-src/query.cpp b/src/plugins/ctf/fs-src/query.cpp
index 9245ce38dabadb2b7f039ac7676961aa987d78d5..bb31b17d38c4b498894760fdc94805104d4e1b3b 100644 (file)
--- a/src/plugins/ctf/fs-src/query.cpp
+++ b/src/plugins/ctf/fs-src/query.cpp
@@ -115,7 +115,7 @@ static void add_range(const bt2::MapValue info, struct range *range, const char
 }
 
 static void populate_stream_info(struct ctf_fs_ds_file_group *group, const bt2::MapValue groupInfo,
-                                 struct range *stream_range, const bt2c::Logger& logger)
+                                 struct range *stream_range)
 {
     /*
      * Since each `struct ctf_fs_ds_file_group` has a sorted array of
@@ -144,13 +144,7 @@ static void populate_stream_info(struct ctf_fs_ds_file_group *group, const bt2::
         stream_range->begin_ns != UINT64_C(-1) && stream_range->end_ns != UINT64_C(-1);
 
     add_range(groupInfo, stream_range, "range-ns");
-
-    bt2c::GCharUP portName = ctf_fs_make_port_name(group);
-    if (!portName) {
-        BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(logger, bt2::Error, "Failed to make port name");
-    }
-
-    groupInfo.insert("port-name", portName.get());
+    groupInfo.insert("port-name", ctf_fs_make_port_name(group));
 }
 
 static void populate_trace_info(const struct ctf_fs_trace *trace, const bt2::MapValue traceInfo,
@@ -168,7 +162,7 @@ static void populate_trace_info(const struct ctf_fs_trace *trace, const bt2::Map
     for (const auto& group : trace->ds_file_groups) {
         range group_range;
         const auto groupInfo = fileGroups.appendEmptyMap();
-        populate_stream_info(group.get(), groupInfo, &group_range, logger);
+        populate_stream_info(group.get(), groupInfo, &group_range);
     }
 }