refactor: err != nil check, just return error instead (#5093)

go-gitea · Oct 18, 2018 · 1e34413 · 1e34413
1 parent e4b8103
commit 1e34413
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/cmd/admin.go b/cmd/admin.go
@@ -412,16 +412,12 @@ func runAddOauth(c *cli.Context) error {
  return err
  }
 
- if err := models.CreateLoginSource(&models.LoginSource{
+ return models.CreateLoginSource(&models.LoginSource{
  Type: models.LoginOAuth2,
  Name: c.String("name"),
  IsActived: true,
  Cfg: parseOAuth2Config(c),
- }); err != nil {
- return err
- }
-
- return nil
+ })
 }
 
 func runUpdateOauth(c *cli.Context) error {
@@ -492,11 +488,7 @@ func runUpdateOauth(c *cli.Context) error {
  oAuth2Config.CustomURLMapping = customURLMapping
  source.Cfg = oAuth2Config
 
- if err := models.UpdateSource(source); err != nil {
- return err
- }
-
- return nil
+ return models.UpdateSource(source)
 }
 
 func runListAuth(c *cli.Context) error {
@@ -543,8 +535,5 @@ func runDeleteAuth(c *cli.Context) error {
  return err
  }
 
- if err = models.DeleteSource(source); err != nil {
- return err
- }
- return nil
+ return models.DeleteSource(source)
 }
diff --git a/models/migrations/v68.go b/models/migrations/v68.go
@@ -205,9 +205,6 @@ func reformatAndRemoveIncorrectTopics(x *xorm.Engine) (err error) {
  return err
  }
  }
- if err := sess.Commit(); err != nil {
- return err
- }
 
- return nil
+ return sess.Commit()
 }