Fix various lint warnings and suggestions

diff --git a/cmd/client/main.go b/cmd/client/main.go
index 9b7a9b1421fd0d250471760b823136108241feca1d6f57ac9b3d8ebf9bbd6c3f..1251029a3b7f2a11580e09efb917dc9d5cac5cdd6b35a897b323fe697fd2e240 100644 (file)
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@@ -150,7 +150,7 @@ Magenta "S" means that peer is locally muted.`)
                        return
                }
                for {
-                       fd, err := os.OpenFile(*muteTogglePth, os.O_WRONLY, os.FileMode(0666))
+                       fd, err := os.OpenFile(*muteTogglePth, os.O_WRONLY, os.FileMode(0o666))
                        if err != nil {
                                log.Fatalln(err)
                        }

diff --git a/cmd/server/main.go b/cmd/server/main.go
index 82008ca143c7bca541d6825eedaec3e8277c12149bd3b8ca268b4eafeadcda9d..fd7b2c68173e44632fbdebc5adce0043734c05c5bc0d0a441caef2c92d6567ce 100644 (file)
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -89,12 +89,14 @@ func newPeer(conn *net.TCPConn) {
        }
        var room *Room
        {
-               argsRaw, _, _, err := hs.ReadMessage(nil, buf)
+               var argsRaw []byte
+               argsRaw, _, _, err = hs.ReadMessage(nil, buf)
                if err != nil {
                        logger.Error("handshake: decrypt", "err", err)
                        return
                }
-               args, err := vors.ArgsDecode(argsRaw)
+               var args [][]byte
+               args, err = vors.ArgsDecode(argsRaw)
                if err != nil {
                        logger.Error("handshake: decode args", "err", err)
                        return
@@ -429,7 +431,7 @@ Press F10 to quit.`)
                }
                defer GUI.Close()
                GUI.SetManagerFunc(guiLayout)
-               if err := GUI.SetKeybinding("", gocui.KeyF10, gocui.ModNone,
+               if err = GUI.SetKeybinding("", gocui.KeyF10, gocui.ModNone,
                        func(g *gocui.Gui, v *gocui.View) error {
                                go func() {
                                        time.Sleep(100 * time.Millisecond)
@@ -442,7 +444,8 @@ Press F10 to quit.`)
 
                go func() {
                        <-GUIReadyC
-                       v, err := GUI.View("logs")
+                       var v *gocui.View
+                       v, err = GUI.View("logs")
                        if err != nil {
                                log.Fatal(err)
                        }

diff --git a/cmd/server/peer.go b/cmd/server/peer.go
index 24728822f5f1cc274985d01705aae41ba1be422be02771f27a7782877447a047..c73bc972067f3ef3b61acaadc9392723ad413f8cbfbc931a99af0ab9bd77b71d 100644 (file)
--- a/cmd/server/peer.go
+++ b/cmd/server/peer.go
@@ -17,12 +17,12 @@ var (
 )
 
 type Stats struct {
+       last    time.Time
        pktsRx  int64
        pktsTx  int64
+       bads    int64
        bytesRx uint64
        bytesTx uint64
-       bads    int64
-       last    time.Time
 }
 
 type Peer struct {
@@ -37,8 +37,8 @@ type Peer struct {
 
        logger     *slog.Logger
        conn       *vors.NSConn
-       rx, tx     chan []byte
        rxCS, txCS *noise.CipherState
+       rx, tx     chan []byte
        alive      chan struct{}
        aliveOnce  sync.Once
 }

diff --git a/cmd/server/room.go b/cmd/server/room.go
index 78a79bcade27220e361fa3c02ca73bd65bccf21dba66bf62ac1c010068ce55a1..bee217c306df68639c664c9aeae550e714053edce5d3f1bc1d1365f699dbeea8 100644 (file)
--- a/cmd/server/room.go
+++ b/cmd/server/room.go
@@ -17,11 +17,11 @@ var (
 )
 
 type Room struct {
+       alive  chan struct{}
+       peers  map[byte]*Peer
        name   string
        key    string
-       peers  map[byte]*Peer
        peersM sync.RWMutex
-       alive  chan struct{}
 }
 
 func (room *Room) Stats(now time.Time) []string {