docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

api,server: slice are already refs, no need to return ptr

This commit is contained in:
Johan Euphrosine 2013-06-28 12:41:09 -07:00
parent e12a204bcc
commit 54da339b2c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api.go
View File

@ -535,7 +535,7 @@ func deleteImages(srv *Server, version float64, w http.ResponseWriter, r *http.R
return err return err
} }
if imgs != nil { if imgs != nil {
if len(*imgs) != 0 { if len(imgs) != 0 {
b, err := json.Marshal(imgs) b, err := json.Marshal(imgs)
if err != nil { if err != nil {
return err return err

10
server.go
View File

@ -858,7 +858,7 @@ func (srv *Server) deleteImageParents(img *Image, imgs *[]APIRmi) error {
return nil return nil
} }
func (srv *Server) deleteImage(img *Image, repoName, tag string) (*[]APIRmi, error) { func (srv *Server) deleteImage(img *Image, repoName, tag string) ([]APIRmi, error) {
//Untag the current image //Untag the current image
var imgs []APIRmi var imgs []APIRmi
tagDeleted, err := srv.runtime.repositories.Delete(repoName, tag) tagDeleted, err := srv.runtime.repositories.Delete(repoName, tag)
@ -871,18 +871,18 @@ func (srv *Server) deleteImage(img *Image, repoName, tag string) (*[]APIRmi, err
if len(srv.runtime.repositories.ByID()[img.ID]) == 0 { if len(srv.runtime.repositories.ByID()[img.ID]) == 0 {
if err := srv.deleteImageAndChildren(img.ID, &imgs); err != nil { if err := srv.deleteImageAndChildren(img.ID, &imgs); err != nil {
if err != ErrImageReferenced { if err != ErrImageReferenced {
return &imgs, err return imgs, err
} }
} else if err := srv.deleteImageParents(img, &imgs); err != nil { } else if err := srv.deleteImageParents(img, &imgs); err != nil {
if err != ErrImageReferenced { if err != ErrImageReferenced {
return &imgs, err return imgs, err
} }
} }
} }
return &imgs, nil return imgs, nil
} }
func (srv *Server) ImageDelete(name string, autoPrune bool) (*[]APIRmi, error) { func (srv *Server) ImageDelete(name string, autoPrune bool) ([]APIRmi, error) {
img, err := srv.runtime.repositories.LookupImage(name) img, err := srv.runtime.repositories.LookupImage(name)
if err != nil { if err != nil {
return nil, fmt.Errorf("No such image: %s", name) return nil, fmt.Errorf("No such image: %s", name)