From 70f476531f36cde0be4b3351c53a56239e09467c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 20 Aug 2022 20:25:03 +0200 Subject: [PATCH] registryurl: deprecate GetHostname(), GetPort() These were just wrappers for url.Hostname() and url.Port() Signed-off-by: Sebastiaan van Stijn --- osxkeychain/osxkeychain_darwin.go | 6 +++--- registryurl/parse.go | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/osxkeychain/osxkeychain_darwin.go b/osxkeychain/osxkeychain_darwin.go index a6d3730..dffec45 100644 --- a/osxkeychain/osxkeychain_darwin.go +++ b/osxkeychain/osxkeychain_darwin.go @@ -138,7 +138,7 @@ func (h Osxkeychain) List() (map[string]string, error) { listLen = int(listLenC) pathTmp := (*[1 << 30]*C.char)(unsafe.Pointer(pathsC))[:listLen:listLen] acctTmp := (*[1 << 30]*C.char)(unsafe.Pointer(acctsC))[:listLen:listLen] - //taking the array of c strings into go while ignoring all the stuff irrelevant to credentials-helper + // taking the array of c strings into go while ignoring all the stuff irrelevant to credentials-helper resp := make(map[string]string) for i := 0; i < listLen; i++ { if C.GoString(pathTmp[i]) == "0" { @@ -160,7 +160,7 @@ func splitServer(serverURL string) (*C.struct_Server, error) { proto = C.kSecProtocolTypeHTTP } var port int - p := registryurl.GetPort(u) + p := u.Port() if p != "" { port, err = strconv.Atoi(p) if err != nil { @@ -170,7 +170,7 @@ func splitServer(serverURL string) (*C.struct_Server, error) { return &C.struct_Server{ proto: C.SecProtocolType(proto), - host: C.CString(registryurl.GetHostname(u)), + host: C.CString(u.Hostname()), port: C.uint(port), path: C.CString(u.Path), }, nil diff --git a/registryurl/parse.go b/registryurl/parse.go index 3fa1e4e..f9a9f88 100644 --- a/registryurl/parse.go +++ b/registryurl/parse.go @@ -28,7 +28,7 @@ func Parse(registryURL string) (*url.URL, error) { return nil, errors.New("unsupported scheme: " + u.Scheme) } - if GetHostname(u) == "" { + if u.Hostname() == "" { return nil, errors.New("no hostname in URL") } @@ -37,11 +37,15 @@ func Parse(registryURL string) (*url.URL, error) { } // GetHostname returns the hostname of the URL +// +// Deprecated: use url.Hostname() func GetHostname(u *url.URL) string { return u.Hostname() } // GetPort returns the port number of the URL +// +// Deprecated: use url.Port() func GetPort(u *url.URL) string { return u.Port() }