From cbb7c078afcfeda1c8d708b446d03a017dfaf0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Fri, 9 Mar 2018 11:15:20 +0100
Subject: [PATCH] Don't use reference.TrimNamed().String()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

reference.TrimNamed(r).String() is equivalent to r.Name(), just more expensive.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
---
 storage/storage_reference.go | 11 +++++------
 storage/storage_transport.go |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/storage/storage_reference.go b/storage/storage_reference.go
index 8fbeea02..73d7d43e 100644
--- a/storage/storage_reference.go
+++ b/storage/storage_reference.go
@@ -57,12 +57,12 @@ func (s *storageReference) resolveImage() (*storage.Image, error) {
 		// that the canonical reference can be implicitly resolved to the image.
 		images, err := s.transport.store.ImagesByDigest(s.digest)
 		if images != nil && err == nil {
-			repo := reference.FamiliarName(reference.TrimNamed(s.name))
+			repo := reference.FamiliarName(s.name)
 		search:
 			for _, image := range images {
 				for _, name := range image.Names {
 					if named, err := reference.ParseNormalizedNamed(name); err == nil {
-						if reference.FamiliarName(reference.TrimNamed(named)) == repo {
+						if reference.FamiliarName(named) == repo {
 							s.id = image.ID
 							break search
 						}
@@ -80,11 +80,11 @@ func (s *storageReference) resolveImage() (*storage.Image, error) {
 		return nil, errors.Wrapf(err, "error reading image %q", s.id)
 	}
 	if s.name != nil {
-		repo := reference.FamiliarName(reference.TrimNamed(s.name))
+		repo := reference.FamiliarName(s.name)
 		nameMatch := false
 		for _, name := range img.Names {
 			if named, err := reference.ParseNormalizedNamed(name); err == nil {
-				if reference.FamiliarName(reference.TrimNamed(named)) == repo {
+				if reference.FamiliarName(named) == repo {
 					nameMatch = true
 					break
 				}
@@ -171,8 +171,7 @@ func (s storageReference) PolicyConfigurationNamespaces() []string {
 			// The reference without the ID is also a valid namespace.
 			namespaces = append(namespaces, storeSpec+s.reference)
 		}
-		name := reference.TrimNamed(s.name)
-		components := strings.Split(name.String(), "/")
+		components := strings.Split(s.name.Name(), "/")
 		for len(components) > 0 {
 			namespaces = append(namespaces, storeSpec+strings.Join(components, "/"))
 			components = components[:len(components)-1]
diff --git a/storage/storage_transport.go b/storage/storage_transport.go
index e86f58ae..78613150 100644
--- a/storage/storage_transport.go
+++ b/storage/storage_transport.go
@@ -432,7 +432,7 @@ func verboseName(r reference.Named) string {
 	tagged, isTagged := r.(reference.Tagged)
 	tag := ""
 	sum := ""
-	name := (reference.TrimNamed(r)).String()
+	name := r.Name()
 	if isTagged {
 		if tagged.Tag() != "" {
 			tag = ":" + tagged.Tag()