syscall: unify unix Sendmsg prologues

These were identical. This is a preliminary step
towards remove allocs per UDP send.

Change-Id: I21e1264c7d4747baa626ddb93afff4c1cf225d13
Reviewed-on: https://go-review.googlesource.com/c/go/+/361256
Trust: Josh Bleecher Snyder <josharian@gmail.com>
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/syscall/syscall_aix.go b/src/syscall/syscall_aix.go
index f3b160cae498183429988619d247fea8d6698697..36172cc678f72e33f674640bd5b8007e073750de 100644 (file)
--- a/src/syscall/syscall_aix.go
+++ b/src/syscall/syscall_aix.go
@@ -360,20 +360,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
        return
 }
 
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-       _, err = SendmsgN(fd, p, oob, to, flags)
-       return
-}
-
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-       var ptr unsafe.Pointer
-       var salen _Socklen
-       if to != nil {
-               ptr, salen, err = to.sockaddr()
-               if err != nil {
-                       return 0, err
-               }
-       }
+func sendmsgN(fd int, p, oob []byte, ptr unsafe.Pointer, salen _Socklen, flags int) (n int, err error) {
        var msg Msghdr
        msg.Name = (*byte)(unsafe.Pointer(ptr))
        msg.Namelen = uint32(salen)

diff --git a/src/syscall/syscall_bsd.go b/src/syscall/syscall_bsd.go
index 8945661300cfd5f3f902d69d0364a8d30773da9e..71a331d6c0bddc81a649e3891ee756942fd6c371 100644 (file)
--- a/src/syscall/syscall_bsd.go
+++ b/src/syscall/syscall_bsd.go
@@ -394,20 +394,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
 
 //sys  sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
 
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-       _, err = SendmsgN(fd, p, oob, to, flags)
-       return
-}
-
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-       var ptr unsafe.Pointer
-       var salen _Socklen
-       if to != nil {
-               ptr, salen, err = to.sockaddr()
-               if err != nil {
-                       return 0, err
-               }
-       }
+func sendmsgN(fd int, p, oob []byte, ptr unsafe.Pointer, salen _Socklen, flags int) (n int, err error) {
        var msg Msghdr
        msg.Name = (*byte)(unsafe.Pointer(ptr))
        msg.Namelen = uint32(salen)

diff --git a/src/syscall/syscall_linux.go b/src/syscall/syscall_linux.go
index 1c6033bbabc1ffbc85e69d9a80e71dd9f09506f1..695ce2b19866feac35d90318afc1076339c85b59 100644 (file)
--- a/src/syscall/syscall_linux.go
+++ b/src/syscall/syscall_linux.go
@@ -679,21 +679,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
        return
 }
 
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-       _, err = SendmsgN(fd, p, oob, to, flags)
-       return
-}
-
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-       var ptr unsafe.Pointer
-       var salen _Socklen
-       if to != nil {
-               var err error
-               ptr, salen, err = to.sockaddr()
-               if err != nil {
-                       return 0, err
-               }
-       }
+func sendmsgN(fd int, p, oob []byte, ptr unsafe.Pointer, salen _Socklen, flags int) (n int, err error) {
        var msg Msghdr
        msg.Name = (*byte)(ptr)
        msg.Namelen = uint32(salen)

diff --git a/src/syscall/syscall_solaris.go b/src/syscall/syscall_solaris.go
index 13616fca9d3f9900a028652c0d31db5f1a65862d..15b3c2bb40747c23724134d4dfbfc94167a03ff0 100644 (file)
--- a/src/syscall/syscall_solaris.go
+++ b/src/syscall/syscall_solaris.go
@@ -365,22 +365,9 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
        return
 }
 
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-       _, err = SendmsgN(fd, p, oob, to, flags)
-       return
-}
-
 //sys  sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.__xnet_sendmsg
 
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-       var ptr unsafe.Pointer
-       var salen _Socklen
-       if to != nil {
-               ptr, salen, err = to.sockaddr()
-               if err != nil {
-                       return 0, err
-               }
-       }
+func sendmsgN(fd int, p, oob []byte, ptr unsafe.Pointer, salen _Socklen, flags int) (n int, err error) {
        var msg Msghdr
        msg.Name = (*byte)(unsafe.Pointer(ptr))
        msg.Namelen = uint32(salen)

diff --git a/src/syscall/syscall_unix.go b/src/syscall/syscall_unix.go
index adc1e5dbfb556fcf380f5eef078ec092edc77337..2837c976e319d42c56899bc59527ab890597f4fa 100644 (file)
--- a/src/syscall/syscall_unix.go
+++ b/src/syscall/syscall_unix.go
@@ -324,6 +324,23 @@ func recvfromInet6(fd int, p []byte, flags int, from *SockaddrInet6) (n int, err
        return
 }
 
+func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
+       _, err = SendmsgN(fd, p, oob, to, flags)
+       return
+}
+
+func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
+       var ptr unsafe.Pointer
+       var salen _Socklen
+       if to != nil {
+               ptr, salen, err = to.sockaddr()
+               if err != nil {
+                       return 0, err
+               }
+       }
+       return sendmsgN(fd, p, oob, ptr, salen, flags)
+}
+
 func sendtoInet4(fd int, p []byte, flags int, to SockaddrInet4) (err error) {
        ptr, n, err := to.sockaddr()
        if err != nil {