Fix various lint warnings and suggestions

[godlighty.git] / handler.go

diff --git a/handler.go b/handler.go
index 354b5053bebc8a7b2d0216ee8e2c7c49e2697ba1..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)
@@ -194,7 +196,7 @@ IndexLookuped:
                                http.Error(w, "internal error", http.StatusInternalServerError)
                                return
                        }
-                       etag, err = ctimeETag(fd)
+                       etag, err = mtimeETag(fd)
                        fd.Close()
                        if err != nil {
                                printErr(http.StatusInternalServerError, err)
@@ -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 {
@@ -240,7 +242,7 @@ IndexLookuped:
                        http.Error(w, "internal error", http.StatusInternalServerError)
                        return
                }
-               etag, err = ctimeETag(fd)
+               etag, err = mtimeETag(fd)
                if err != nil {
                        printErr(http.StatusInternalServerError, err)
                        http.Error(w, "internal error", http.StatusInternalServerError)