Fix some lint warnings

diff --git a/cmd/client/gui.go b/cmd/client/gui.go
index 8d04590460e9f61351f0fbd02c6044081daff82c36a00a98d1377cd050ea036d..059aaf7c9a88be0fdffaadd8f3cc655618ecb028d7208d2bdd1de1fe4b6f09e2 100644 (file)
--- a/cmd/client/gui.go
+++ b/cmd/client/gui.go
@@ -90,7 +90,7 @@ func guiLayout(gui *gocui.Gui) error {
                }
                v.Title = "chat"
                v.Editable = true
-               if err := GUI.SetKeybinding(
+               if err = GUI.SetKeybinding(
                        "chat", gocui.KeyEnter, gocui.ModNone, chatEnter,
                ); err != nil {
                        return err
@@ -115,7 +115,7 @@ func guiLayout(gui *gocui.Gui) error {
                                v.Title = ">" + stream.name + "<"
                        } else {
                                v.Title = stream.name
-                               if err := GUI.SetKeybinding(
+                               if err = GUI.SetKeybinding(
                                        stream.name, gocui.KeyEnter, gocui.ModNone, func(*gocui.Gui, *gocui.View) error {
                                                stream.silenced = !stream.silenced
                                                return nil

diff --git a/cmd/client/main.go b/cmd/client/main.go
index f77e079be0ba875c75a69ef2d73662498c9ecfda884646846e0fdf984bfa37f2..a8f4e27d026d6261c16d9387710d92556c71df4f2ad89ae6c70023cfd6158765 100644 (file)
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@@ -43,13 +43,13 @@ import (
 )
 
 type Stream struct {
+       in       chan []byte
+       stats    *Stats
        name     string
        ctr      uint32
        actr     uint32
        muted    bool
        silenced bool
-       in       chan []byte
-       stats    *Stats
 }
 
 var (
@@ -246,9 +246,10 @@ Magenta "S" means that peer is locally muted.`)
        if err != nil {
                log.Fatalln("connect:", err)
        }
-       var sid byte
+       var sidConnected byte
        {
-               args, err := vors.ArgsDecode(buf)
+               var args [][]byte
+               args, err = vors.ArgsDecode(buf)
                if err != nil {
                        log.Fatalln("args decode:", err)
                }
@@ -284,7 +285,8 @@ Magenta "S" means that peer is locally muted.`)
                                        log.Fatalln("write:", err)
                                }
                        case buf = <-rx:
-                               args, err := vors.ArgsDecode(buf)
+                               var args [][]byte
+                               args, err = vors.ArgsDecode(buf)
                                if err != nil {
                                        log.Fatalln("args decode:", err)
                                }
@@ -295,9 +297,9 @@ Magenta "S" means that peer is locally muted.`)
                                case vors.CmdErr:
                                        log.Fatalln("cookie acceptance failed:", string(args[1]))
                                case vors.CmdSID:
-                                       sid = args[1][0]
+                                       sidConnected = args[1][0]
                                        StreamsM.Lock()
-                                       Streams[sid] = &Stream{name: *Name, stats: OurStats}
+                                       Streams[sidConnected] = &Stream{name: *Name, stats: OurStats}
                                        StreamsM.Unlock()
                                default:
                                        log.Fatalln("unexpected post-cookie cmd:", cmd)
@@ -313,7 +315,8 @@ Magenta "S" means that peer is locally muted.`)
        var keyCiphOur []byte
        var keyMACOur []byte
        {
-               xof, err := blake2s.NewXOF(chacha20.KeySize+16, nil)
+               var xof blake2s.XOF
+               xof, err = blake2s.NewXOF(chacha20.KeySize+16, nil)
                if err != nil {
                        log.Fatalln(err)
                }
@@ -337,10 +340,10 @@ Magenta "S" means that peer is locally muted.`)
        GUI.SelFgColor = gocui.ColorCyan
        GUI.Highlight = true
        GUI.SetManagerFunc(guiLayout)
-       if err := GUI.SetKeybinding("", gocui.KeyTab, gocui.ModNone, tabHandle); err != nil {
+       if err = GUI.SetKeybinding("", gocui.KeyTab, gocui.ModNone, tabHandle); err != nil {
                log.Fatal(err)
        }
-       if err := GUI.SetKeybinding("", gocui.KeyF1, gocui.ModNone,
+       if err = GUI.SetKeybinding("", gocui.KeyF1, gocui.ModNone,
                func(gui *gocui.Gui, v *gocui.View) error {
                        muteToggle()
                        return nil
@@ -348,7 +351,7 @@ Magenta "S" means that peer is locally muted.`)
        ); err != nil {
                log.Fatal(err)
        }
-       if err := GUI.SetKeybinding("", gocui.KeyF10, gocui.ModNone,
+       if err = GUI.SetKeybinding("", gocui.KeyF10, gocui.ModNone,
                func(gui *gocui.Gui, v *gocui.View) error {
                        Finish <- struct{}{}
                        return gocui.ErrQuit
@@ -359,12 +362,12 @@ Magenta "S" means that peer is locally muted.`)
 
        go func() {
                <-GUIReadyC
-               v, err := GUI.View("logs")
-               if err != nil {
-                       log.Fatal(err)
+               v, errView := GUI.View("logs")
+               if errView != nil {
+                       log.Fatal(errView)
                }
                log.SetOutput(v)
-               log.Println("connected", "sid:", sid,
+               log.Println("connected", "sid:", sidConnected,
                        "addr:", conn.LocalAddr().String())
                close(LoggerReady)
                for {
@@ -665,7 +668,7 @@ Magenta "S" means that peer is locally muted.`)
                        }
                        OurStats.pkts++
                        OurStats.bytes += vors.IPHdrLen(srvAddrUDP.IP) + 8 + 1
-                       if _, err = conn.Write([]byte{sid}); err != nil {
+                       if _, err = conn.Write([]byte{sidConnected}); err != nil {
                                log.Println("send:", err)
                        }
                }
@@ -682,7 +685,7 @@ Magenta "S" means that peer is locally muted.`)
                pcm := make([]int16, vors.FrameLen)
                actr := make([]byte, 3)
                nonce := make([]byte, 12)
-               nonce[len(nonce)-4] = sid
+               nonce[len(nonce)-4] = sidConnected
                var pkt []byte
                var n, i int
                for {

diff --git a/cmd/client/stats.go b/cmd/client/stats.go
index 71fad5b2e000b61386365ab8aafb5905e102d8ad71cc87bf9c18c969aba11c76..03f8bb30a3cb32ca074453b3bfcac57caa42b439d089a5aed6d03a2a9249c008 100644 (file)
--- a/cmd/client/stats.go
+++ b/cmd/client/stats.go
@@ -28,15 +28,15 @@ import (
 )
 
 type Stats struct {
-       pkts    int64
+       dead    chan struct{}
+       last    time.Time
        bytes   uint64
+       vol     uint64
+       volN    uint64
+       pkts    int64
        bads    int64
        lost    int64
        reorder int64
-       last    time.Time
-       vol     uint64
-       volN    uint64
-       dead    chan struct{}
 }
 
 func (stats *Stats) AddRMS(pcm []int16) {
@@ -104,10 +104,7 @@ func statsDrawer(s *Stream) {
                                if vol/4 > maxRMS {
                                        maxRMS = vol / 4
                                }
-                               rep = int(float64(GUIMaxY) * vol / maxRMS)
-                               if rep < 0 {
-                                       rep = 0
-                               }
+                               rep = max(int(float64(GUIMaxY)*vol/maxRMS), 0)
                                v.Write([]byte(strings.Repeat("▒", rep)))
                        }
                }

diff --git a/cmd/server/main.go b/cmd/server/main.go
index 6455ce00688493e7d6a08dde535a11ceede51bf44bc06790d27c9880324cd6f0..a2488a9b6fe7aa5d75253ba4a0e2fa8f89ae6a9d5965457827c3f2643abe39b9 100644 (file)
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -547,9 +547,9 @@ Press F10 to quit.`)
                        "bind", *bind,
                        "pub", base64.RawURLEncoding.EncodeToString(Pub))
                for {
-                       conn, err := lnTCP.AcceptTCP()
+                       conn, errConn := lnTCP.AcceptTCP()
                        if err != nil {
-                               log.Fatalln("accept:", err)
+                               log.Fatalln("accept:", errConn)
                        }
                        go newPeer(conn)
                }

diff --git a/cmd/server/peer.go b/cmd/server/peer.go
index c73bc972067f3ef3b61acaadc9392723ad413f8cbfbc931a99af0ab9bd77b71d..bb727597bb18c4dced869e1f8d467ebd20b82afaeb9b18b0654c2a006e3a4534 100644 (file)
--- a/cmd/server/peer.go
+++ b/cmd/server/peer.go
@@ -27,13 +27,13 @@ type Stats struct {
 
 type Peer struct {
        name  string
-       sid   byte
        addr  *net.UDPAddr
-       key   []byte
-       mac   hash.Hash
        stats *Stats
        room  *Room
+       key   []byte
+       mac   hash.Hash
        muted bool
+       sid   byte
 
        logger     *slog.Logger
        conn       *vors.NSConn