===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/monitor_fdpass.c,v
retrieving revision 1.2
retrieving revision 1.2.4.3
diff -u -r1.2 -r1.2.4.3
--- src/usr.bin/ssh/monitor_fdpass.c	2002/03/24 17:53:16	1.2
+++ src/usr.bin/ssh/monitor_fdpass.c	2002/10/11 14:53:06	1.2.4.3
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_fdpass.c,v 1.2 2002/03/24 17:53:16 stevesk Exp $");
+RCSID("$OpenBSD: monitor_fdpass.c,v 1.2.4.3 2002/10/11 14:53:06 miod Exp $");
 
 #include <sys/uio.h>
 
@@ -39,7 +39,7 @@
 	struct cmsghdr *cmsg;
 	struct iovec vec;
 	char ch = '\0';
-	int n;
+	ssize_t n;
 
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_control = (caddr_t)tmp;
@@ -56,11 +56,11 @@
 	msg.msg_iovlen = 1;
 
 	if ((n = sendmsg(socket, &msg, 0)) == -1)
-		fatal("%s: sendmsg(%d): %s", __FUNCTION__, fd,
+		fatal("%s: sendmsg(%d): %s", __func__, fd,
 		    strerror(errno));
 	if (n != 1)
-		fatal("%s: sendmsg: expected sent 1 got %d",
-		    __FUNCTION__, n);
+		fatal("%s: sendmsg: expected sent 1 got %ld",
+		    __func__, (long)n);
 }
 
 int
@@ -70,8 +70,9 @@
 	char tmp[CMSG_SPACE(sizeof(int))];
 	struct cmsghdr *cmsg;
 	struct iovec vec;
+	ssize_t n;
 	char ch;
-	int fd, n;
+	int fd;
 
 	memset(&msg, 0, sizeof(msg));
 	vec.iov_base = &ch;
@@ -82,14 +83,14 @@
 	msg.msg_controllen = sizeof(tmp);
 
 	if ((n = recvmsg(socket, &msg, 0)) == -1)
-		fatal("%s: recvmsg: %s", __FUNCTION__, strerror(errno));
+		fatal("%s: recvmsg: %s", __func__, strerror(errno));
 	if (n != 1)
-		fatal("%s: recvmsg: expected received 1 got %d",
-		    __FUNCTION__, n);
+		fatal("%s: recvmsg: expected received 1 got %ld",
+		    __func__, (long)n);
 
 	cmsg = CMSG_FIRSTHDR(&msg);
 	if (cmsg->cmsg_type != SCM_RIGHTS)
-		fatal("%s: expected type %d got %d", __FUNCTION__,
+		fatal("%s: expected type %d got %d", __func__,
 		    SCM_RIGHTS, cmsg->cmsg_type);
 	fd = (*(int *)CMSG_DATA(cmsg));
 	return fd;