daemon: rename max/min as it collides with go1.21 builtin

thaJeztah · thaJeztah · commit a3867992b7c2 · 2023-08-26T22:02:21.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/daemon/health.go b/daemon/health.go
@@ -406,7 +406,7 @@ func (b *limitedBuffer) Write(data []byte) (int, error) {
 
 	bufLen := b.buf.Len()
 	dataLen := len(data)
-	keep := min(maxOutputLen-bufLen, dataLen)
+	keep := minInt(maxOutputLen-bufLen, dataLen)
 	if keep > 0 {
 		b.buf.Write(data[:keep])
 	}
@@ -436,7 +436,7 @@ func timeoutWithDefault(configuredValue time.Duration, defaultValue time.Duratio
 	return configuredValue
 }
 
-func min(x, y int) int {
+func minInt(x, y int) int {
 	if x < y {
 		return x
 	}
diff --git a/daemon/images/image_windows.go b/daemon/images/image_windows.go
@@ -18,8 +18,8 @@ func (i *ImageService) GetContainerLayerSize(ctx context.Context, containerID st
 // GetLayerFolders returns the layer folders from an image RootFS
 func (i *ImageService) GetLayerFolders(img *image.Image, rwLayer layer.RWLayer) ([]string, error) {
 	folders := []string{}
-	max := len(img.RootFS.DiffIDs)
-	for index := 1; index <= max; index++ {
+	rd := len(img.RootFS.DiffIDs)
+	for index := 1; index <= rd; index++ {
 		// FIXME: why does this mutate the RootFS?
 		img.RootFS.DiffIDs = img.RootFS.DiffIDs[:index]
 		if !system.IsOSSupported(img.OperatingSystem()) {

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ func (b *limitedBuffer) Write(data []byte) (int, error) {`
`406`	`406`
`407`	`407`	`bufLen := b.buf.Len()`
`408`	`408`	`dataLen := len(data)`
`409`		`- keep := min(maxOutputLen-bufLen, dataLen)`
	`409`	`+ keep := minInt(maxOutputLen-bufLen, dataLen)`
`410`	`410`	`if keep > 0 {`
`411`	`411`	`b.buf.Write(data[:keep])`
`412`	`412`	`}`
`@@ -436,7 +436,7 @@ func timeoutWithDefault(configuredValue time.Duration, defaultValue time.Duratio`
`436`	`436`	`return configuredValue`
`437`	`437`	`}`
`438`	`438`
`439`		`-func min(x, y int) int {`
	`439`	`+func minInt(x, y int) int {`
`440`	`440`	`if x < y {`
`441`	`441`	`return x`
`442`	`442`	`}`