From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 9 Apr 2024 21:10:29 +0000 (-0400)
Subject: src.ctf.fs: change a pointer parameter to a reference, remove unused parameter
X-Git-Url: https://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=f9f2dd7121540a84b4de375358e6f8637d70a5b3

src.ctf.fs: change a pointer parameter to a reference, remove unused parameter

 - Change add_range's range parameter to a const ref.
 - Remove the output parameter of populate_stream_info, its caller
   doesn't use it.

Change-Id: I9d9268b3f3e6f6446b2422e9bfb098359c71da02
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8425
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12359
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
---

diff --git a/src/plugins/ctf/fs-src/query.cpp b/src/plugins/ctf/fs-src/query.cpp
index 34679310..0b700e91 100644
--- a/src/plugins/ctf/fs-src/query.cpp
+++ b/src/plugins/ctf/fs-src/query.cpp
@@ -102,20 +102,19 @@ bt2::Value::Shared metadata_info_query(const bt2::ConstMapValue params, const bt
     return result;
 }
 
-static void add_range(const bt2::MapValue info, struct range *range, const char *range_name)
+static void add_range(const bt2::MapValue info, const range& range, const char *range_name)
 {
-    if (!range->set) {
+    if (!range.set) {
         /* Not an error. */
         return;
     }
 
     const auto rangeMap = info.insertEmptyMap(range_name);
-    rangeMap.insert("begin", range->begin_ns);
-    rangeMap.insert("end", range->end_ns);
+    rangeMap.insert("begin", range.begin_ns);
+    rangeMap.insert("end", range.end_ns);
 }
 
-static void populate_stream_info(struct ctf_fs_ds_file_group *group, const bt2::MapValue groupInfo,
-                                 struct range *stream_range)
+static void populate_stream_info(struct ctf_fs_ds_file_group *group, const bt2::MapValue groupInfo)
 {
     /*
      * Since each `struct ctf_fs_ds_file_group` has a sorted array of
@@ -131,16 +130,16 @@ static void populate_stream_info(struct ctf_fs_ds_file_group *group, const bt2::
     /* Last entry. */
     const auto& last_ds_index_entry = group->index.entries.back();
 
-    stream_range->begin_ns = first_ds_index_entry.timestamp_begin_ns;
-    stream_range->end_ns = last_ds_index_entry.timestamp_end_ns;
+    range stream_range;
+    stream_range.begin_ns = first_ds_index_entry.timestamp_begin_ns;
+    stream_range.end_ns = last_ds_index_entry.timestamp_end_ns;
 
     /*
      * If any of the begin and end timestamps is not set it means that
      * packets don't include `timestamp_begin` _and_ `timestamp_end` fields
      * in their packet context so we can't set the range.
      */
-    stream_range->set =
-        stream_range->begin_ns != UINT64_C(-1) && stream_range->end_ns != UINT64_C(-1);
+    stream_range.set = stream_range.begin_ns != UINT64_C(-1) && stream_range.end_ns != UINT64_C(-1);
 
     add_range(groupInfo, stream_range, "range-ns");
     groupInfo.insert("port-name", ctf_fs_make_port_name(group));
@@ -159,9 +158,8 @@ static void populate_trace_info(const struct ctf_fs_trace *trace, const bt2::Map
 
     /* Find range of all stream groups, and of the trace. */
     for (const auto& group : trace->ds_file_groups) {
-        range group_range;
         const auto groupInfo = fileGroups.appendEmptyMap();
-        populate_stream_info(group.get(), groupInfo, &group_range);
+        populate_stream_info(group.get(), groupInfo);
     }
 }