diff --git a/lib/model/model_test.go b/lib/model/model_test.go index a8bbddd12..568342f3d 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -1709,7 +1709,8 @@ func TestGlobalDirectoryTree(t *testing.T) { b := func(isfile bool, path ...string) protocol.FileInfo { typ := protocol.FileInfoTypeDirectory - blocks := []protocol.BlockInfo{} + var blocks []protocol.BlockInfo + if isfile { typ = protocol.FileInfoTypeFile blocks = []protocol.BlockInfo{{Offset: 0x0, Size: 0xa, Hash: []uint8{0x2f, 0x72, 0xcc, 0x11, 0xa6, 0xfc, 0xd0, 0x27, 0x1e, 0xce, 0xf8, 0xc6, 0x10, 0x56, 0xee, 0x1e, 0xb1, 0x24, 0x3b, 0xe3, 0x80, 0x5b, 0xf9, 0xa9, 0xdf, 0x98, 0xf9, 0x2f, 0x76, 0x36, 0xb0, 0x5c}}} diff --git a/lib/osutil/net.go b/lib/osutil/net.go index 1379be592..214284cf5 100644 --- a/lib/osutil/net.go +++ b/lib/osutil/net.go @@ -15,7 +15,8 @@ func GetLans() ([]*net.IPNet, error) { if err != nil { return nil, err } - addrs := []net.Addr{} + var addrs []net.Addr + for _, currentIf := range ifs { if currentIf.Flags&net.FlagUp != net.FlagUp { continue diff --git a/lib/versioner/empty_dir_tracker.go b/lib/versioner/empty_dir_tracker.go index 0e4a27b2b..fc1603df2 100644 --- a/lib/versioner/empty_dir_tracker.go +++ b/lib/versioner/empty_dir_tracker.go @@ -32,7 +32,8 @@ func (t emptyDirTracker) addFile(path string) { } func (t emptyDirTracker) emptyDirs() []string { - empty := []string{} + var empty []string + for dir := range t { empty = append(empty, dir) } diff --git a/lib/versioner/external.go b/lib/versioner/external.go index c85de3bf2..2a5559408 100644 --- a/lib/versioner/external.go +++ b/lib/versioner/external.go @@ -90,7 +90,8 @@ func (v external) Archive(filePath string) error { cmd := exec.Command(words[0], words[1:]...) env := os.Environ() // filter STGUIAUTH and STGUIAPIKEY from environment variables - filteredEnv := []string{} + var filteredEnv []string + for _, x := range env { if !strings.HasPrefix(x, "STGUIAUTH=") && !strings.HasPrefix(x, "STGUIAPIKEY=") { filteredEnv = append(filteredEnv, x)