chore: replace if blocks with min/max functions

Simplify code where possible. Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
siderolabs · Aug 16, 2024 · 45cc868 · 45cc868
1 parent a5bd770
commit 45cc868
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 39 deletions.
diff --git a/hack/gotagsrewrite/main.go b/hack/gotagsrewrite/main.go
@@ -194,9 +194,7 @@ func findHighestProtoNum(structNode *ast.StructType) (int, error) {
 			return nil, err
 		}
 
-		if num > highestNum {
-			highestNum = num
-		}
+		highestNum = max(highestNum, num)
 
 		return nil, nil
 	})

diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_monitoring.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_monitoring.go
@@ -93,9 +93,7 @@ func (s *Server) SystemStat(ctx context.Context, in *emptypb.Empty) (*machine.Sy
 		maxCore := int64(-1)
 
 		for core := range in {
-			if core > maxCore {
-				maxCore = core
-			}
+			maxCore = max(maxCore, core)
 		}
 
 		slc := make([]*machine.CPUStat, maxCore+1)

diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go
@@ -973,10 +973,7 @@ func (s *Server) DiskUsage(req *machine.DiskUsageRequest, obj machine.MachineSer
 			} else {
 				currentDepth := int32(strings.Count(fi.FullPath, archiver.OSPathSeparator)) - rootDepth
 
-				size := fi.FileInfo.Size()
-				if size < 0 {
-					size = 0
-				}
+				size := max(fi.FileInfo.Size(), 0)
 
 				// kcore file size gives wrong value, this code should be smarter when it reads it
 				// TODO: figure out better way to skip such file

diff --git a/internal/app/machined/pkg/adapters/perf/cpu.go b/internal/app/machined/pkg/adapters/perf/cpu.go
@@ -44,9 +44,7 @@ func (a cpu) Update(stat *procfs.Stat) {
 		maxCore := int64(-1)
 
 		for core := range in {
-			if core > maxCore {
-				maxCore = core
-			}
+			maxCore = max(maxCore, core)
 		}
 
 		slc := make([]perf.CPUStat, maxCore+1)

diff --git a/internal/app/machined/pkg/controllers/network/operator/dhcp4.go b/internal/app/machined/pkg/controllers/network/operator/dhcp4.go
@@ -182,9 +182,7 @@ func (d *DHCP4) Run(ctx context.Context, notifyCh chan<- struct{}) {
 			renewInterval /= 2
 		}
 
-		if renewInterval < minRenewDuration {
-			renewInterval = minRenewDuration
-		}
+		renewInterval = max(renewInterval, minRenewDuration)
 
 		for {
 			select {

diff --git a/internal/app/machined/pkg/controllers/network/operator/dhcp6.go b/internal/app/machined/pkg/controllers/network/operator/dhcp6.go
@@ -95,9 +95,7 @@ func (d *DHCP6) Run(ctx context.Context, notifyCh chan<- struct{}) {
 			renewInterval /= 2
 		}
 
-		if renewInterval < minRenewDuration {
-			renewInterval = minRenewDuration
-		}
+		renewInterval = max(renewInterval, minRenewDuration)
 
 		select {
 		case <-ctx.Done():

diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_events.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_events.go
@@ -127,10 +127,7 @@ func (e *Events) Watch(f runtime.WatchFunc, opt ...runtime.WatchOptionFunc) erro
 	// event to be published
 	pos := e.writePos
 	minPos := e.writePos - int64(e.cap-e.gap)
-
-	if minPos < 0 {
-		minPos = 0
-	}
+	minPos = max(minPos, 0)
 
 	// calculate initial position based on options
 	switch {
@@ -140,9 +137,7 @@ func (e *Events) Watch(f runtime.WatchFunc, opt ...runtime.WatchOptionFunc) erro
 		} else {
 			pos -= int64(opts.TailEvents)
 
-			if pos < minPos {
-				pos = minPos
-			}
+			pos = max(pos, minPos)
 		}
 	case !opts.TailID.IsNil():
 		pos = minPos + int64(sort.Search(int(pos-minPos), func(i int) bool {

diff --git a/internal/pkg/containers/cri/cri.go b/internal/pkg/containers/cri/cri.go
@@ -286,11 +286,7 @@ func (i *inspector) buildContainer(container *runtimeapi.Container) (*ctrs.Conta
 }
 
 func safeCut(id string, i int) string {
-	if len(id) > i {
-		return id[:i]
-	}
-
-	return id
+	return id[:min(i, len(id))]
 }
 
 // Pods collects information about running pods & containers.

diff --git a/internal/pkg/dashboard/components/components.go b/internal/pkg/dashboard/components/components.go
@@ -46,15 +46,13 @@ func (fg *fieldGroup) String() string {
 }
 
 func (fg *fieldGroup) maxFieldNameLength() int {
-	max := 0
+	result := 0
 
 	for _, f := range fg.fields {
-		if len(f.Name) > max {
-			max = len(f.Name)
-		}
+		result = max(result, len(f.Name))
 	}
 
-	return max
+	return result
 }
 
 // padRight pads a string to the specified width by appending spaces to the end.

diff --git a/internal/pkg/dashboard/components/graphs.go b/internal/pkg/dashboard/components/graphs.go
@@ -49,9 +49,7 @@ func (widget *BaseGraph) OnAPIDataChange(node string, data *apidata.Data) {
 	for i, name := range widget.DataLabels {
 		series := nodeData.Series[name]
 
-		if len(series) < width {
-			width = len(series)
-		}
+		width = min(width, len(series))
 
 		widget.Data[i] = widget.leftPadSeries(series[len(series)-width:], 2)
 	}