Fix various lint warnings and suggestions

diff --git a/build/contrib/detpax/main.go b/build/contrib/detpax/main.go
index 03ff1b50f45e05e02b6257d837db76514b3b219ba6e8cb879b1089812ea23422..c534fa8eba6b8f71bb38b1821f56635a436eedd8459323ab635942fc0cc3bf40 100644 (file)
--- a/build/contrib/detpax/main.go
+++ b/build/contrib/detpax/main.go
@@ -146,7 +146,8 @@ will put dir/foo/bar first, dir/foo second, others next.`)
                {
                        filesMap := map[string]*Info{}
                        {
-                               fi, err := os.Lstat(root)
+                               var fi os.FileInfo
+                               fi, err = os.Lstat(root)
                                if err != nil {
                                        log.Fatalln("can not stat:", root, err)
                                }
@@ -178,15 +179,15 @@ will put dir/foo/bar first, dir/foo second, others next.`)
                hdr := tar.Header{Format: tar.FormatPAX}
                for _, info := range files {
                        hdr.Name = info.name
-                       hdr.Mode = int64(info.mode & 0777)
+                       hdr.Mode = int64(info.mode & 0o777)
                        if info.mode&fs.ModeSticky > 0 {
-                               hdr.Mode |= 01000
+                               hdr.Mode |= 0o1000
                        }
                        if info.mode&fs.ModeSetgid > 0 {
-                               hdr.Mode |= 02000
+                               hdr.Mode |= 0o2000
                        }
                        if info.mode&fs.ModeSetuid > 0 {
-                               hdr.Mode |= 04000
+                               hdr.Mode |= 0o4000
                        }
                        hdr.Size = info.size
                        if info.link == "" {