Browse Source

fix compile error

Unknwon 10 years ago
parent
commit
9ee80e3e54
3 changed files with 6 additions and 8 deletions
  1. 1 1
      gogs.go
  2. 4 6
      modules/base/tool.go
  3. 1 1
      templates/.VERSION

+ 1 - 1
gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.8.1209 Beta"
+const APP_VER = "0.5.8.1210 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

+ 4 - 6
modules/base/tool.go

@@ -11,7 +11,6 @@ import (
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/hex"
-	"errors"
 	"fmt"
 	"hash"
 	"html/template"
@@ -41,15 +40,14 @@ func EncodeSha1(str string) string {
 	return hex.EncodeToString(h.Sum(nil))
 }
 
-func BasicAuthDecode(encoded string) (user string, name string, err error) {
-	var s []byte
-	s, err = base64.StdEncoding.DecodeString(encoded)
+func BasicAuthDecode(encoded string) (string, string, error) {
+	s, err := base64.StdEncoding.DecodeString(encoded)
 	if err != nil {
-		return user, name, err
+		return "", "", err
 	}
 
 	auth := strings.SplitN(string(s), ":", 2)
-	return auth[0], auth[1], err
+	return auth[0], auth[1], nil
 }
 
 func BasicAuthEncode(username, password string) string {

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.5.8.1209 Beta
+0.5.8.1210 Beta