Fix various lint warnings and suggestions

diff --git a/cmd/sgblog-comment-add/main.go b/cmd/sgblog-comment-add/main.go
index 542b68c0b69dbbbdd51f94f73836908561de25e8..5c1abc241afbe75ed514629731e1c44f13f17507 100644 (file)
--- a/cmd/sgblog-comment-add/main.go
+++ b/cmd/sgblog-comment-add/main.go
@@ -128,7 +128,7 @@ func main() {
        if subj == "" {
                log.Fatal("no commit hash found in subject")
        }
-       if h, err := hex.DecodeString(subj); err != nil || len(h) != sha1.Size {
+       if h, errHex := hex.DecodeString(subj); errHex != nil || len(h) != sha1.Size {
                os.Exit(0)
        }
        fromCols := strings.Fields(from)

diff --git a/cmd/sgblog-topics/main.go b/cmd/sgblog-topics/main.go
index 46f0995ee23ed00b7cb8684c2abf042300d6af15..ea242ee07249e0fd37e3488d715834d80610497d 100644 (file)
--- a/cmd/sgblog-topics/main.go
+++ b/cmd/sgblog-topics/main.go
@@ -25,6 +25,7 @@ import (
        "github.com/go-git/go-git/v5"
        "github.com/go-git/go-git/v5/plumbing"
        "github.com/go-git/go-git/v5/plumbing/object"
+       "github.com/go-git/go-git/v5/plumbing/storer"
        "go.stargrave.org/sgblog"
 )
 
@@ -50,7 +51,9 @@ func main() {
 
        var topicsRef *plumbing.Reference
        var topicsTree *object.Tree
-       if notes, err := repo.Notes(); err == nil {
+       var notes storer.ReferenceIter
+       notes, err = repo.Notes()
+       if err == nil {
                notes.ForEach(func(ref *plumbing.Reference) error {
                        if string(ref.Name()) == *topicsRefName {
                                topicsRef = ref
@@ -58,7 +61,9 @@ func main() {
                        return nil
                })
                if topicsRef != nil {
-                       if topicsCommit, err := repo.CommitObject(topicsRef.Hash()); err == nil {
+                       var topicsCommit *object.Commit
+                       topicsCommit, err = repo.CommitObject(topicsRef.Hash())
+                       if err == nil {
                                topicsTree, _ = topicsCommit.Tree()
                        }
                }

diff --git a/cmd/sgblog/gemini.go b/cmd/sgblog/gemini.go
index 6a195096fc61552468747d568c9c89f3ddd7cc42..a31c66d78c2fd3199f165affee24b54234b5ad46 100644 (file)
--- a/cmd/sgblog/gemini.go
+++ b/cmd/sgblog/gemini.go
@@ -124,7 +124,8 @@ func serveGemini(cfgPath string) {
                logEnded := false
                entries := make([]TableMenuEntry, 0, PageEntries)
                for i := 0; i < PageEntries; i++ {
-                       commit, err := commits.Next()
+                       var commit *object.Commit
+                       commit, err = commits.Next()
                        if err != nil {
                                logEnded = true
                                break

diff --git a/cmd/sgblog/gopher.go b/cmd/sgblog/gopher.go
index 0eb5e3e58ff69276e91bcc7812f030cf77473176..97500496fcaf53c59085550d8611b4b18eedaee1 100644 (file)
--- a/cmd/sgblog/gopher.go
+++ b/cmd/sgblog/gopher.go
@@ -48,10 +48,10 @@ var (
 type TableMenuEntry struct {
        Commit      *object.Commit
        Title       string
+       Topics      []string
        LinesNum    int
        ImagesNum   int
        CommentsNum int
-       Topics      []string
 }
 
 func serveGopher(cfgPath string) {
@@ -169,7 +169,8 @@ Redirecting to <a href="%s">%s</a>...
                logEnded := false
                entries := make([]TableMenuEntry, 0, PageEntries)
                for i := 0; i < PageEntries; i++ {
-                       commit, err := commits.Next()
+                       var commit *object.Commit
+                       commit, err = commits.Next()
                        if err != nil {
                                logEnded = true
                                break

diff --git a/cmd/sgblog/http.go b/cmd/sgblog/http.go
index 000037ab210e666decf8880593d58aaab31be7af..861121f7956f7daee03bc33cd5fcfc59e329b865 100644 (file)
--- a/cmd/sgblog/http.go
+++ b/cmd/sgblog/http.go
@@ -38,6 +38,7 @@ import (
        "github.com/go-git/go-git/v5"
        "github.com/go-git/go-git/v5/plumbing"
        "github.com/go-git/go-git/v5/plumbing/object"
+       "github.com/go-git/go-git/v5/plumbing/storer"
        "github.com/klauspost/compress/zstd"
        "github.com/vorlif/spreak"
        "go.stargrave.org/sgblog"
@@ -79,8 +80,8 @@ type TableEntry struct {
        Commit      *object.Commit
        CommentsRaw []byte
        TopicsRaw   []byte
-       Num         int
        Title       string
+       Num         int
        LinesNum    int
        CommentsNum int
        ImagesNum   int
@@ -214,7 +215,9 @@ func serveHTTP() {
                makeErr(err, http.StatusInternalServerError)
        }
 
-       if notes, err := repo.Notes(); err == nil {
+       var notes storer.ReferenceIter
+       notes, err = repo.Notes()
+       if err == nil {
                var notesRef *plumbing.Reference
                var commentsRef *plumbing.Reference
                notes.ForEach(func(ref *plumbing.Reference) error {
@@ -227,12 +230,16 @@ func serveHTTP() {
                        return nil
                })
                if notesRef != nil {
-                       if commentsCommit, err := repo.CommitObject(notesRef.Hash()); err == nil {
+                       var commentsCommit *object.Commit
+                       commentsCommit, err = repo.CommitObject(notesRef.Hash())
+                       if err == nil {
                                notesTree, _ = commentsCommit.Tree()
                        }
                }
                if commentsRef != nil {
-                       if commentsCommit, err := repo.CommitObject(commentsRef.Hash()); err == nil {
+                       var commentsCommit *object.Commit
+                       commentsCommit, err = repo.CommitObject(commentsRef.Hash())
+                       if err == nil {
                                commentsTree, _ = commentsCommit.Tree()
                        }
                }
@@ -306,7 +313,8 @@ func serveHTTP() {
                etagHash.Write([]byte("INDEX"))
                etagHash.Write([]byte(topic))
                for i := 0; i < PageEntries; i++ {
-                       commit, err := commits.Next()
+                       var commit *object.Commit
+                       commit, err = commits.Next()
                        if err != nil {
                                logEnded = true
                                break
@@ -457,7 +465,8 @@ func serveHTTP() {
                if topic == "" {
                        commits = repoLog
                } else {
-                       topicsCache, err := getTopicsCache(cfg, repoLog)
+                       var topicsCache TopicsCache
+                       topicsCache, err = getTopicsCache(cfg, repoLog)
                        if err != nil {
                                makeErr(err, http.StatusInternalServerError)
                        }
@@ -549,11 +558,13 @@ func serveHTTP() {
                        if err != nil {
                                break
                        }
-                       fileStats, err := commit.Stats()
+                       var fileStats object.FileStats
+                       fileStats, err = commit.Stats()
                        if err != nil {
                                makeErr(err, http.StatusInternalServerError)
                        }
-                       t, err := commit.Tree()
+                       var t *object.Tree
+                       t, err = commit.Tree()
                        if err != nil {
                                makeErr(err, http.StatusInternalServerError)
                        }
@@ -708,7 +719,8 @@ func serveHTTP() {
                                        },
                                })
                        }
-                       data, err := xml.MarshalIndent(&feed, "", "  ")
+                       var data []byte
+                       data, err = xml.MarshalIndent(&feed, "", "  ")
                        if err != nil {
                                makeErr(err, http.StatusInternalServerError)
                        }
@@ -730,7 +742,7 @@ func serveHTTP() {
                commentsParsed := sgblog.ParseComments(commentsRaw)
                comments := make([]CommentEntry, 0, len(commentsParsed))
                for _, comment := range commentsParsed {
-                       lines := strings.Split(comment, "\n")
+                       lines = strings.Split(comment, "\n")
                        comments = append(comments, CommentEntry{lines[:3], lines[3:]})
                }
                var notesLines []string

diff --git a/cmd/sgblog/img.go b/cmd/sgblog/img.go
index d27141cbd1e60d56bb8a8329a7bbbc70443b1fbc..bdd222d0705b348b25e7bb612ea55cf209e8b38e 100644 (file)
--- a/cmd/sgblog/img.go
+++ b/cmd/sgblog/img.go
@@ -27,8 +27,8 @@ import (
 type Img struct {
        Path string
        Alt  string
-       Size int64
        Typ  string
+       Size int64
 }
 
 var ImgTypes = map[string]string{

diff --git a/cmd/sgblog/topics.go b/cmd/sgblog/topics.go
index 9308a8a4909923891056547a8e5b7140b3478879..379509045ed606ecbb428c40d1e6934a947dc462 100644 (file)
--- a/cmd/sgblog/topics.go
+++ b/cmd/sgblog/topics.go
@@ -31,8 +31,8 @@ import (
 type TopicsCache map[string][]plumbing.Hash
 
 type TopicsCacheState struct {
-       Top   plumbing.Hash
        Cache TopicsCache
+       Top   plumbing.Hash
 }
 
 func (tc TopicsCache) Topics() []string {
@@ -86,13 +86,13 @@ NoCache:
                fd, err := os.OpenFile(
                        tmpPath,
                        os.O_RDWR|os.O_CREATE|os.O_EXCL,
-                       os.FileMode(0666),
+                       os.FileMode(0o666),
                )
                if err != nil {
                        return cache, err
                }
                enc := gob.NewEncoder(fd)
-               err = enc.Encode(&TopicsCacheState{top, cache})
+               err = enc.Encode(&TopicsCacheState{cache, top})
                if err != nil {
                        os.Remove(tmpPath)
                        fd.Close()