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

only use constant strings in string formatting

Browse source 
builds with go1.24rc1 fail on these.
only the case in smtpserver could be triggered externally.
This commit is contained in:
Mechiel Lukkien 2024-12-14 09:38:56 +01:00
parent 5320ec1c5b
commit d082aaada8
No known key found for this signature in database
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dkim/sig.go
View file

@ -117,7 +117,7 @@ func (s *Sig) Header() (string, error) {
} else if i == len(s.SignedHeaders)-1 { } else if i == len(s.SignedHeaders)-1 {
v += ";" v += ";"
} }
w.Addf(sep, v) w.Addf(sep, "%s", v)
} }
} }
if len(s.CopiedHeaders) > 0 { if len(s.CopiedHeaders) > 0 {
@ -139,7 +139,7 @@ func (s *Sig) Header() (string, error) {
} else if i == len(s.CopiedHeaders)-1 { } else if i == len(s.CopiedHeaders)-1 {
v += ";" v += ";"
} }
w.Addf(sep, v) w.Addf(sep, "%s", v)
} }
} }

12
imapserver/selectexamine_test.go
View file

@ -45,28 +45,28 @@ func testSelectExamine(t *testing.T, examine bool) {
uuidnext2 := imapclient.UntaggedResult{Status: imapclient.OK, RespText: imapclient.RespText{Code: "UIDNEXT", CodeArg: imapclient.CodeUint{Code: "UIDNEXT", Num: 2}, More: "x"}} uuidnext2 := imapclient.UntaggedResult{Status: imapclient.OK, RespText: imapclient.RespText{Code: "UIDNEXT", CodeArg: imapclient.CodeUint{Code: "UIDNEXT", Num: 2}, More: "x"}}
// Parameter required. // Parameter required.
tc.transactf("bad", cmd) tc.transactf("bad", "%s", cmd)
// Mailbox does not exist. // Mailbox does not exist.
tc.transactf("no", cmd+" bogus") tc.transactf("no", "%s bogus", cmd)
tc.transactf("ok", cmd+" inbox") tc.transactf("ok", "%s inbox", cmd)
tc.xuntagged(uflags, upermflags, urecent, uexists0, uuidval1, uuidnext1, ulist) tc.xuntagged(uflags, upermflags, urecent, uexists0, uuidval1, uuidnext1, ulist)
tc.xcode(okcode) tc.xcode(okcode)
tc.transactf("ok", cmd+` "inbox"`) tc.transactf("ok", `%s "inbox"`, cmd)
tc.xuntagged(uclosed, uflags, upermflags, urecent, uexists0, uuidval1, uuidnext1, ulist) tc.xuntagged(uclosed, uflags, upermflags, urecent, uexists0, uuidval1, uuidnext1, ulist)
tc.xcode(okcode) tc.xcode(okcode)
// Append a message. It will be reported as UNSEEN. // Append a message. It will be reported as UNSEEN.
tc.client.Append("inbox", nil, nil, []byte(exampleMsg)) tc.client.Append("inbox", nil, nil, []byte(exampleMsg))
tc.transactf("ok", cmd+" inbox") tc.transactf("ok", "%s inbox", cmd)
tc.xuntagged(uclosed, uflags, upermflags, urecent, uunseen, uexists1, uuidval1, uuidnext2, ulist) tc.xuntagged(uclosed, uflags, upermflags, urecent, uunseen, uexists1, uuidval1, uuidnext2, ulist)
tc.xcode(okcode) tc.xcode(okcode)
// With imap4rev2, we no longer get untagged RECENT or untagged UNSEEN. // With imap4rev2, we no longer get untagged RECENT or untagged UNSEEN.
tc.client.Enable("imap4rev2") tc.client.Enable("imap4rev2")
tc.transactf("ok", cmd+" inbox") tc.transactf("ok", "%s inbox", cmd)
tc.xuntagged(uclosed, uflags, upermflags, uexists1, uuidval1, uuidnext2, ulist) tc.xuntagged(uclosed, uflags, upermflags, uexists1, uuidval1, uuidnext2, ulist)
tc.xcode(okcode) tc.xcode(okcode)
} }

2
imapserver/server.go
View file

@ -1167,7 +1167,7 @@ func (c *conn) xsequence(uid store.UID) msgseq {
func (c *conn) sequenceRemove(seq msgseq, uid store.UID) { func (c *conn) sequenceRemove(seq msgseq, uid store.UID) {
i := seq - 1 i := seq - 1
if c.uids[i] != uid { if c.uids[i] != uid {
xserverErrorf(fmt.Sprintf("got uid %d at msgseq %d, expected uid %d", uid, seq, c.uids[i])) xserverErrorf("got uid %d at msgseq %d, expected uid %d", uid, seq, c.uids[i])
} }
copy(c.uids[i:], c.uids[i+1:]) copy(c.uids[i:], c.uids[i+1:])
c.uids = c.uids[:len(c.uids)-1] c.uids = c.uids[:len(c.uids)-1]

2
smtpserver/server.go
View file

@ -3471,7 +3471,7 @@ func (c *conn) deliver(ctx context.Context, recvHdrFor func(string) string, msgW
code = smtp.C554TransactionFailed code = smtp.C554TransactionFailed
} }
lines = append(lines, "multiple errors") lines = append(lines, "multiple errors")
xsmtpErrorf(code, secode, !serverError, strings.Join(lines, "\n")) xsmtpErrorf(code, secode, !serverError, "%s", strings.Join(lines, "\n"))
} }
// Generate one DSN for all failed recipients. // Generate one DSN for all failed recipients.
if len(deliverErrors) > 0 { if len(deliverErrors) > 0 {