mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-27 12:21:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix defer location and err check

Browse source
This commit is contained in:
Joachim Hill-Grannec 2016-06-12 22:18:31 -07:00
parent 6f4c4a37dc
commit be1b75fd45
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
remote/bitbucketserver/bitbucketserver.go
View file

@ -119,11 +119,13 @@ func (c *client) Login(res http.ResponseWriter, req *http.Request) (*model.User,
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer response1.Body.Close()
contents, err := ioutil.ReadAll(response1.Body) contents, err := ioutil.ReadAll(response1.Body)
if err !=nil { if err !=nil {
return nil, err return nil, err
} }
defer response1.Body.Close()
var user User var user User
err = json.Unmarshal(contents, &user) err = json.Unmarshal(contents, &user)
if err != nil { if err != nil {
@ -264,6 +266,9 @@ func (*client) Status(*model.User, *model.Repo, *model.Build, string) error {
func (c *client) Netrc(user *model.User, r *model.Repo) (*model.Netrc, error) { func (c *client) Netrc(user *model.User, r *model.Repo) (*model.Netrc, error) {
u, err := url.Parse(c.URL) u, err := url.Parse(c.URL)
if err != nil {
return nil, err
}
//remove the port //remove the port
tmp := strings.Split(u.Host, ":") tmp := strings.Split(u.Host, ":")
var host = tmp[0] var host = tmp[0]