Skip to content

Commit 8995046

Browse files
65436543
authored
Less naked returns (#25713)
just a step towards #25655 and some related refactoring
1 parent b1eb167 commit 8995046

32 files changed

+254
-239
lines changed

‎models/asymkey/gpg_key_commit_verification.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,9 @@ func hashAndVerifyForKeyID(sig *packet.Signature, payload string, committer *use
455455

456456
// CalculateTrustStatus will calculate the TrustStatus for a commit verification within a repository
457457
// There are several trust models in Gitea
458-
func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_model.TrustModelType, isOwnerMemberCollaborator func(*user_model.User) (bool, error), keyMap *map[string]bool) (err error) {
458+
func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_model.TrustModelType, isOwnerMemberCollaborator func(*user_model.User) (bool, error), keyMap *map[string]bool) error {
459459
if !verification.Verified {
460-
return
460+
return nil
461461
}
462462

463463
// In the Committer trust model a signature is trusted if it matches the committer
@@ -475,7 +475,7 @@ func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_
475475
verification.SigningUser.Email == verification.CommittingUser.Email) {
476476
verification.TrustStatus = "trusted"
477477
}
478-
return
478+
return nil
479479
}
480480

481481
// Now we drop to the more nuanced trust models...
@@ -490,10 +490,11 @@ func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_
490490
verification.SigningUser.Email != verification.CommittingUser.Email) {
491491
verification.TrustStatus = "untrusted"
492492
}
493-
return
493+
return nil
494494
}
495495

