[illumos-gate merge]

commit e58ba7f235f59e7b79c7d4ce4fb02b7adc47273e
    12074 loader: cd9660_open() warn: is 'buf' large enough for 'struct iso_primary_descriptor'?
commit 8047359fa9aaaf6af13c81ce125afa018449661d
    12071 clarify implementation of single_instance in SMF services
commit 55622ceb9a02ebd6f006f047a2447f46c605bb4a
    11987 libevent: cast between incompatible function types
commit 3665ce8aeee26b1a84fb98951ef011e0779e1ae2
    11978 libnsl: cast between incompatible function types
commit 1593262046299386a3cb4f951daa90d15acdfe6c
    11983 libsocket: alias between functions of incompatible types
commit fb79d5292b21ee64c248cf81a28a07cb84b18ba1
    11980 libc_db: 'td_sync_setstate' alias between functions of incompatible types
commit 6fd7fa3508e1106878910ac25711ec6960715489
    11055 loader: zfs reader cstyle cleanup

	Conflicts:
	usr/src/man/man1m/svc.startd.1m
	usr/src/cmd/svc/milestone/network-physical.xml

1 files changed, 18 insertions, 18 deletions

diff --git a/usr/src/lib/libsocket/socket/weaks.c b/usr/src/lib/libsocket/socket/weaks.c
index 51e8d13e06..63f8d2c044 100644
--- a/usr/src/lib/libsocket/socket/weaks.c
+++ b/usr/src/lib/libsocket/socket/weaks.c
@@ -79,7 +79,7 @@ extern int _so_getsockname();
  * already bound socket.
  */
 int
-_bind(int sock, struct sockaddr *addr, int addrlen)
+_bind(int sock, struct sockaddr *addr, socklen_t addrlen)
 {
 	return (_so_bind(sock, addr, addrlen, SOV_SOCKBSD));
 }
@@ -103,7 +103,7 @@ _accept4(int sock, struct sockaddr *addr, int *addrlen, int flags)
 }
 
 int
-_connect(int sock, struct sockaddr *addr, int addrlen)
+_connect(int sock, struct sockaddr *addr, socklen_t addrlen)
 {
 	return (_so_connect(sock, addr, addrlen, SOV_DEFAULT));
 }
@@ -114,41 +114,41 @@ _shutdown(int sock, int how)
 	return (_so_shutdown(sock, how, SOV_DEFAULT));
 }
 
-int
-_recv(int sock, char *buf, int len, int flags)
+ssize_t
+_recv(int sock, void *buf, size_t len, int flags)
 {
 	return (_so_recv(sock, buf, len, flags & ~MSG_XPG4_2));
 }
 
-int
-_recvfrom(int sock, char *buf, int len, int flags,
-	struct sockaddr *addr, int *addrlen)
+ssize_t
+_recvfrom(int sock, void *_RESTRICT_KYWD buf, size_t len, int flags,
+    struct sockaddr *_RESTRICT_KYWD addr, void *addrlen)
 {
 	return (_so_recvfrom(sock, buf, len, flags & ~MSG_XPG4_2,
 	    addr, addrlen));
 }
 
-int
+ssize_t
 _recvmsg(int sock, struct msghdr *msg, int flags)
 {
 	return (_so_recvmsg(sock, msg, flags & ~MSG_XPG4_2));
 }
 
-int
-_send(int sock, char *buf, int len, int flags)
+ssize_t
+_send(int sock, const void *buf, size_t len, int flags)
 {
 	return (_so_send(sock, buf, len, flags & ~MSG_XPG4_2));
 }
 
-int
-_sendmsg(int sock, struct msghdr *msg, int flags)
+ssize_t
+_sendmsg(int sock, const struct msghdr *msg, int flags)
 {
 	return (_so_sendmsg(sock, msg, flags & ~MSG_XPG4_2));
 }
 
-int
-_sendto(int sock, char *buf, int len, int flags,
-	struct sockaddr *addr, int *addrlen)
+ssize_t
+_sendto(int sock, const void *buf, size_t len, int flags,
+    const struct sockaddr *addr, socklen_t addrlen)
 {
 	return (_so_sendto(sock, buf, len, flags & ~MSG_XPG4_2,
 	    addr, addrlen));
@@ -211,7 +211,7 @@ _getsockopt(int sock, int level, int optname, char *optval, int *optlen)
 }
 
 int
-_setsockopt(int sock, int level, int optname, char *optval, int optlen)
+_setsockopt(int sock, int level, int optname, char *optval, socklen_t optlen)
 {
 	return (_so_setsockopt(sock, level, optname, optval, optlen,
 	    SOV_DEFAULT));
@@ -250,7 +250,7 @@ __xnet_sendmsg(int sock, const struct msghdr *msg, int flags)
 
 int
 __xnet_sendto(int sock, const void *buf, size_t len, int flags,
-	const struct sockaddr *addr, socklen_t addrlen)
+    const struct sockaddr *addr, socklen_t addrlen)
 {
 	return (_so_sendto(sock, buf, len, flags | MSG_XPG4_2,
 	    addr, addrlen));
@@ -258,7 +258,7 @@ __xnet_sendto(int sock, const void *buf, size_t len, int flags,
 
 int
 __xnet_getsockopt(int sock, int level, int option_name,
-	void *option_value, socklen_t *option_lenp)
+    void *option_value, socklen_t *option_lenp)
 {
 	if (level == IPPROTO_SCTP) {
 		return (_getsockopt(sock, level, option_name, option_value,