From 6000a1a45bf08a904689d3ba9d0875a7d0c6d638 Mon Sep 17 00:00:00 2001
From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Date: Mon, 9 Feb 2026 12:01:27 +0100
Subject: [PATCH] Use SplitSeq and max to modernize code

---
 collectors/slurmCgroupMetric.go       | 3 +--
 internal/metricRouter/metricRouter.go | 6 ++----
 pkg/ccTopology/ccTopology.go          | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/collectors/slurmCgroupMetric.go b/collectors/slurmCgroupMetric.go
index 662532a..2759709 100644
--- a/collectors/slurmCgroupMetric.go
+++ b/collectors/slurmCgroupMetric.go
@@ -50,8 +50,7 @@ func ParseCPUs(cpuset string) ([]int, error) {
 		return result, nil
 	}
 
-	ranges := strings.Split(cpuset, ",")
-	for _, r := range ranges {
+	for r := range strings.SplitSeq(cpuset, ",") {
 		if strings.Contains(r, "-") {
 			parts := strings.Split(r, "-")
 			if len(parts) != 2 {
diff --git a/internal/metricRouter/metricRouter.go b/internal/metricRouter/metricRouter.go
index 60039fd..6ecade9 100644
--- a/internal/metricRouter/metricRouter.go
+++ b/internal/metricRouter/metricRouter.go
@@ -107,10 +107,8 @@ func (r *metricRouter) Init(ticker mct.MultiChanTicker, wg *sync.WaitGroup, rout
 		cclog.ComponentError("MetricRouter", err.Error())
 		return err
 	}
-	r.maxForward = 1
-	if r.config.MaxForward > r.maxForward {
-		r.maxForward = r.config.MaxForward
-	}
+	r.maxForward = max(1, r.config.MaxForward)
+
 	if r.config.NumCacheIntervals > 0 {
 		r.cache, err = NewCache(r.cache_input, r.ticker, &r.cachewg, r.config.NumCacheIntervals)
 		if err != nil {
diff --git a/pkg/ccTopology/ccTopology.go b/pkg/ccTopology/ccTopology.go
index 69c7ec3..569ab56 100644
--- a/pkg/ccTopology/ccTopology.go
+++ b/pkg/ccTopology/ccTopology.go
@@ -80,7 +80,7 @@ func fileToList(path string) []int {
 	// Create list
 	list := make([]int, 0)
 	stringBuffer := strings.TrimSpace(string(buffer))
-	for _, valueRangeString := range strings.Split(stringBuffer, ",") {
+	for valueRangeString := range strings.SplitSeq(stringBuffer, ",") {
 		valueRange := strings.Split(valueRangeString, "-")
 		switch len(valueRange) {
 		case 1: