summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bsc/BSC_Tests.ttcn2
-rw-r--r--library/Osmocom_CTRL_Functions.ttcn14
2 files changed, 7 insertions, 9 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index facb001..f25c75d 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -197,7 +197,7 @@ private function f_ctrs_msc_init(integer mscs_count := NUM_MSC, CounterNameVals
}
private function f_ctrs_msc_add(integer msc_nr, charstring countername, integer val := 1) runs on test_CT {
- g_ctr_msc := f_counter_name_vals_list_add(g_ctr_msc, msc_nr, countername, val);
+ f_counter_name_vals_list_add(g_ctr_msc, msc_nr, countername, val);
}
/* f_ctrs_msc_init();
diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn
index ee7025c..60c66c0 100644
--- a/library/Osmocom_CTRL_Functions.ttcn
+++ b/library/Osmocom_CTRL_Functions.ttcn
@@ -222,12 +222,12 @@ module Osmocom_CTRL_Functions {
}
/* In a list of one instance's counters, increment a specifically named counter. */
- function f_counter_name_vals_add(CounterNameVals vals, charstring countername, integer val := 1)
- return CounterNameVals{
+ function f_counter_name_vals_add(inout CounterNameVals vals, charstring countername, integer val := 1)
+ {
for (var integer i := 0; i < lengthof(vals); i := i + 1) {
if (vals[i].name == countername) {
vals[i].val := vals[i].val + val;
- return vals;
+ return;
}
}
/* name not found, append */
@@ -235,15 +235,13 @@ module Osmocom_CTRL_Functions {
name := countername,
val := val
}
- return vals;
}
/* In a list of several instances' counters, increment a specific instance's specifically named counter. */
- function f_counter_name_vals_list_add(CounterNameValsList vals, integer instance_nr,
+ function f_counter_name_vals_list_add(inout CounterNameValsList vals, integer instance_nr,
charstring countername, integer val := 1)
- return CounterNameValsList {
- vals[instance_nr] := f_counter_name_vals_add(vals[instance_nr], countername, val);
- return vals;
+ {
+ f_counter_name_vals_add(vals[instance_nr], countername, val);
}
/* For a specific instance, call f_counter_name_vals_get() and compare with expected counter values.