summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/monitor_fdpass.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2002-06-04 23:05:49 +0000
committermarkus <markus@openbsd.org>2002-06-04 23:05:49 +0000
commita757ebd48f38726c3dd54f61ece1dcdf96d7e65b (patch)
tree6d4b1560a0c45e4f48cda7f34580fdb3cec9fcff /usr.bin/ssh/monitor_fdpass.c
parentsetup user systrace dir only if user policies are used. (diff)
downloadwireguard-openbsd-a757ebd48f38726c3dd54f61ece1dcdf96d7e65b.tar.xz
wireguard-openbsd-a757ebd48f38726c3dd54f61ece1dcdf96d7e65b.zip
__FUNCTION__ -> __func__
Diffstat (limited to 'usr.bin/ssh/monitor_fdpass.c')
-rw-r--r--usr.bin/ssh/monitor_fdpass.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/monitor_fdpass.c b/usr.bin/ssh/monitor_fdpass.c
index 0628b5a8e64..9696c869e79 100644
--- a/usr.bin/ssh/monitor_fdpass.c
+++ b/usr.bin/ssh/monitor_fdpass.c
@@ -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.3 2002/06/04 23:05:49 markus Exp $");
#include <sys/uio.h>
@@ -56,11 +56,11 @@ mm_send_fd(int socket, int fd)
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);
+ __func__, n);
}
int
@@ -82,14 +82,14 @@ mm_receive_fd(int socket)
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);
+ __func__, 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;