Fix various lint warnings and suggestions

diff --git a/cfg.go b/cfg.go
index 41e8505055ed4172c2f5214c48e7297a1f504384..110e0e3f78945d2e3938850b543265b5454b471d 100644 (file)
--- a/cfg.go
+++ b/cfg.go
@@ -36,18 +36,19 @@ type AuthCfg struct {
 type Hook func(http.ResponseWriter, *http.Request) bool
 
 type HostCfg struct {
+       MIMEs    map[string]string
        Root     string
        ECDSATLS *TLSCfg
        EdDSATLS *TLSCfg
        GOSTTLS  *TLSCfg
-       DirList  bool
-       WebDAV   bool
-       Hooks    []Hook
        Auth     *AuthCfg
 
+       Hooks   []Hook
        Indices []string
        Readmes []string
-       MIMEs   map[string]string
+
+       DirList bool
+       WebDAV  bool
 }
 
 var Hosts = make(map[string]*HostCfg)

diff --git a/cmd/godlighty/main.go b/cmd/godlighty/main.go
index 912684f3a5b3db44d5b6e7255e95d12e7b737ecb..9f094074cf386aef25642128d0fb14fab233e8c9 100644 (file)
--- a/cmd/godlighty/main.go
+++ b/cmd/godlighty/main.go
@@ -64,31 +64,32 @@ func main() {
        }
 
        if *doSetGID != 0 {
-               if err := syscall.Setregid(*doSetGID, *doSetGID); err != nil {
+               if err = syscall.Setregid(*doSetGID, *doSetGID); err != nil {
                        log.Fatal(err)
                }
        }
        if *doSetGIDs == "" {
                if *doSetGID != 0 {
-                       if err := syscall.Setgroups([]int{*doSetGID}); err != nil {
+                       if err = syscall.Setgroups([]int{*doSetGID}); err != nil {
                                log.Fatal(err)
                        }
                }
        } else {
                gids := []int{}
                for _, g := range strings.Split(*doSetGIDs, ",") {
-                       gid, err := strconv.Atoi(g)
+                       var gid int
+                       gid, err = strconv.Atoi(g)
                        if err != nil {
                                log.Fatalln(err)
                        }
                        gids = append(gids, gid)
                }
-               if err := syscall.Setgroups(gids); err != nil {
+               if err = syscall.Setgroups(gids); err != nil {
                        log.Fatal(err)
                }
        }
        if *doSetUID != 0 {
-               if err := syscall.Setreuid(*doSetUID, *doSetUID); err != nil {
+               if err = syscall.Setreuid(*doSetUID, *doSetUID); err != nil {
                        log.Fatal(err)
                }
        }

diff --git a/dirlist.go b/dirlist.go
index 0670692b02b77950578d33a37dbda6a51dfae01d..d0bfc7b7043f25d92a3b296f7beaf0397b73ffba 100644 (file)
--- a/dirlist.go
+++ b/dirlist.go
@@ -50,13 +50,13 @@ func (a ByName) Less(i, j int) bool {
 }
 
 type DirListFile struct {
-       Idx     int
        Name    string
        Size    string
-       IsDir   bool
        Type    string
        ModTime string
        Symlink string
+       Idx     int
+       IsDir   bool
 }
 
 func dirList(
@@ -101,13 +101,13 @@ func dirList(
        err = DirListTmpl.Execute(fd, struct {
                Root   string
                Dir    string
-               Files  []DirListFile
                Readme string
+               Files  []DirListFile
        }{
                Root:   root,
                Dir:    dir,
-               Files:  files,
                Readme: readme,
+               Files:  files,
        })
        if err != nil {
                fd.Close()

diff --git a/handler.go b/handler.go
index 10b0d2ff83f0b7b557be80494eea1389e8d0e31b..3060f97b995ec4d992e39fac0a19fa8651ff6f08 100644 (file)
--- a/handler.go
+++ b/handler.go
@@ -22,6 +22,7 @@ import (
        "errors"
        "fmt"
        "io"
+       "io/fs"
        "log"
        "net"
        "net/http"
@@ -182,7 +183,8 @@ func (h Handler) Handle(
 IndexLookuped:
        if fi.IsDir() {
                if cfg.DirList {
-                       entries, err := os.ReadDir(pth)
+                       var entries []fs.DirEntry
+                       entries, err = os.ReadDir(pth)
                        if err != nil {
                                printErr(http.StatusInternalServerError, err)
                                http.Error(w, "internal error", http.StatusInternalServerError)
@@ -218,7 +220,7 @@ IndexLookuped:
                } else {
                        for _, index := range append(cfg.Indices, Index) {
                                p := path.Join(pth, index)
-                               if _, err := os.Stat(p); err == nil {
+                               if _, err = os.Stat(p); err == nil {
                                        pth = p
                                        fi, err = os.Stat(pth)
                                        if err != nil {

diff --git a/rc/mime.go b/rc/mime.go
index 63ff312f1bd1afaa2d4cdce69913e587d7cdc6ce..75f3cf799d154721e6fecae055c800fe964cd3e1 100644 (file)
--- a/rc/mime.go
+++ b/rc/mime.go
@@ -10,10 +10,8 @@ import (
 
 const MIMEDir = "mime"
 
-var (
-       //go:embed mime
-       mimes embed.FS
-)
+//go:embed mime
+var mimes embed.FS
 
 type MIMEEntry struct {
        ext          string

diff --git a/tls.go b/tls.go
index 28f54fb6737d8fee566dcffdbfe53298a7d3933b..b79edd7858ad4cb3c5e5a1df2ecd70ea5a501979 100644 (file)
--- a/tls.go
+++ b/tls.go
@@ -70,7 +70,7 @@ func GetCertificate(chi *tls.ClientHelloInfo) (*tls.Certificate, error) {
                cert = HostToEdDSACertificate[chi.ServerName]
        } else {
                if CHIHasEdDSA(chi) {
-                       if cert := HostToEdDSACertificate[chi.ServerName]; cert != nil {
+                       if cert = HostToEdDSACertificate[chi.ServerName]; cert != nil {
                                return cert, nil
                        }
                }