From 810c3e788f8dd61757cdacce2713155a7c3e9836 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Fri, 7 Oct 2022 20:40:04 +0200 Subject: [PATCH] Prefer nil empty slices Signed-off-by: David Gageot --- pkg/init/cmd/rc.init/main.go | 4 ++-- pkg/init/cmd/service/system_init.go | 2 +- pkg/metadata/provider_cdrom.go | 4 ++-- pkg/mount/mountie.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/init/cmd/rc.init/main.go b/pkg/init/cmd/rc.init/main.go index 024691790..eca4c786d 100644 --- a/pkg/init/cmd/rc.init/main.go +++ b/pkg/init/cmd/rc.init/main.go @@ -80,7 +80,7 @@ func mkdir(path string, perm os.FileMode) { // list of all enabled cgroups func cgroupList() []string { - list := []string{} + var list []string f, err := os.Open("/proc/cgroups") if err != nil { log.Printf("cannot open /proc/cgroups: %v", err) @@ -125,7 +125,7 @@ func read(path string) string { // read a directory func readdir(path string) []string { - names := []string{} + var names []string files, err := os.ReadDir(path) if err != nil { log.Printf("cannot read directory %s: %v", path, err) diff --git a/pkg/init/cmd/service/system_init.go b/pkg/init/cmd/service/system_init.go index 07e5a8653..3117fcc3e 100644 --- a/pkg/init/cmd/service/system_init.go +++ b/pkg/init/cmd/service/system_init.go @@ -85,7 +85,7 @@ func systemInitCmd(ctx context.Context, args []string) { _ = os.Remove(*sock) // look for containerd options - ctrdArgs := []string{} + var ctrdArgs []string var ( stderr io.Writer = os.Stderr stdout io.Writer = os.Stdout diff --git a/pkg/metadata/provider_cdrom.go b/pkg/metadata/provider_cdrom.go index 5e7c4b9a5..872967880 100644 --- a/pkg/metadata/provider_cdrom.go +++ b/pkg/metadata/provider_cdrom.go @@ -48,7 +48,7 @@ func ListCDROMs() []Provider { cdroms = append(cidevs, cdroms...) cdroms = uniqueString(cdroms) log.Debugf("unique devices to be checked: %v", cdroms) - providers := []Provider{} + var providers []Provider for _, device := range cdroms { providers = append(providers, NewCDROM(device)) } @@ -65,7 +65,7 @@ func FindCIs() []string { // Glob can only error on invalid pattern panic(fmt.Sprintf("Invalid glob pattern: %s", blockDevs)) } - foundDevices := []string{} + var foundDevices []string for _, device := range devs { // get the base device name dev := filepath.Base(device) diff --git a/pkg/mount/mountie.go b/pkg/mount/mountie.go index c7754d283..ef60fff98 100644 --- a/pkg/mount/mountie.go +++ b/pkg/mount/mountie.go @@ -197,7 +197,7 @@ func makeDevLinks() error { // return a list of all available drives func findDrives() []string { - driveKeys := []string{} + var driveKeys []string ignoreExp := regexp.MustCompile(`^loop.*$|^nbd.*$|^[a-z]+[0-9]+$`) devs, _ := ioutil.ReadDir("/dev") for _, d := range devs {