Browse Source

refactor: Remove unnecessary type conversions (#772)

release/v1.1
Bo-Yi Wu 6 years ago
committed by Lunny Xiao
parent
commit
25663b5816
  1. 2
      models/ssh_key.go
  2. 2
      modules/lfs/server.go
  3. 2
      modules/markdown/markdown.go
  4. 4
      modules/templates/helper.go

2
models/ssh_key.go

@ -219,7 +219,7 @@ func SSHKeyGenParsePublicKey(key string) (string, int, error) {
func SSHNativeParsePublicKey(keyLine string) (string, int, error) {
fields := strings.Fields(keyLine)
if len(fields) < 2 {
return "", 0, fmt.Errorf("not enough fields in public key line: %s", string(keyLine))
return "", 0, fmt.Errorf("not enough fields in public key line: %s", keyLine)
}
raw, err := base64.StdEncoding.DecodeString(fields[1])

2
modules/lfs/server.go

@ -132,7 +132,7 @@ func GetContentHandler(ctx *context.Context) {
if match != nil && len(match) > 1 {
statusCode = 206
fromByte, _ = strconv.ParseInt(match[1], 10, 32)
ctx.Resp.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", fromByte, meta.Size-1, int64(meta.Size)-fromByte))
ctx.Resp.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", fromByte, meta.Size-1, meta.Size-fromByte))
}
}

2
modules/markdown/markdown.go

@ -301,7 +301,7 @@ func RenderSha1CurrentPattern(rawBytes []byte, urlPrefix string) []byte {
if com.StrTo(m).MustInt() > 0 {
return m
}
return fmt.Sprintf(`<a href="%s/commit/%s"><code>%s</code></a>`, urlPrefix, m, base.ShortSha(string(m)))
return fmt.Sprintf(`<a href="%s/commit/%s"><code>%s</code></a>`, urlPrefix, m, base.ShortSha(m))
}))
}

4
modules/templates/helper.go

@ -121,8 +121,8 @@ func NewFuncMap() []template.FuncMap {
var path []string
index := strings.LastIndex(str, "/")
if index != -1 && index != len(str) {
path = append(path, string(str[0:index+1]))
path = append(path, string(str[index+1:]))
path = append(path, str[0:index+1])
path = append(path, str[index+1:])
} else {
path = append(path, str)
}

Loading…
Cancel
Save