diff --git a/src/net/mac.go b/src/net/mac.go index ea3b921f..815b2738 100644 --- a/src/net/mac.go +++ b/src/net/mac.go @@ -85,15 +85,3 @@ func ParseMAC(s string) (hw HardwareAddr, err error) { err: return nil, &AddrError{Err: "invalid MAC address", Addr: s} } - -// xtoi2 converts the next two hex digits of s into a byte. -// If s is longer than 2 bytes then the third byte must be e. -// If the first two bytes of s are not hex digits or the third byte -// does not match e, false is returned. -func xtoi2(s string, e byte) (byte, bool) { - if len(s) > 2 && s[2] != e { - return 0, false - } - n, ei, ok := xtoi(s[:2]) - return byte(n), ok && ei == 2 -} diff --git a/src/net/parse.go b/src/net/parse.go index 1255f918..2a840c85 100644 --- a/src/net/parse.go +++ b/src/net/parse.go @@ -52,6 +52,18 @@ func xtoi(s string) (n int, i int, ok bool) { return n, i, true } +// xtoi2 converts the next two hex digits of s into a byte. +// If s is longer than 2 bytes then the third byte must be e. +// If the first two bytes of s are not hex digits or the third byte +// does not match e, false is returned. +func xtoi2(s string, e byte) (byte, bool) { + if len(s) > 2 && s[2] != e { + return 0, false + } + n, ei, ok := xtoi(s[:2]) + return byte(n), ok && ei == 2 +} + // Convert unsigned integer to decimal string. func uitoa(val uint) string { if val == 0 { // avoid string allocation