Change increment and decrement operations according to Golang coding standards

cmd/grumble/freeze.go

@@ -715,7 +715,7 @@ func (server *Server) UpdateFrozenUser(client *Client, state *mumbleproto.UserSt
 			server.Fatal(err)
 		}
 	}
-	server.numLogOps += 1
+	server.numLogOps++
 }
 
 // UpdateFrozenUserLastChannel will update a user's last active channel
@@ -733,7 +733,7 @@ func (server *Server) UpdateFrozenUserLastChannel(client *Client) {
 			server.Fatal(err)
 		}
 
-		server.numLogOps += 1
+		server.numLogOps++
 	}
 }
 
@@ -743,7 +743,7 @@ func (server *Server) DeleteFrozenUser(user *User) {
 	if err != nil {
 		server.Fatal(err)
 	}
-	server.numLogOps += 1
+	server.numLogOps++
 }
 
 // UpdateFrozenChannel will, given a target channel and a ChannelState protocol message, create a freezer.Channel that
@@ -775,7 +775,7 @@ func (server *Server) UpdateFrozenChannel(channel *Channel, state *mumbleproto.C
 	if err != nil {
 		server.Fatal(err)
 	}
-	server.numLogOps += 1
+	server.numLogOps++
 }
 
 // UpdateFrozenChannelACLs writes a channel's ACL and Group data to disk. Mumble doesn't support
@@ -811,7 +811,7 @@ func (server *Server) UpdateFrozenChannelACLs(channel *Channel) {
 	if err != nil {
 		server.Fatal(err)
 	}
-	server.numLogOps += 1
+	server.numLogOps++
 }
 
 // DeleteFrozenChannel will mark a channel as deleted in the datastore.
@@ -820,7 +820,7 @@ func (server *Server) DeleteFrozenChannel(channel *Channel) {
 	if err != nil {
 		server.Fatal(err)
 	}
-	server.numLogOps += 1
+	server.numLogOps++
 }
 
 // UpdateFrozenBans writes the server's banlist to the datastore.
@@ -833,7 +833,7 @@ func (server *Server) UpdateFrozenBans(bans []ban.Ban) {
 	if err != nil {
 		server.Fatal(err)
 	}
-	server.numLogOps += 1
+	server.numLogOps++
 }
 
 // UpdateConfig writes an updated config value to the datastore.
@@ -846,7 +846,7 @@ func (server *Server) UpdateConfig(key, value string) {
 	if err != nil {
 		server.Fatal(err)
 	}
-	server.numLogOps += 1
+	server.numLogOps++
 }
 
 // ResetConfig writes to the freezelog that the config with key
@@ -859,5 +859,5 @@ func (server *Server) ResetConfig(key string) {
 	if err != nil {
 		server.Fatal(err)
 	}
-	server.numLogOps += 1
+	server.numLogOps++
 }

cmd/grumble/message.go

@@ -58,7 +58,7 @@ func (server *Server) handleCryptSetup(client *Client, msg *Message) {
 			return
 		}
 
-		client.crypt.Resync += 1
+		client.crypt.Resync++
 		if copy(client.crypt.DecryptIV[0:], cs.ClientNonce) != aes.BlockSize {
 			return
 		}

cmd/grumble/server.go

@@ -352,7 +352,7 @@ func (server *Server) RemoveClient(client *Client, kicked bool) {
 func (server *Server) AddChannel(name string) (channel *Channel) {
 	channel = NewChannel(server.nextChanID, name)
 	server.Channels[channel.ID] = channel
-	server.nextChanID += 1
+	server.nextChanID++
 
 	return
 }
@@ -714,7 +714,7 @@ func (server *Server) updateCodecVersions(connecting *Client) {
 			opus++
 		}
 		for _, codec := range client.codecs {
-			codecusers[codec] += 1
+			codecusers[codec]++
 		}
 	}
 
