Fix misc. warnings

common/pkg/secrets/secretsdb.go

@@ -49,9 +49,6 @@ func (s *SecretsManager) loadDB() error {
 		return err
 	}
 	defer file.Close()
-	if err != nil {
-		return err
-	}
 
 	byteValue, err := io.ReadAll(file)
 	if err != nil {

image/storage/storage_test.go

@@ -630,7 +630,7 @@ func TestNamespaces(t *testing.T) {
 	for _, namespace := range namespaces {
 		t.Logf("namespace: %q", namespace)
 		err = Transport.ValidatePolicyConfigurationScope(namespace)
-		if ref == nil {
+		if err != nil {
 			t.Fatalf("ValidatePolicyConfigurationScope(%q) returned error: %v", namespace, err)
 		}
 	}

storage/drivers/chown_windows.go

@@ -16,5 +16,5 @@ func newLChowner() *platformChowner {
 }
 
 func (c *platformChowner) LChown(path string, info os.FileInfo, toHost, toContainer *idtools.IDMappings) error {
-	return &os.PathError{"lchown", path, syscall.EWINDOWS}
+	return &os.PathError{Op: "lchown", Path: path, Err: syscall.EWINDOWS}
 }

storage/drivers/overlay/overlay.go

@@ -49,7 +49,6 @@ var untar = chrootarchive.UntarUncompressed
 
 const (
 	defaultPerms         = os.FileMode(0o555)
-	selinuxLabelTest     = "system_u:object_r:container_file_t:s0"
 	mountProgramFlagFile = ".has-mount-program"
 )
 

storage/pkg/archive/archive.go

@@ -77,10 +77,8 @@ const PaxSchilyXattr = "SCHILY.xattr."
 
 const (
 	tarExt  = "tar"
-	solaris = "solaris"
 	windows = "windows"
 	darwin  = "darwin"
-	freebsd = "freebsd"
 )
 
 var xattrsToIgnore = map[string]any{
@@ -417,7 +415,7 @@ func FileInfoHeader(name string, fi os.FileInfo, link string) (*tar.Header, erro
 		return nil, fmt.Errorf("tar: cannot canonicalize path: %w", err)
 	}
 	hdr.Name = name
-	setHeaderForSpecialDevice(hdr, name, fi.Sys())
+	setHeaderForSpecialDevice(hdr, fi.Sys())
 	return hdr, nil
 }
 

storage/pkg/archive/archive_bsd.go

@@ -9,7 +9,7 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo, forceMask *os.FileMode) error {
+func handleLChmod(_ *tar.Header, path string, hdrInfo os.FileInfo, forceMask *os.FileMode) error {
 	permissionsMask := hdrInfo.Mode()
 	if forceMask != nil {
 		permissionsMask = *forceMask

storage/pkg/archive/archive_other.go

@@ -2,7 +2,7 @@
 
 package archive
 
-func GetWhiteoutConverter(format WhiteoutFormat, data any) TarWhiteoutConverter {
+func GetWhiteoutConverter(_ WhiteoutFormat, _ any) TarWhiteoutConverter {
 	return nil
 }
 

storage/pkg/archive/archive_test.go

@@ -20,6 +20,10 @@ import (
 	"go.podman.io/storage/pkg/idtools"
 )
 
+const (
+	solaris = "solaris"
+)
+
 var defaultArchiver = NewDefaultArchiver()
 
 func defaultTarUntar(src, dst string) error {

storage/pkg/archive/archive_unix.go

@@ -69,7 +69,7 @@ func chmodTarEntry(perm os.FileMode) os.FileMode {
 	return perm // noop for unix as golang APIs provide perm bits correctly
 }
 
-func setHeaderForSpecialDevice(hdr *tar.Header, name string, stat any) {
+func setHeaderForSpecialDevice(hdr *tar.Header, stat any) {
 	s, ok := stat.(*syscall.Stat_t)
 
 	if ok {

storage/pkg/archive/archive_unix_test.go

@@ -22,6 +22,10 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+const (
+	freebsd = "freebsd"
+)
+
 func TestCanonicalTarNameForPath(t *testing.T) {
 	cases := []struct{ in, expected string }{
 		{"foo", "foo"},

storage/pkg/archive/archive_windows.go

@@ -52,28 +52,28 @@ func chmodTarEntry(perm os.FileMode) os.FileMode {
 	return noPermPart | permPart
 }
 
-func setHeaderForSpecialDevice(hdr *tar.Header, name string, stat interface{}) {
+func setHeaderForSpecialDevice(hdr *tar.Header, stat any) {
 	// do nothing. no notion of Rdev, Nlink in stat on Windows
 }
 
-func getInodeFromStat(stat interface{}) uint64 {
+func getInodeFromStat(_ any) uint64 {
 	// do nothing. no notion of Inode in stat on Windows
 	return 0
 }
 
 // handleTarTypeBlockCharFifo is an OS-specific helper function used by
 // createTarFile to handle the following types of header: Block; Char; Fifo
-func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error {
+func handleTarTypeBlockCharFifo(_ *tar.Header, _ string) error {
 	return nil
 }
 
-func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo, forceMask *os.FileMode) error {
+func handleLChmod(_ *tar.Header, _ string, _ os.FileInfo, _ *os.FileMode) error {
 	return nil
 }
 
-func getFileUIDGID(stat interface{}) (idtools.IDPair, error) {
+func getFileUIDGID(_ any) (idtools.IDPair, error) {
 	// no notion of file ownership mapping yet on Windows
-	return idtools.IDPair{0, 0}, nil
+	return idtools.IDPair{UID: 0, GID: 0}, nil
 }
 
 // Hardlink without following symlinks

storage/pkg/archive/changes_windows.go

@@ -6,7 +6,7 @@ import (
 	"go.podman.io/storage/pkg/system"
 )
 
-func statDifferent(oldStat *system.StatT, oldInfo *FileInfo, newStat *system.StatT, newInfo *FileInfo) bool {
+func statDifferent(oldStat *system.StatT, _ *FileInfo, newStat *system.StatT, _ *FileInfo) bool {
 	// Don't look at size for dirs, its not a good measure of change
 	if oldStat.Mtim() != newStat.Mtim() ||
 		oldStat.Mode() != newStat.Mode() ||
@@ -20,10 +20,10 @@ func (info *FileInfo) isDir() bool {
 	return info.parent == nil || info.stat.Mode().IsDir()
 }
 
-func getIno(fi os.FileInfo) uint64 {
+func getIno(_ os.FileInfo) uint64 {
 	return 0
 }
 
-func hasHardlinks(fi os.FileInfo) bool {
+func hasHardlinks(_ os.FileInfo) bool {
 	return false
 }

storage/pkg/archive/changes_windows_test.go

@@ -1,5 +1,5 @@
 package archive
 
-func resetSymlinkTimes(path string) error {
+func resetSymlinkTimes(_ string) error {
 	return nil
 }

storage/pkg/archive/fflags_unsupported.go

@@ -15,6 +15,6 @@ func WriteFileFlagsFromTarHeader(path string, hdr *tar.Header) error {
 	return nil
 }
 
-func resetImmutable(path string, fi *os.FileInfo) error {
+func resetImmutable(_ string, _ *os.FileInfo) error {
 	return nil
 }

storage/pkg/system/chtimes_unix.go

@@ -9,6 +9,6 @@ import (
 // setCTime will set the create time on a file. On Unix, the create
 // time is updated as a side effect of setting the modified time, so
 // no action is required.
-func setCTime(path string, ctime time.Time) error {
+func setCTime(_ string, _ time.Time) error {
 	return nil
 }

storage/pkg/system/path_windows_test.go

@@ -8,7 +8,7 @@ import "testing"
 func TestCheckSystemDriveAndRemoveDriveLetter(t *testing.T) {
 	// Fails if not C drive.
 	path, err := CheckSystemDriveAndRemoveDriveLetter(`d:\`)
-	if err == nil || (err != nil && err.Error() != "The specified path is not on the system drive (C:)") {
+	if err == nil || err.Error() != "The specified path is not on the system drive (C:)" {
 		t.Fatalf("Expected error for d:")
 	}
 

storage/pkg/system/rm_common.go

@@ -4,6 +4,6 @@ package system
 
 // Reset file flags in a directory tree. This allows EnsureRemoveAll
 // to delete trees which have the immutable flag set.
-func resetFileFlags(dir string) error {
+func resetFileFlags(_ string) error {
 	return nil
 }