From 7d9c38f37ae608265c3f7fa2f87795419afe6069 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 6 Jun 2002 21:40:51 +0000 Subject: - markus@cvs.openbsd.org 2002/06/04 23:05:49 [cipher.c monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c] __FUNCTION__ -> __func__ NOTE: This includes all portable references also. --- monitor_fdpass.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'monitor_fdpass.c') diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 5401ea466..0d7628fa2 100644 --- a/monitor_fdpass.c +++ b/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 @@ -64,14 +64,14 @@ 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); #else fatal("%s: UsePrivilegeSeparation=yes not supported", - __FUNCTION__); + __func__); #endif } @@ -102,24 +102,24 @@ mm_receive_fd(int socket) #endif 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); #ifdef HAVE_ACCRIGHTS_IN_MSGHDR if (msg.msg_accrightslen != sizeof(fd)) - fatal("%s: no fd", __FUNCTION__); + fatal("%s: no fd", __func__); #else 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)); #endif return fd; #else fatal("%s: UsePrivilegeSeparation=yes not supported", - __FUNCTION__); + __func__); #endif } -- cgit v1.2.3