=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/monitor_fdpass.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- src/usr.bin/ssh/monitor_fdpass.c 2002/06/26 15:30:38 1.2.2.1 +++ src/usr.bin/ssh/monitor_fdpass.c 2002/10/11 14:51:52 1.2.2.2 @@ -24,7 +24,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_fdpass.c,v 1.2.2.1 2002/06/26 15:30:38 jason Exp $"); +RCSID("$OpenBSD: monitor_fdpass.c,v 1.2.2.2 2002/10/11 14:51:52 miod Exp $"); #include @@ -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; @@ -59,8 +59,8 @@ fatal("%s: sendmsg(%d): %s", __func__, fd, strerror(errno)); if (n != 1) - fatal("%s: sendmsg: expected sent 1 got %d", - __func__, 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; @@ -84,8 +85,8 @@ if ((n = recvmsg(socket, &msg, 0)) == -1) fatal("%s: recvmsg: %s", __func__, strerror(errno)); if (n != 1) - fatal("%s: recvmsg: expected received 1 got %d", - __func__, n); + fatal("%s: recvmsg: expected received 1 got %ld", + __func__, (long)n); cmsg = CMSG_FIRSTHDR(&msg); if (cmsg->cmsg_type != SCM_RIGHTS)