From c530acf6a4b8c96e9d53c38d21267b61a7faf1b0 Mon Sep 17 00:00:00 2001
From: Yicheng Qin <qycqycqycqycqyc@gmail.com>
Date: Fri, 21 Aug 2015 11:58:37 -0700
Subject: [PATCH] pkg/netutil: not export resolve and urlsEqual functions

They are only used in this package, so there is no need to public them.
---
 pkg/netutil/netutil.go      | 14 +++++++-------
 pkg/netutil/netutil_test.go |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go
index 73eeabf98..f9541e104 100644
--- a/pkg/netutil/netutil.go
+++ b/pkg/netutil/netutil.go
@@ -34,10 +34,10 @@ var (
 	resolveTCPAddr = net.ResolveTCPAddr
 )
 
-// ResolveTCPAddrs is a convenience wrapper for net.ResolveTCPAddr.
-// ResolveTCPAddrs resolves all DNS hostnames in-place for the given set of
+// resolveTCPAddrs is a convenience wrapper for net.ResolveTCPAddr.
+// resolveTCPAddrs resolves all DNS hostnames in-place for the given set of
 // url.URLs.
-func ResolveTCPAddrs(urls ...[]url.URL) error {
+func resolveTCPAddrs(urls ...[]url.URL) error {
 	for _, us := range urls {
 		for i, u := range us {
 			host, _, err := net.SplitHostPort(u.Host)
@@ -63,13 +63,13 @@ func ResolveTCPAddrs(urls ...[]url.URL) error {
 	return nil
 }
 
-// URLsEqual checks equality of url.URLS between two arrays.
+// urlsEqual checks equality of url.URLS between two arrays.
 // This check pass even if an URL is in hostname and opposite is in IP address.
-func URLsEqual(a []url.URL, b []url.URL) bool {
+func urlsEqual(a []url.URL, b []url.URL) bool {
 	if len(a) != len(b) {
 		return false
 	}
-	ResolveTCPAddrs(a, b)
+	resolveTCPAddrs(a, b)
 	sort.Sort(types.URLs(a))
 	sort.Sort(types.URLs(b))
 	for i := range a {
@@ -102,7 +102,7 @@ func URLStringsEqual(a []string, b []string) bool {
 		urlsB = append(urlsB, *u)
 	}
 
-	return URLsEqual(urlsA, urlsB)
+	return urlsEqual(urlsA, urlsB)
 }
 
 // BasicAuth returns the username and password provided in the request's
diff --git a/pkg/netutil/netutil_test.go b/pkg/netutil/netutil_test.go
index 5720354c8..1bf000694 100644
--- a/pkg/netutil/netutil_test.go
+++ b/pkg/netutil/netutil_test.go
@@ -124,7 +124,7 @@ func TestResolveTCPAddrs(t *testing.T) {
 			}
 			return &net.TCPAddr{IP: net.ParseIP(tt.hostMap[host]), Port: i, Zone: ""}, nil
 		}
-		err := ResolveTCPAddrs(tt.urls...)
+		err := resolveTCPAddrs(tt.urls...)
 		if tt.hasError {
 			if err == nil {
 				t.Errorf("expected error")
@@ -244,7 +244,7 @@ func TestURLsEqual(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		result := URLsEqual(test.a, test.b)
+		result := urlsEqual(test.a, test.b)
 		if result != test.expect {
 			t.Errorf("a:%v b:%v, expected %v but %v", test.a, test.b, test.expect, result)
 		}