From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 6 Aug 2024 11:40:11 +0000 (+0300)
Subject: Fix various lint warnings and suggestions
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=a2027dfcba2fd4868893e9d493a67a3cd26c3114e8498d8333467e468efa8e72;p=vors.git

Fix various lint warnings and suggestions
---

diff --git a/cmd/client/main.go b/cmd/client/main.go
index 9b7a9b1..1251029 100644
--- 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 82008ca..fd7b2c6 100644
--- 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 2472882..c73bc97 100644
--- 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 78a79bc..bee217c 100644
--- 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 {