496496
// Check we actually have a GPG SigningKey
497+
var err error
497498
if verification.SigningKey != nil {
498499
var isMember bool
499500
if keyMap != nil {

‎models/auth/oauth2.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,10 @@ func (code *OAuth2AuthorizationCode) TableName() string {
306306
}
307307

308308
// GenerateRedirectURI generates a redirect URI for a successful authorization request. State will be used if not empty.
309-
func (code *OAuth2AuthorizationCode) GenerateRedirectURI(state string) (redirect *url.URL, err error) {
310-
if redirect, err = url.Parse(code.RedirectURI); err != nil {
311-
return
309+
func (code *OAuth2AuthorizationCode) GenerateRedirectURI(state string) (*url.URL, error) {
310+
redirect, err := url.Parse(code.RedirectURI)
311+
if err != nil {
312+
return nil, err
312313
}
313314
q := redirect.Query()
314315
if state != "" {

‎models/migrations/v1_11/v106.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ type Watch struct {
1616
Mode RepoWatchMode `xorm:"SMALLINT NOT NULL DEFAULT 1"`
1717
}
1818

19-
func AddModeColumnToWatch(x *xorm.Engine) (err error) {
20-
if err = x.Sync2(new(Watch)); err != nil {
21-
return
19+
func AddModeColumnToWatch(x *xorm.Engine) error {
20+
if err := x.Sync2(new(Watch)); err != nil {
21+
return err
2222
}
23-
_, err = x.Exec("UPDATE `watch` SET `mode` = 1")
23+
_, err := x.Exec("UPDATE `watch` SET `mode` = 1")
2424
return err
2525
}

‎models/migrations/v1_13/v143.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ func RecalculateStars(x *xorm.Engine) (err error) {
2323

2424
for start := 0; ; start += batchSize {
2525
users := make([]User, 0, batchSize)
26-
if err = sess.Limit(batchSize, start).Where("type = ?", 0).Cols("id").Find(&users); err != nil {
27-
return
26+
if err := sess.Limit(batchSize, start).Where("type = ?", 0).Cols("id").Find(&users); err != nil {
27+
return err
2828
}
2929
if len(users) == 0 {
3030
break
3131
}
3232

33-
if err = sess.Begin(); err != nil {
34-
return
33+
if err := sess.Begin(); err != nil {
34+
return err
3535
}
3636

3737
for _, user := range users {
38-
if _, err = sess.Exec("UPDATE `user` SET num_stars=(SELECT COUNT(*) FROM `star` WHERE uid=?) WHERE id=?", user.ID, user.ID); err != nil {
39-
return
38+
if _, err := sess.Exec("UPDATE `user` SET num_stars=(SELECT COUNT(*) FROM `star` WHERE uid=?) WHERE id=?", user.ID, user.ID); err != nil {
39+
return err
4040
}
4141
}
4242

43-
if err = sess.Commit(); err != nil {
44-
return
43+
if err := sess.Commit(); err != nil {
44+
return err
4545
}
4646
}
4747

‎models/migrations/v1_15/v180.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,25 @@ func DeleteMigrationCredentials(x *xorm.Engine) (err error) {
4444

4545
for start := 0; ; start += batchSize {
4646
tasks := make([]*Task, 0, batchSize)
47-
if err = sess.Limit(batchSize, start).Where(cond, 0).Find(&tasks); err != nil {
48-
return
47+
if err := sess.Limit(batchSize, start).Where(cond, 0).Find(&tasks); err != nil {
48+
return err
4949
}
5050
if len(tasks) == 0 {
5151
break
5252
}
53-
if err = sess.Begin(); err != nil {
54-
return
53+
if err := sess.Begin(); err != nil {
54+
return err
5555
}
5656
for _, t := range tasks {
5757
if t.PayloadContent, err = removeCredentials(t.PayloadContent); err != nil {
58-
return
58+
return err
5959
}
60-
if _, err = sess.ID(t.ID).Cols("payload_content").Update(t); err != nil {
61-
return
60+
if _, err := sess.ID(t.ID).Cols("payload_content").Update(t); err != nil {
61+
return err
6262
}
6363
}
64-
if err = sess.Commit(); err != nil {
65-
return
64+
if err := sess.Commit(); err != nil {
65+
return err
6666
}
6767
}
6868
return err

‎models/migrations/v1_15/v181.go

+15-16
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"xorm.io/xorm"
1010
)
1111

12-
func AddPrimaryEmail2EmailAddress(x *xorm.Engine) (err error) {
12+
func AddPrimaryEmail2EmailAddress(x *xorm.Engine) error {
1313
type User struct {
1414
ID int64 `xorm:"pk autoincr"`
1515
Email string `xorm:"NOT NULL"`
@@ -26,12 +26,12 @@ func AddPrimaryEmail2EmailAddress(x *xorm.Engine) (err error) {
2626
}
2727

2828
// Add lower_email and is_primary columns
29-
if err = x.Table("email_address").Sync2(new(EmailAddress1)); err != nil {
30-
return
29+
if err := x.Table("email_address").Sync2(new(EmailAddress1)); err != nil {
30+
return err
3131
}
3232

33-
if _, err = x.Exec("UPDATE email_address SET lower_email=LOWER(email), is_primary=?", false); err != nil {
34-
return
33+
if _, err := x.Exec("UPDATE email_address SET lower_email=LOWER(email), is_primary=?", false); err != nil {
34+
return err
3535
}
3636

3737
type EmailAddress struct {
@@ -44,8 +44,8 @@ func AddPrimaryEmail2EmailAddress(x *xorm.Engine) (err error) {
4444
}
4545

4646
// change lower_email as unique
47-
if err = x.Sync2(new(EmailAddress)); err != nil {
48-
return
47+
if err := x.Sync2(new(EmailAddress)); err != nil {
48+
return err
4949
}
5050

5151
sess := x.NewSession()
@@ -55,34 +55,33 @@ func AddPrimaryEmail2EmailAddress(x *xorm.Engine) (err error) {
5555

5656
for start := 0; ; start += batchSize {
5757
users := make([]*User, 0, batchSize)
58-
if err = sess.Limit(batchSize, start).Find(&users); err != nil {
59-
return
58+
if err := sess.Limit(batchSize, start).Find(&users); err != nil {
59+
return err
6060
}
6161
if len(users) == 0 {
6262
break
6363
}
6464

6565
for _, user := range users {
66-
var exist bool
67-
exist, err = sess.Where("email=?", user.Email).Table("email_address").Exist()
66+
exist, err := sess.Where("email=?", user.Email).Table("email_address").Exist()
6867
if err != nil {
69-
return
68+
return err
7069
}
7170
if !exist {
72-
if _, err = sess.Insert(&EmailAddress{
71+
if _, err := sess.Insert(&EmailAddress{
7372
UID: user.ID,
7473
Email: user.Email,
7574
LowerEmail: strings.ToLower(user.Email),
7675
IsActivated: user.IsActive,
7776
IsPrimary: true,
7877
}); err != nil {
79-
return
78+
return err
8079
}
8180
} else {
82-
if _, err = sess.Where("email=?", user.Email).Cols("is_primary").Update(&EmailAddress{
81+
if _, err := sess.Where("email=?", user.Email).Cols("is_primary").Update(&EmailAddress{
8382
IsPrimary: true,
8483
}); err != nil {
85-
return
84+
return err
8685
}
8786
}
8887
}

0 commit comments

Comments
 (0)