erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-05 00:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pkg/rootless: modernize

Browse source 
Using modernize (aka go fix) from Go 1.26.3, implement the following
changes:

> pkg/rootless/rootless_linux.go:319:30: fmtappendf: Replace []byte(fmt.Sprintf...) with fmt.Appendf (modernize)
> 		err = os.WriteFile(uidMap, []byte(fmt.Sprintf("%d %d 1\n", 0, os.Geteuid())), 0o666)
> 		                           ^
> pkg/rootless/rootless_linux.go:339:30: fmtappendf: Replace []byte(fmt.Sprintf...) with fmt.Appendf (modernize)
> 		err = os.WriteFile(gidMap, []byte(fmt.Sprintf("%d %d 1\n", 0, os.Getegid())), 0o666)
> 		                           ^
> pkg/rootless/rootless_linux.go:381:6: rangeint: for loop can be modernized using range over int (modernize)
> 	for sig := 0; sig < numSig; sig++ {
> 	    ^
> pkg/rootless/rootless_linux.go:432:24: stringsseq: Ranging over SplitSeq is more efficient (modernize)
> 	for _, entry := range bytes.Split(data, []byte{0}) {
> 	                      ^

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2026-05-22 12:25:21 -07:00
parent bd7e8bbab3
commit 121948d69e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/rootless/rootless_linux.go
View file

@ -316,7 +316,7 @@ func becomeRootInUserNS(stateDir string) (_ bool, _ int, retErr error) {
} }
logrus.Debugf("write setgroups file exited with 0") logrus.Debugf("write setgroups file exited with 0")
err = os.WriteFile(uidMap, []byte(fmt.Sprintf("%d %d 1\n", 0, os.Geteuid())), 0o666) err = os.WriteFile(uidMap, fmt.Appendf(nil, "%d %d 1\n", 0, os.Geteuid()), 0o666)
if err != nil { if err != nil {
return false, -1, fmt.Errorf("cannot write uid_map: %w", err) return false, -1, fmt.Errorf("cannot write uid_map: %w", err)
} }
@ -336,7 +336,7 @@ func becomeRootInUserNS(stateDir string) (_ bool, _ int, retErr error) {
gidsMapped = err == nil gidsMapped = err == nil
} }
if !gidsMapped { if !gidsMapped {
err = os.WriteFile(gidMap, []byte(fmt.Sprintf("%d %d 1\n", 0, os.Getegid())), 0o666) err = os.WriteFile(gidMap, fmt.Appendf(nil, "%d %d 1\n", 0, os.Getegid()), 0o666)
if err != nil { if err != nil {
return false, -1, fmt.Errorf("cannot write gid_map: %w", err) return false, -1, fmt.Errorf("cannot write gid_map: %w", err)
} }
@ -378,7 +378,7 @@ func becomeRootInUserNS(stateDir string) (_ bool, _ int, retErr error) {
func waitAndProxySignalsToChild(pid C.int) (bool, int, error) { func waitAndProxySignalsToChild(pid C.int) (bool, int, error) {
signals := []os.Signal{} signals := []os.Signal{}
for sig := 0; sig < numSig; sig++ { for sig := range numSig {
if sig == int(unix.SIGTSTP) { if sig == int(unix.SIGTSTP) {
continue continue
} }
@ -429,7 +429,7 @@ func isPauseProcess(pid int) bool {
if err != nil { if err != nil {
return false return false
} }
for _, entry := range bytes.Split(data, []byte{0}) { for entry := range bytes.SplitSeq(data, []byte{0}) {
if string(entry) == "_PODMAN_PAUSE=1" { if string(entry) == "_PODMAN_PAUSE=1" {
return true return true
} }