@@ -1102,7 +1102,7 @@ func (server *Server) RegisterClient(client *Client) (uid uint32, err error) {
 	// Increment nextUserID only if registration succeeded.
 	defer func() {
 		if err == nil {
-			server.nextUserID += 1
+			server.nextUserID++
 		}
 	}()
 

pkg/cryptstate/cryptstate.go

@@ -145,7 +145,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) error {
 		} else if ivbyte < cs.DecryptIV[0] {
 			cs.DecryptIV[0] = ivbyte
 			for i := 1; i < len(cs.DecryptIV); i++ {
-				cs.DecryptIV[i] += 1
+				cs.DecryptIV[i]++
 				if cs.DecryptIV[i] > 0 {
 					break
 				}
@@ -175,7 +175,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) error {
 			lost = -1
 			cs.DecryptIV[0] = ivbyte
 			for i := 1; i < len(cs.DecryptIV); i++ {
-				cs.DecryptIV[i] -= 1
+				cs.DecryptIV[i]--
 				if cs.DecryptIV[i] > 0 {
 					break
 				}
@@ -190,7 +190,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) error {
 			lost = int(256 - int(cs.DecryptIV[0]) + int(ivbyte) - 1)
 			cs.DecryptIV[0] = ivbyte
 			for i := 1; i < len(cs.DecryptIV); i++ {
-				cs.DecryptIV[i] += 1
+				cs.DecryptIV[i]++
 				if cs.DecryptIV[i] > 0 {
 					break
 				}
@@ -216,7 +216,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) error {
 		cs.DecryptIV = saveiv
 	}
 
-	cs.Good += 1
+	cs.Good++
 	if late > 0 {
 		cs.Late += uint32(late)
 	} else {
@@ -237,7 +237,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) error {
 func (cs *CryptState) Encrypt(dst, src []byte) {
 	// First, increase our IV
 	for i := range cs.EncryptIV {
-		cs.EncryptIV[i] += 1
+		cs.EncryptIV[i]++
 		if cs.EncryptIV[i] > 0 {
 			break
 		}

pkg/freezer/freezer_test.go

@@ -147,7 +147,7 @@ func TestLogging(t *testing.T) {
 		if !proto.Equal(val, testValues[i]) {
 			t.Error("proto message mismatch")
 		}
-		i += 1
+		i++
 	}
 }
 

pkg/freezer/walker.go

@@ -224,7 +224,7 @@ func (walker *Walker) Next() (entries []interface{}, err error) {
 			entries = append(entries, channelRemove)
 		}
 
-		remainOps -= 1
+		remainOps--
 		continue
 	}
 

pkg/freezer/writer.go

@@ -156,7 +156,7 @@ func (tx *LogTx) Put(value interface{}) (err error) {
 		return err
 	}
 
-	tx.numops += 1
+	tx.numops++
 
 	return nil
 }

pkg/packetdata/packetdata.go

@@ -57,7 +57,7 @@ func (pds *PacketData) Size() int {
 func (pds *PacketData) next() (ret uint64) {
 	if pds.offset < pds.maxsize {
 		ret = uint64(pds.Buf[pds.offset])
-		pds.offset += 1
+		pds.offset++
 		return
 	} else {
 		pds.ok = false
@@ -69,7 +69,7 @@ func (pds *PacketData) next() (ret uint64) {
 func (pds *PacketData) Next8() (ret uint8) {
 	if pds.offset < pds.maxsize {
 		ret = uint8(pds.Buf[pds.offset])
-		pds.offset += 1
+		pds.offset++
 		return
 	} else {
 		pds.ok = false
@@ -87,7 +87,7 @@ func (pds *PacketData) append(val uint64) {
 
 	if pds.offset < pds.maxsize {
 		pds.Buf[pds.offset] = byte(val)
-		pds.offset += 1
+		pds.offset++
 	} else {
 		pds.ok = false
 		pds.overshoot++

pkg/sessionpool/sessionpool.go

@@ -70,7 +70,7 @@ func (pool *SessionPool) Get() (id uint32) {
 	// Increment the next session id and return it.
 	// Note: By incrementing and *then* returning, we skip 0.
 	// This is deliberate, as 0 is an invalid session ID in Mumble.
-	pool.cur += 1
+	pool.cur++
 	id = pool.cur
 	return
 }