Remove unreachable code reported by go vet

cmd/grumble/client.go

@@ -392,10 +392,9 @@ func (client *Client) SendUDP(buf []byte) error {
 		crypted := make([]byte, len(buf)+client.crypt.Overhead())
 		client.crypt.Encrypt(crypted, buf)
 		return client.server.SendUDP(crypted, client.udpaddr)
-	} else {
-		return client.sendMessage(buf)
 	}
-	panic("unreachable")
+
+	return client.sendMessage(buf)
 }
 
 // Send a Message to the client.  The Message in msg to the client's

cmd/grumble/server.go

@@ -869,13 +869,12 @@ func (server *Server) sendClientPermissions(client *Client, channel *Channel) {
 	}
 
 	// fixme(mkrautz): re-add when we have ACL caching
-	return
 
-	perm := acl.Permission(acl.NonePermission)
-	client.sendMessage(&mumbleproto.PermissionQuery{
-		ChannelId:   proto.Uint32(uint32(channel.Id)),
-		Permissions: proto.Uint32(uint32(perm)),
-	})
+	// perm := acl.Permission(acl.NonePermission)
+	// client.sendMessage(&mumbleproto.PermissionQuery{
+	//	ChannelId:   proto.Uint32(uint32(channel.Id)),
+	//	Permissions: proto.Uint32(uint32(perm)),
+	// })
 }
 
 type ClientPredicate func(client *Client) bool

pkg/acl/acl.go

@@ -161,9 +161,7 @@ func HasPermission(ctx *Context, user User, perm Permission) bool {
 	// permissions exccept SpeakPermission and WhisperPermission.
 	if perm != SpeakPermission && perm != WhisperPermission {
 		return (granted & (perm | WritePermission)) != NonePermission
-	} else {
-		return (granted & perm) != NonePermission
 	}
 
-	return false
+	return (granted & perm) != NonePermission
 }

pkg/acl/group.go

@@ -298,7 +298,8 @@ func GroupMemberCheck(current *Context, acl *Context, name string, user User) (o
 		pdepth := len(userChain) - 1
 		return pdepth >= mindepth && pdepth <= maxdepth
 
-	} else {
+	}
+
 	// Non-magic groups
 	groups := []Group{}
 
@@ -331,9 +332,6 @@ func GroupMemberCheck(current *Context, acl *Context, name string, user User) (o
 		}
 	}
 	return isMember
-	}
-
-	return false
 }
 
 // GroupNames gets the list of group names for the given ACL context.