1
0
mirror of https://github.com/opencontainers/runc.git synced 2026-02-05 18:45:28 +01:00

all: format sources with gofumpt v0.9.1

Since gofumpt v0.9.0 there's a new formatting rule to "clothe" any naked
returns.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2025-10-07 17:07:50 -07:00
parent a672a5f36c
commit b2f8a74de5
8 changed files with 11 additions and 11 deletions

View File

@@ -125,7 +125,7 @@ func getSealableFile(comment, tmpDir string) (file *os.File, sealFn SealFunc, er
// First, try an executable memfd (supported since Linux 3.17).
file, sealFn, err = Memfd(comment)
if err == nil {
return
return file, sealFn, err
}
logrus.Debugf("memfd cloned binary failed, falling back to O_TMPFILE: %v", err)
@@ -154,7 +154,7 @@ func getSealableFile(comment, tmpDir string) (file *os.File, sealFn SealFunc, er
file.Close()
continue
}
return
return file, sealFn, err
}
logrus.Debugf("O_TMPFILE cloned binary failed, falling back to mktemp(): %v", err)
// Finally, try a classic unlinked temporary file.
@@ -168,7 +168,7 @@ func getSealableFile(comment, tmpDir string) (file *os.File, sealFn SealFunc, er
file.Close()
continue
}
return
return file, sealFn, err
}
return nil, nil, fmt.Errorf("could not create sealable file for cloned binary: %w", err)
}

View File

@@ -210,7 +210,7 @@ func runContainer(t testing.TB, config *configs.Config, args ...string) (buffers
} else {
return buffers, -1, err
}
return
return buffers, exitCode, err
}
// runContainerOk is a wrapper for runContainer, simplifying its use for cases

View File

@@ -34,7 +34,7 @@ func (m Mapping) toSys() (uids, gids []syscall.SysProcIDMap) {
Size: int(gid.Size),
})
}
return
return uids, gids
}
// id returns a unique identifier for this mapping, agnostic of the order of

View File

@@ -236,7 +236,7 @@ func syscallMode(i fs.FileMode) (o uint32) {
o |= unix.S_ISVTX
}
// No mapping for Go's ModeTemporary (plan9 only).
return
return o
}
// mountFd creates a "mount source fd" (either through open_tree(2) or just

View File

@@ -199,7 +199,7 @@ func newPipe(t *testing.T) (parent *os.File, child *os.File) {
parent.Close()
child.Close()
})
return
return parent, child
}
func reapChildren(t *testing.T, parent *os.File) {

View File

@@ -1155,7 +1155,7 @@ func msMoveRoot(rootfs string) error {
strings.HasPrefix(info.Mountpoint, rootfs) {
skip = true
}
return
return skip, stop
})
if err != nil {
return err

View File

@@ -676,7 +676,7 @@ func filterFlags(config *configs.Seccomp, filter *libseccomp.ScmpFilter) (flags
}
}
return
return flags, noNewPrivs, err
}
func sysSeccompSetFilter(flags uint, filter []unix.SockFilter) (fd int, err error) {
@@ -706,7 +706,7 @@ func sysSeccompSetFilter(flags uint, filter []unix.SockFilter) (fd int, err erro
}
runtime.KeepAlive(filter)
runtime.KeepAlive(fprog)
return
return fd, err
}
// PatchAndLoad takes a seccomp configuration and a libseccomp filter which has

View File

@@ -112,5 +112,5 @@ func Annotations(labels []string) (bundle string, userAnnotations map[string]str
userAnnotations[name] = value
}
}
return
return bundle, userAnnotations
}