From 118546c6a70704a7b19cb99f3c948b28264628de Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Sun, 11 Sep 2022 15:58:31 +0800 Subject: 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 --- libpod/container_internal.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libpod/container_internal.go') 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) } -- cgit v1.2.3-54-g00ecf