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 extranous second arguments in for loops, according to Golang coding standards

Browse source
This commit is contained in:
Ola Bini 2019-12-21 22:57:15 +00:00
parent 92840d1770
commit 1ca218ec53
No known key found for this signature in database
GPG key ID: 6786A150F6A2B28F
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/grumble/client.go
View file

@ -619,7 +619,7 @@ func (client *Client) sendChannelTree(channel *Channel) {
chanstate.Position = proto.Int32(int32(channel.Position)) chanstate.Position = proto.Int32(int32(channel.Position))
links := []uint32{} links := []uint32{}
for cid, _ := range channel.Links { for cid := range channel.Links {
links = append(links, uint32(cid)) links = append(links, uint32(cid))
} }
chanstate.Links = links chanstate.Links = links

6
cmd/grumble/freeze.go
View file

@ -199,7 +199,7 @@ func (channel *Channel) Freeze() (fc *freezer.Channel, err error) {
// Add linked channels // Add linked channels
links := []uint32{} links := []uint32{}
for cid, _ := range channel.Links { for cid := range channel.Links {
links = append(links, uint32(cid)) links = append(links, uint32(cid))
} }
fc.Links = links fc.Links = links
@ -669,7 +669,7 @@ func NewServerFromFrozen(name string) (s *Server, err error) {
if len(channel.Links) > 0 { if len(channel.Links) > 0 {
links := channel.Links links := channel.Links
channel.Links = make(map[int]*Channel) channel.Links = make(map[int]*Channel)
for chanID, _ := range links { for chanID := range links {
targetChannel := s.Channels[chanID] targetChannel := s.Channels[chanID]
if targetChannel != nil { if targetChannel != nil {
s.LinkChannels(channel, targetChannel) s.LinkChannels(channel, targetChannel)
@ -760,7 +760,7 @@ func (server *Server) UpdateFrozenChannel(channel *Channel, state *mumbleproto.C
} }
if len(state.LinksAdd) > 0 || len(state.LinksRemove) > 0 { if len(state.LinksAdd) > 0 || len(state.LinksRemove) > 0 {
links := []uint32{} links := []uint32{}
for cid, _ := range channel.Links { for cid := range channel.Links {
links = append(links, uint32(cid)) links = append(links, uint32(cid))
} }
fc.Links = links fc.Links = links

10
cmd/grumble/message.go
View file

@ -1131,20 +1131,20 @@ func (server *Server) handleACLMessage(client *Client, msg *Message) {
// message that maps user ids to usernames. // message that maps user ids to usernames.
if hasgroup { if hasgroup {
toadd := map[int]bool{} toadd := map[int]bool{}
for uid, _ := range group.Add { for uid := range group.Add {
users[uid] = true users[uid] = true
toadd[uid] = true toadd[uid] = true
} }
for uid, _ := range group.Remove { for uid := range group.Remove {
users[uid] = true users[uid] = true
delete(toadd, uid) delete(toadd, uid)
} }
for uid, _ := range toadd { for uid := range toadd {
mpgroup.Add = append(mpgroup.Add, uint32(uid)) mpgroup.Add = append(mpgroup.Add, uint32(uid))
} }
} }
if haspgroup { if haspgroup {
for uid, _ := range pgroup.MembersInContext(&parent.ACL) { for uid := range pgroup.MembersInContext(&parent.ACL) {
users[uid] = true users[uid] = true
mpgroup.InheritedMembers = append(mpgroup.InheritedMembers, uint32(uid)) mpgroup.InheritedMembers = append(mpgroup.InheritedMembers, uint32(uid))
} }
@ -1160,7 +1160,7 @@ func (server *Server) handleACLMessage(client *Client, msg *Message) {
// Map the user ids in the user map to usernames of users. // Map the user ids in the user map to usernames of users.
queryusers := &mumbleproto.QueryUsers{} queryusers := &mumbleproto.QueryUsers{}
for uid, _ := range users { for uid := range users {
user, ok := server.Users[uint32(uid)] user, ok := server.Users[uint32(uid)]
if !ok { if !ok {
client.Printf("Invalid user id in ACL") client.Printf("Invalid user id in ACL")

2
cmd/grumble/murmurdb.go
View file

@ -354,7 +354,7 @@ func populateChannelsFromDatabase(server *Server, db *sql.DB, parentID int) erro
} }
// Add subchannels // Add subchannels
for id, _ := range parent.children { for id := range parent.children {
err = populateChannelsFromDatabase(server, db, id) err = populateChannelsFromDatabase(server, db, id)
if err != nil { if err != nil {
return err return err

8
pkg/acl/group.go
View file

@ -50,7 +50,7 @@ func (group *Group) AddContains(id int) (ok bool) {
// AddUsers gets the list of user ids in the Add set. // AddUsers gets the list of user ids in the Add set.
func (group *Group) AddUsers() []int { func (group *Group) AddUsers() []int {
users := []int{} users := []int{}
for uid, _ := range group.Add { for uid := range group.Add {
users = append(users, uid) users = append(users, uid)
} }
return users return users
@ -65,7 +65,7 @@ func (group *Group) RemoveContains(id int) (ok bool) {
// RemoveUsers gets the list of user ids in the Remove set. // RemoveUsers gets the list of user ids in the Remove set.
func (group *Group) RemoveUsers() []int { func (group *Group) RemoveUsers() []int {
users := []int{} users := []int{}
for uid, _ := range group.Remove { for uid := range group.Remove {
users = append(users, uid) users = append(users, uid)
} }
return users return users
@ -106,10 +106,10 @@ func (group *Group) MembersInContext(ctx *Context) map[int]bool {
} }
for _, curgroup := range groups { for _, curgroup := range groups {
for uid, _ := range curgroup.Add { for uid := range curgroup.Add {
members[uid] = true members[uid] = true
} }
for uid, _ := range curgroup.Remove { for uid := range curgroup.Remove {
delete(members, uid) delete(members, uid)
} }
} }