Browse code

Cleanup: runtime.getFullName is deprecated by getFullName

Roel Van Nyen authored on 2014/01/02 08:06:50
Showing 2 changed files
... ...
@@ -582,11 +582,6 @@ func (runtime *Runtime) Commit(container *Container, repository, tag, comment, a
582 582
 	return img, nil
583 583
 }
584 584
 
585
-// FIXME: this is deprecated by the getFullName *function*
586
-func (runtime *Runtime) getFullName(name string) (string, error) {
587
-	return getFullName(name)
588
-}
589
-
590 585
 func getFullName(name string) (string, error) {
591 586
 	if name == "" {
592 587
 		return "", fmt.Errorf("Container name cannot be empty")
... ...
@@ -598,7 +593,7 @@ func getFullName(name string) (string, error) {
598 598
 }
599 599
 
600 600
 func (runtime *Runtime) GetByName(name string) (*Container, error) {
601
-	fullName, err := runtime.getFullName(name)
601
+	fullName, err := getFullName(name)
602 602
 	if err != nil {
603 603
 		return nil, err
604 604
 	}
... ...
@@ -614,7 +609,7 @@ func (runtime *Runtime) GetByName(name string) (*Container, error) {
614 614
 }
615 615
 
616 616
 func (runtime *Runtime) Children(name string) (map[string]*Container, error) {
617
-	name, err := runtime.getFullName(name)
617
+	name, err := getFullName(name)
618 618
 	if err != nil {
619 619
 		return nil, err
620 620
 	}
... ...
@@ -1435,7 +1435,7 @@ func (srv *Server) ContainerDestroy(name string, removeVolume, removeLink bool)
1435 1435
 		if container == nil {
1436 1436
 			return fmt.Errorf("No such link: %s", name)
1437 1437
 		}
1438
-		name, err := srv.runtime.getFullName(name)
1438
+		name, err := getFullName(name)
1439 1439
 		if err != nil {
1440 1440
 			return err
1441 1441
 		}