diff --git a/runtime.go b/runtime.go index 7c7f722c5d..d4b096cfdd 100644 --- a/runtime.go +++ b/runtime.go @@ -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 } diff --git a/server.go b/server.go index 9f6842dbae..5ac2b0ee05 100644 --- a/server.go +++ b/server.go @@ -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 }