diff options
| author |   jca <jca@openbsd.org> | 2016-02-29 20:22:36 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2016-02-29 20:22:36 +0000 |
| commit | 55c3341c6c391a0be51c19e81d32811a9a3e6a9b (patch) | |
| tree | 982248c6a3354c98f96d62ca42bf0808095cfb39 | |
| parent | delete the kern.emul/KERN_EMUL sysctl bits since there are no (diff) | |
| download | wireguard-openbsd-55c3341c6c391a0be51c19e81d32811a9a3e6a9b.tar.xz wireguard-openbsd-55c3341c6c391a0be51c19e81d32811a9a3e6a9b.zip | |
Print ssize_t with %zd; ok deraadt@ mmcc@
| -rw-r--r-- | libexec/ftpd/monitor_fdpass.c | 8 | ||||
| -rw-r--r-- | sbin/isakmpd/monitor_fdpass.c | 9 | ||||
| -rw-r--r-- | usr.bin/ssh/monitor_fdpass.c | 8 |
3 files changed, 11 insertions, 14 deletions
diff --git a/libexec/ftpd/monitor_fdpass.c b/libexec/ftpd/monitor_fdpass.c index eaa3c398b0d..c54c7c165f4 100644 --- a/libexec/ftpd/monitor_fdpass.c +++ b/libexec/ftpd/monitor_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_fdpass.c,v 1.6 2013/11/12 04:44:14 deraadt Exp $ */ +/* $OpenBSD: monitor_fdpass.c,v 1.7 2016/02/29 20:22:36 jca Exp $ */ /* * Copyright (c) 2002 Matthieu Herrb @@ -62,8 +62,8 @@ send_fd(int sock, int fd) if ((n = sendmsg(sock, &msg, 0)) == -1) syslog(LOG_WARNING, "send_fd: sendmsg(%d): %m", sock); if (n != sizeof(int)) - syslog(LOG_WARNING, "send_fd: sendmsg: expected sent 1 got %ld", - (long)n); + syslog(LOG_WARNING, "send_fd: sendmsg: expected sent 1 got %zd", + n); } int @@ -94,7 +94,7 @@ recv_fd(int sock) } if (n != sizeof(int)) syslog(LOG_WARNING, - "recv_fd: recvmsg: expected received 1 got %ld", (long)n); + "recv_fd: recvmsg: expected received 1 got %zd", n); if (result == 0) { cmsg = CMSG_FIRSTHDR(&msg); if (cmsg == NULL) { diff --git a/sbin/isakmpd/monitor_fdpass.c b/sbin/isakmpd/monitor_fdpass.c index 50e3f354655..04f677b0b11 100644 --- a/sbin/isakmpd/monitor_fdpass.c +++ b/sbin/isakmpd/monitor_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_fdpass.c,v 1.16 2008/03/24 16:11:08 deraadt Exp $ */ +/* $OpenBSD: monitor_fdpass.c,v 1.17 2016/02/29 20:22:36 jca Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> @@ -67,8 +67,7 @@ mm_send_fd(int socket, int fd) return -1; } if (n != 1) { - log_error("mm_send_fd: sendmsg: expected sent 1 got %ld", - (long)n); + log_error("mm_send_fd: sendmsg: expected sent 1 got %zd", n); return -1; } return 0; @@ -101,8 +100,8 @@ mm_receive_fd(int socket) return -1; } if (n != 1) { - log_error("mm_receive_fd: recvmsg: expected received 1 got %ld", - (long)n); + log_error("mm_receive_fd: recvmsg: expected received 1 got %zd", + n); return -1; } cmsg = CMSG_FIRSTHDR(&msg); diff --git a/usr.bin/ssh/monitor_fdpass.c b/usr.bin/ssh/monitor_fdpass.c index 3e8a58d0e66..06278bd9aeb 100644 --- a/usr.bin/ssh/monitor_fdpass.c +++ b/usr.bin/ssh/monitor_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_fdpass.c,v 1.20 2015/02/25 23:05:47 djm Exp $ */ +/* $OpenBSD: monitor_fdpass.c,v 1.21 2016/02/29 20:22:36 jca Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -79,8 +79,7 @@ mm_send_fd(int sock, int fd) } if (n != 1) { - error("%s: sendmsg: expected sent 1 got %ld", - __func__, (long)n); + error("%s: sendmsg: expected sent 1 got %zd", __func__, n); return -1; } return 0; @@ -123,8 +122,7 @@ mm_receive_fd(int sock) } if (n != 1) { - error("%s: recvmsg: expected received 1 got %ld", - __func__, (long)n); + error("%s: recvmsg: expected received 1 got %zd", __func__, n); return -1; } |