Merge pull request #12129 from thaJeztah/noshadow

dmcgowan · web-flow · commit 43f9cdd3bcf1 · 2025-07-22T20:44:16.000Z
cmd/ctr: rename vars that shadowed builtin
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -243,17 +243,17 @@ func NewContainer(ctx context.Context, client *containerd.Client, cliContext *cl
 		}
 
 		if caps := cliContext.StringSlice("cap-add"); len(caps) > 0 {
-			for _, cap := range caps {
-				if !strings.HasPrefix(cap, "CAP_") {
+			for _, c := range caps {
+				if !strings.HasPrefix(c, "CAP_") {
 					return nil, errors.New("capabilities must be specified with 'CAP_' prefix")
 				}
 			}
 			opts = append(opts, oci.WithAddedCapabilities(caps))
 		}
 
 		if caps := cliContext.StringSlice("cap-drop"); len(caps) > 0 {
-			for _, cap := range caps {
-				if !strings.HasPrefix(cap, "CAP_") {
+			for _, c := range caps {
+				if !strings.HasPrefix(c, "CAP_") {
 					return nil, errors.New("capabilities must be specified with 'CAP_' prefix")
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -243,17 +243,17 @@ func NewContainer(ctx context.Context, client containerd.Client, cliContext cl`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`if caps := cliContext.StringSlice("cap-add"); len(caps) > 0 {`
`246`		`- for _, cap := range caps {`
`247`		`- if !strings.HasPrefix(cap, "CAP_") {`
	`246`	`+ for _, c := range caps {`
	`247`	`+ if !strings.HasPrefix(c, "CAP_") {`
`248`	`248`	`return nil, errors.New("capabilities must be specified with 'CAP_' prefix")`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`	`opts = append(opts, oci.WithAddedCapabilities(caps))`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`if caps := cliContext.StringSlice("cap-drop"); len(caps) > 0 {`
`255`		`- for _, cap := range caps {`
`256`		`- if !strings.HasPrefix(cap, "CAP_") {`
	`255`	`+ for _, c := range caps {`
	`256`	`+ if !strings.HasPrefix(c, "CAP_") {`
`257`	`257`	`return nil, errors.New("capabilities must be specified with 'CAP_' prefix")`
`258`	`258`	`}`
`259`	`259`	`}`