internal/socket: make not implemented errors more descriptive

mikioh · mikioh · commit 312bce6e941f · 2019-02-27T02:21:44.000Z
Change-Id: I7c1447849dc664ae54229345f2fce8f59204ecdf Reviewed-on: https://go-review.googlesource.com/c/150117 Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/internal/socket/rawconn_nommsg.go b/internal/socket/rawconn_nommsg.go
@@ -7,12 +7,10 @@
 
 package socket
 
-import "errors"
-
 func (c *Conn) recvMsgs(ms []Message, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func (c *Conn) sendMsgs(ms []Message, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
diff --git a/internal/socket/rawconn_nomsg.go b/internal/socket/rawconn_nomsg.go
@@ -7,12 +7,10 @@
 
 package socket
 
-import "errors"
-
 func (c *Conn) recvMsg(m *Message, flags int) error {
-	return errors.New("not implemented")
+	return errNotImplemented
 }
 
 func (c *Conn) sendMsg(m *Message, flags int) error {
-	return errors.New("not implemented")
+	return errNotImplemented
 }
diff --git a/internal/socket/rawconn_stub.go b/internal/socket/rawconn_stub.go
@@ -6,20 +6,18 @@
 
 package socket
 
-import "errors"
-
 func (c *Conn) recvMsg(m *Message, flags int) error {
-	return errors.New("not implemented")
+	return errNotImplemented
 }
 
 func (c *Conn) sendMsg(m *Message, flags int) error {
-	return errors.New("not implemented")
+	return errNotImplemented
 }
 
 func (c *Conn) recvMsgs(ms []Message, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func (c *Conn) sendMsgs(ms []Message, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
diff --git a/internal/socket/socket.go b/internal/socket/socket.go
@@ -9,9 +9,12 @@ package socket // import "golang.org/x/net/internal/socket"
 import (
 	"errors"
 	"net"
+	"runtime"
 	"unsafe"
 )
 
+var errNotImplemented = errors.New("not implemented on " + runtime.GOOS + "/" + runtime.GOARCH)
+
 // An Option represents a sticky socket option.
 type Option struct {
 	Level int // level
diff --git a/internal/socket/sys_bsd.go b/internal/socket/sys_bsd.go
@@ -6,12 +6,10 @@
 
 package socket
 
-import "errors"
-
 func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func sendmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
diff --git a/internal/socket/sys_solaris.go b/internal/socket/sys_solaris.go
@@ -5,7 +5,6 @@
 package socket
 
 import (
-	"errors"
 	"runtime"
 	"syscall"
 	"unsafe"
@@ -63,9 +62,9 @@ func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
 }
 
 func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func sendmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
diff --git a/internal/socket/sys_stub.go b/internal/socket/sys_stub.go
@@ -7,7 +7,6 @@
 package socket
 
 import (
-	"errors"
 	"net"
 	"runtime"
 	"unsafe"
@@ -36,29 +35,29 @@ func marshalInetAddr(ip net.IP, port int, zone string) []byte {
 }
 
 func parseInetAddr(b []byte, network string) (net.Addr, error) {
-	return nil, errors.New("not implemented")
+	return nil, errNotImplemented
 }
 
 func getsockopt(s uintptr, level, name int, b []byte) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func setsockopt(s uintptr, level, name int, b []byte) error {
-	return errors.New("not implemented")
+	return errNotImplemented
 }
 
 func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func sendmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
diff --git a/internal/socket/sys_windows.go b/internal/socket/sys_windows.go
@@ -5,7 +5,6 @@
 package socket
 
 import (
-	"errors"
 	"syscall"
 	"unsafe"
 )
@@ -54,17 +53,17 @@ func setsockopt(s uintptr, level, name int, b []byte) error {
 }
 
 func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }
 
 func sendmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {
-	return 0, errors.New("not implemented")
+	return 0, errNotImplemented
 }

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,10 @@`
`7`	`7`
`8`	`8`	`package socket`
`9`	`9`
`10`		`-import "errors"`
`11`		`-`
`12`	`10`	`func (c *Conn) recvMsgs(ms []Message, flags int) (int, error) {`
`13`		`- return 0, errors.New("not implemented")`
	`11`	`+ return 0, errNotImplemented`
`14`	`12`	`}`
`15`	`13`
`16`	`14`	`func (c *Conn) sendMsgs(ms []Message, flags int) (int, error) {`
`17`		`- return 0, errors.New("not implemented")`
	`15`	`+ return 0, errNotImplemented`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,18 @@`
`6`	`6`
`7`	`7`	`package socket`
`8`	`8`
`9`		`-import "errors"`
`10`		`-`
`11`	`9`	`func (c Conn) recvMsg(m Message, flags int) error {`
`12`		`- return errors.New("not implemented")`
	`10`	`+ return errNotImplemented`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`func (c Conn) sendMsg(m Message, flags int) error {`
`16`		`- return errors.New("not implemented")`
	`14`	`+ return errNotImplemented`
`17`	`15`	`}`
`18`	`16`
`19`	`17`	`func (c *Conn) recvMsgs(ms []Message, flags int) (int, error) {`
`20`		`- return 0, errors.New("not implemented")`
	`18`	`+ return 0, errNotImplemented`
`21`	`19`	`}`
`22`	`20`
`23`	`21`	`func (c *Conn) sendMsgs(ms []Message, flags int) (int, error) {`
`24`		`- return 0, errors.New("not implemented")`
	`22`	`+ return 0, errNotImplemented`
`25`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,10 @@`
`6`	`6`
`7`	`7`	`package socket`
`8`	`8`
`9`		`-import "errors"`
`10`		`-`
`11`	`9`	`func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {`
`12`		`- return 0, errors.New("not implemented")`
	`10`	`+ return 0, errNotImplemented`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`func sendmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {`
`16`		`- return 0, errors.New("not implemented")`
	`14`	`+ return 0, errNotImplemented`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`package socket`
`6`	`6`
`7`	`7`	`import (`
`8`		`- "errors"`
`9`	`8`	`"runtime"`
`10`	`9`	`"syscall"`
`11`	`10`	`"unsafe"`
`@@ -63,9 +62,9 @@ func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {`
`66`		`- return 0, errors.New("not implemented")`
	`65`	`+ return 0, errNotImplemented`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`func sendmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {`
`70`		`- return 0, errors.New("not implemented")`
	`69`	`+ return 0, errNotImplemented`
`71`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`package socket`
`8`	`8`
`9`	`9`	`import (`
`10`		`- "errors"`
`11`	`10`	`"net"`
`12`	`11`	`"runtime"`
`13`	`12`	`"unsafe"`
`@@ -36,29 +35,29 @@ func marshalInetAddr(ip net.IP, port int, zone string) []byte {`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`func parseInetAddr(b []byte, network string) (net.Addr, error) {`
`39`		`- return nil, errors.New("not implemented")`
	`38`	`+ return nil, errNotImplemented`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`func getsockopt(s uintptr, level, name int, b []byte) (int, error) {`
`43`		`- return 0, errors.New("not implemented")`
	`42`	`+ return 0, errNotImplemented`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`func setsockopt(s uintptr, level, name int, b []byte) error {`
`47`		`- return errors.New("not implemented")`
	`46`	`+ return errNotImplemented`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`func recvmsg(s uintptr, h *msghdr, flags int) (int, error) {`
`51`		`- return 0, errors.New("not implemented")`
	`50`	`+ return 0, errNotImplemented`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`func sendmsg(s uintptr, h *msghdr, flags int) (int, error) {`
`55`		`- return 0, errors.New("not implemented")`
	`54`	`+ return 0, errNotImplemented`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`func recvmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {`
`59`		`- return 0, errors.New("not implemented")`
	`58`	`+ return 0, errNotImplemented`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`func sendmmsg(s uintptr, hs []mmsghdr, flags int) (int, error) {`
`63`		`- return 0, errors.New("not implemented")`
	`62`	`+ return 0, errNotImplemented`
`64`	`63`	`}`