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

Cleanup: runtime.getFullName is deprecated by getFullName

This commit is contained in:
Roel Van Nyen 2014-01-02 00:06:50 +01:00
parent 5f55784224
commit 9dd7ae4074
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

@ -582,11 +582,6 @@ func (runtime *Runtime) Commit(container *Container, repository, tag, comment, a
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) {
if name == "" {
return "", fmt.Errorf("Container name cannot be empty")
@ -598,7 +593,7 @@ func getFullName(name string) (string, error) {
}
func (runtime *Runtime) GetByName(name string) (*Container, error) {
fullName, err := runtime.getFullName(name)
fullName, err := getFullName(name)
if err != nil {
return nil, err
}
@ -614,7 +609,7 @@ func (runtime *Runtime) GetByName(name 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 {
return nil, err
}

2
server.go
View File

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