External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-19 21:59:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unneded else statements to follow Golang coding standards

Browse source
This commit is contained in:
Ola Bini 2019-12-21 23:13:41 +00:00
parent 6bf58a9f58
commit c2b5fd9e9d
No known key found for this signature in database
GPG key ID: 6786A150F6A2B28F
2 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cmd/grumble/server.go
View file

@ -492,18 +492,17 @@ func (server *Server) handleAuthenticate(client *Client, msg *Message) {
if auth.Password == nil {
client.RejectAuth(mumbleproto.Reject_WrongUserPW, "")
return
} else {
if server.CheckSuperUserPassword(*auth.Password) {
ok := false
client.user, ok = server.UserNameMap[client.Username]
if !ok {
client.RejectAuth(mumbleproto.Reject_InvalidUsername, "")
return
}
} else {
client.RejectAuth(mumbleproto.Reject_WrongUserPW, "")
}
if server.CheckSuperUserPassword(*auth.Password) {
ok := false
client.user, ok = server.UserNameMap[client.Username]
if !ok {
client.RejectAuth(mumbleproto.Reject_InvalidUsername, "")
return
}
} else {
client.RejectAuth(mumbleproto.Reject_WrongUserPW, "")
return
}
} else {
// First look up registration by name.
@ -1037,9 +1036,8 @@ func (server *Server) handleUDPPacket(udpaddr *net.UDPAddr, buf []byte) {
client.Debugf("unable to decrypt incoming packet, requesting resync: %v", err)
client.cryptResync()
return
} else {
match = client
}
match = client
}
if match != nil {
match.udpaddr = udpaddr

8
pkg/packetdata/packetdata.go
View file

@ -59,9 +59,9 @@ func (pds *PacketData) next() (ret uint64) {
ret = uint64(pds.Buf[pds.offset])
pds.offset++
return
} else {
pds.ok = false
}
pds.ok = false
return 0
}
@ -71,9 +71,9 @@ func (pds *PacketData) Next8() (ret uint8) {
ret = uint8(pds.Buf[pds.offset])
pds.offset++
return
} else {
pds.ok = false
}
pds.ok = false
return 0
}