serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-27 08:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix 3 cases of shadowed variables (other than "err")

Browse source 
2 of these were actual bugs.
This commit is contained in:
Mechiel Lukkien 2023-02-16 13:24:51 +01:00
parent 5c33640aea
commit c65731ac56
No known key found for this signature in database
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
http/account.go
View file

@ -149,7 +149,7 @@ func accountHandle(w http.ResponseWriter, r *http.Request) {
} }
flusher.Flush() flusher.Flush()
ctx := r.Context() cctx := r.Context()
for { for {
select { select {
case e := <-l.Events: case e := <-l.Events:
@ -159,7 +159,7 @@ func accountHandle(w http.ResponseWriter, r *http.Request) {
return return
} }
case <-ctx.Done(): case <-cctx.Done():
return return
} }
} }

2
http/import.go
View file

@ -126,7 +126,7 @@ func importManage() {
case e := <-importers.Events: case e := <-importers.Events:
s, ok := imports[e.Token] s, ok := imports[e.Token]
if !ok { if !ok {
s := state{ s = state{
MailboxCounts: map[string]int{}, MailboxCounts: map[string]int{},
Listeners: map[*importListener]struct{}{}, Listeners: map[*importListener]struct{}{},
Cancel: e.Cancel, Cancel: e.Cancel,

3
store/account.go
View file

@ -1165,7 +1165,8 @@ func (a *Account) RejectsRemove(log *mlog.Log, rejectsMailbox, messageID string)
q := bstore.QueryTx[Message](tx) q := bstore.QueryTx[Message](tx)
q.FilterNonzero(Message{MailboxID: mb.ID, MessageID: messageID}) q.FilterNonzero(Message{MailboxID: mb.ID, MessageID: messageID})
remove, err := q.List() var err error
remove, err = q.List()
xcheckf(err, "listing messages to remove") xcheckf(err, "listing messages to remove")
changes = a.xremoveMessages(log, tx, mb, remove) changes = a.xremoveMessages(log, tx, mb, remove)