kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #3420 from RoelVanNyen/getfullname

Browse source 
Cleanup: runtime.getFullName is deprecated by getFullName
This commit is contained in:
Victor Vieux 2014-01-06 13:59:04 -08:00
commit a0298c0bd0
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
runtime.go
View file

@ -583,11 +583,6 @@ func (runtime *Runtime) Commit(container *Container, repository, tag, comment, a
return img, nil return img, nil
} }
// FIXME: this is deprecated by the getFullName *function*
func (runtime *Runtime) getFullName(name string) (string, error) {
return getFullName(name)
}
func getFullName(name string) (string, error) { func getFullName(name string) (string, error) {
if name == "" { if name == "" {
return "", fmt.Errorf("Container name cannot be empty") return "", fmt.Errorf("Container name cannot be empty")
@ -599,7 +594,7 @@ func getFullName(name string) (string, error) {
} }
func (runtime *Runtime) GetByName(name string) (*Container, error) { func (runtime *Runtime) GetByName(name string) (*Container, error) {
fullName, err := runtime.getFullName(name) fullName, err := getFullName(name)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -615,7 +610,7 @@ func (runtime *Runtime) GetByName(name string) (*Container, error) {
} }
func (runtime *Runtime) Children(name string) (map[string]*Container, error) { func (runtime *Runtime) Children(name string) (map[string]*Container, error) {
name, err := runtime.getFullName(name) name, err := getFullName(name)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
server.go
View file

@ -1438,7 +1438,7 @@ func (srv *Server) ContainerDestroy(name string, removeVolume, removeLink bool)
if container == nil { if container == nil {
return fmt.Errorf("No such link: %s", name) return fmt.Errorf("No such link: %s", name)
} }
name, err := srv.runtime.getFullName(name) name, err := getFullName(name)
if err != nil { if err != nil {
return err return err
} }