tests/lib/conds: make `condMain()` take a span for args

[babeltrace.git] / tests / lib / conds / utils.cpp

diff --git a/tests/lib/conds/utils.cpp b/tests/lib/conds/utils.cpp
index d393c618a0689bf8fd98efa6a3359f00a7cf41e0..b7d2c487e03504eac70ed44f47f8ebb826154b55 100644 (file)
--- a/tests/lib/conds/utils.cpp
+++ b/tests/lib/conds/utils.cpp
@@ -34,11 +34,11 @@ SimpleCondTrigger::SimpleCondTrigger(std::function<void()> func, const Type type
 
 namespace {
 
-void listCondTriggers(const CondTriggers condTriggers) noexcept
+void listCondTriggers(const CondTriggers& condTriggers) noexcept
 {
     auto condTriggerArray = nlohmann::json::array();
 
-    for (const auto condTrigger : condTriggers) {
+    for (const auto& condTrigger : condTriggers) {
         condTriggerArray.push_back(nlohmann::json {
             {"cond-id", condTrigger->condId()},
             {"name", condTrigger->name()},
@@ -50,9 +50,9 @@ void listCondTriggers(const CondTriggers condTriggers) noexcept
 
 } /* namespace */
 
-void condMain(const int argc, const char ** const argv, const CondTriggers condTriggers) noexcept
+void condMain(const bt2s::span<const char * const> argv, const CondTriggers& condTriggers) noexcept
 {
-    BT_ASSERT(argc >= 2);
+    BT_ASSERT(argv.size() >= 2);
 
     if (strcmp(argv[1], "list") == 0) {
         listCondTriggers(condTriggers);
@@ -65,7 +65,7 @@ void condMain(const int argc, const char ** const argv, const CondTriggers condT
         g_unsetenv("BABELTRACE_EXEC_ON_ABORT");
 
         /* Call the trigger */
-        BT_ASSERT(argc >= 3);
+        BT_ASSERT(argv.size() >= 3);
 
         const auto index = atoi(argv[2]);