diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-09-20 21:35:10 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-09-20 21:35:10 +0000 |
| commit | 5200ff9e7b37781296e14544fcb2803bdc076d20 (patch) | |
| tree | 4ab286b561f7526874db64a9abe1997c4a3604b2 /sbin/isakmpd | |
| parent | 7c9a035458a76189d9d7af555bf3e28cba0cc502 (diff) | |
Remove __func__
ok ho deraadt
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/monitor_fdpass.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sbin/isakmpd/monitor_fdpass.c b/sbin/isakmpd/monitor_fdpass.c index 8f3d1a44320..46a7d7106ed 100644 --- a/sbin/isakmpd/monitor_fdpass.c +++ b/sbin/isakmpd/monitor_fdpass.c @@ -24,7 +24,9 @@ */ #include <sys/types.h> +#include <sys/socket.h> #include <sys/uio.h> + #include <errno.h> #include <string.h> @@ -55,12 +57,12 @@ mm_send_fd(int socket, int fd) msg.msg_iovlen = 1; if ((n = sendmsg(socket, &msg, 0)) == -1) { - log_error("%s: sendmsg(%d)", __func__, fd); + log_error("mm_send_fd: sendmsg(%d)", fd); return -1; } if (n != 1) { - log_error("%s: sendmsg: expected sent 1 got %ld", - __func__, (long)n); + log_error("mm_send_fd: sendmsg: expected sent 1 got %ld", + (long)n); return -1; } return 0; @@ -85,21 +87,21 @@ mm_receive_fd(int socket) msg.msg_controllen = sizeof tmp; if ((n = recvmsg(socket, &msg, 0)) == -1) { - log_error("%s: recvmsg", __func__); + log_error("mm_receive_fd: recvmsg"); return -1; } if (n != 1) { - log_error("%s: recvmsg: expected received 1 got %ld", __func__, + log_error("mm_receive_fd: recvmsg: expected received 1 got %ld", (long)n); return -1; } cmsg = CMSG_FIRSTHDR(&msg); if (cmsg == NULL) { - log_error("%s: no message header", __func__); + log_error("mm_receive_fd: no message header"); return -1; } if (cmsg->cmsg_type != SCM_RIGHTS) { - log_error("%s: expected type %d got %d", __func__, SCM_RIGHTS, + log_error("mm_receive_fd: expected type %d got %d", SCM_RIGHTS, cmsg->cmsg_type); return -1; } |