Remove check for negative length (#5120)

tokarchuk/v1.17
Oleg Kovalov 6 years ago committed by techknowlogick
parent 583b1b8429
commit 5a4648cdd6
  1. 2
      models/issue_label.go
  2. 4
      models/org.go
  3. 2
      models/ssh_key.go
  4. 2
      modules/auth/auth.go
  5. 2
      modules/user/user_test.go
  6. 2
      routers/api/v1/api.go
  7. 2
      routers/user/home.go

@ -134,7 +134,7 @@ func NewLabels(labels ...*Label) error {
// If pass repoID as 0, then ORM will ignore limitation of repository // If pass repoID as 0, then ORM will ignore limitation of repository
// and can return arbitrary label with any valid ID. // and can return arbitrary label with any valid ID.
func getLabelInRepoByName(e Engine, repoID int64, labelName string) (*Label, error) { func getLabelInRepoByName(e Engine, repoID int64, labelName string) (*Label, error) {
if len(labelName) <= 0 { if len(labelName) == 0 {
return nil, ErrLabelNotExist{0, repoID} return nil, ErrLabelNotExist{0, repoID}
} }

@ -677,7 +677,7 @@ func (env *accessibleReposEnv) Repos(page, pageSize int) ([]*Repository, error)
} }
repos := make([]*Repository, 0, len(repoIDs)) repos := make([]*Repository, 0, len(repoIDs))
if len(repoIDs) <= 0 { if len(repoIDs) == 0 {
return repos, nil return repos, nil
} }
@ -705,7 +705,7 @@ func (env *accessibleReposEnv) MirrorRepos() ([]*Repository, error) {
} }
repos := make([]*Repository, 0, len(repoIDs)) repos := make([]*Repository, 0, len(repoIDs))
if len(repoIDs) <= 0 { if len(repoIDs) == 0 {
return repos, nil return repos, nil
} }

@ -376,7 +376,7 @@ func calcFingerprint(publicKeyContent string) (string, error) {
} }
func addKey(e Engine, key *PublicKey) (err error) { func addKey(e Engine, key *PublicKey) (err error) {
if len(key.Fingerprint) <= 0 { if len(key.Fingerprint) == 0 {
key.Fingerprint, err = calcFingerprint(key.Content) key.Fingerprint, err = calcFingerprint(key.Content)
if err != nil { if err != nil {
return err return err

@ -36,7 +36,7 @@ func SignedInID(ctx *macaron.Context, sess session.Store) int64 {
// Check access token. // Check access token.
if IsAPIPath(ctx.Req.URL.Path) { if IsAPIPath(ctx.Req.URL.Path) {
tokenSHA := ctx.Query("token") tokenSHA := ctx.Query("token")
if len(tokenSHA) <= 0 { if len(tokenSHA) == 0 {
tokenSHA = ctx.Query("access_token") tokenSHA = ctx.Query("access_token")
} }
if len(tokenSHA) == 0 { if len(tokenSHA) == 0 {

@ -18,7 +18,7 @@ func getWhoamiOutput() (string, error) {
func TestCurrentUsername(t *testing.T) { func TestCurrentUsername(t *testing.T) {
user := CurrentUsername() user := CurrentUsername()
if len(user) <= 0 { if len(user) == 0 {
t.Errorf("expected non-empty user, got: %s", user) t.Errorf("expected non-empty user, got: %s", user)
} }
// Windows whoami is weird, so just skip remaining tests // Windows whoami is weird, so just skip remaining tests

@ -80,7 +80,7 @@ import (
func sudo() macaron.Handler { func sudo() macaron.Handler {
return func(ctx *context.APIContext) { return func(ctx *context.APIContext) {
sudo := ctx.Query("sudo") sudo := ctx.Query("sudo")
if len(sudo) <= 0 { if len(sudo) == 0 {
sudo = ctx.Req.Header.Get("Sudo") sudo = ctx.Req.Header.Get("Sudo")
} }

@ -213,7 +213,7 @@ func Issues(ctx *context.Context) {
return return
} }
} }
if len(userRepoIDs) <= 0 { if len(userRepoIDs) == 0 {
userRepoIDs = []int64{-1} userRepoIDs = []int64{-1}
} }

Loading…
Cancel
Save