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 /libpod/container_internal.go | |
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 'libpod/container_internal.go')
-rw-r--r-- | libpod/container_internal.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 32674235a..227bb7f1f 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1671,7 +1671,7 @@ func (c *Container) mountNamedVolume(v *ContainerNamedVolume, mountpoint string) // a bizarre issue where something copier.Get will ENOENT on // empty directories and sometimes it will not. // RHBZ#1928643 - srcContents, err := ioutil.ReadDir(srcDir) + srcContents, err := os.ReadDir(srcDir) if err != nil { return nil, fmt.Errorf("error reading contents of source directory for copy up into volume %s: %w", vol.Name(), err) } @@ -1681,7 +1681,7 @@ func (c *Container) mountNamedVolume(v *ContainerNamedVolume, mountpoint string) // If the volume is not empty, we should not copy up. volMount := vol.mountPoint() - contents, err := ioutil.ReadDir(volMount) + contents, err := os.ReadDir(volMount) if err != nil { return nil, fmt.Errorf("error listing contents of volume %s mountpoint when copying up from container %s: %w", vol.Name(), c.ID(), err) } |