diff options
author | Eng Zer Jun <engzerjun@gmail.com> | 2022-09-11 15:58:31 +0800 |
---|---|---|
committer | Eng Zer Jun <engzerjun@gmail.com> | 2022-09-11 15:58:31 +0800 |
commit | 118546c6a70704a7b19cb99f3c948b28264628de (patch) | |
tree | 5eb092820335de6860d5b5304a2a3e02f8125d03 /pkg/util | |
parent | b9cbc0c09a68be7bb55048a494753c77c08bfbd3 (diff) | |
download | podman-118546c6a70704a7b19cb99f3c948b28264628de.tar.gz podman-118546c6a70704a7b19cb99f3c948b28264628de.tar.bz2 podman-118546c6a70704a7b19cb99f3c948b28264628de.zip |
refactor: use `os.ReadDir` for lightweight directory reading
`os.ReadDir` was added in Go 1.16 as part of the deprecation of `ioutil`
package. It is a more efficient implementation than `ioutil.ReadDir`.
Reference: https://pkg.go.dev/io/ioutil#ReadDir
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Diffstat (limited to 'pkg/util')
-rw-r--r-- | pkg/util/utils_linux.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go index e2d9e3e89..7b2d98666 100644 --- a/pkg/util/utils_linux.go +++ b/pkg/util/utils_linux.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "io/fs" - "io/ioutil" "os" "path/filepath" "strings" @@ -119,7 +118,7 @@ func AddPrivilegedDevices(g *generate.Generator) error { // based on getDevices from runc (libcontainer/devices/devices.go) func getDevices(path string) ([]spec.LinuxDevice, error) { - files, err := ioutil.ReadDir(path) + files, err := os.ReadDir(path) if err != nil { if rootless.IsRootless() && os.IsPermission(err) { return nil, nil @@ -146,7 +145,7 @@ func getDevices(path string) ([]spec.LinuxDevice, error) { } case f.Name() == "console": continue - case f.Mode()&os.ModeSymlink != 0: + case f.Type()&os.ModeSymlink != 0: continue } |