Various manual fixes.

[mLib] / fdpass.c

diff --git a/fdpass.c b/fdpass.c
index 95685e7b35f12bcf75678debef2c74bcec47bec3..0a11c2cbea87b7796b7069339a2150061625fd98 100644 (file)
--- a/fdpass.c
+++ b/fdpass.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: fdpass.c,v 1.1 2003/11/29 11:58:49 mdw Exp $
+ * $Id$
  *
  * File descriptor passing
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: fdpass.c,v $
- * Revision 1.1  2003/11/29 11:58:49  mdw
- * File descriptor passing.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <errno.h>
@@ -82,11 +74,11 @@ ssize_t fdpass_send(int sock, int fd, const void *p, size_t sz)
   msg.msg_namelen = 0;
   msg.msg_iov = &iov;
   msg.msg_iovlen = 1;
-  msg.msg_flags = 0;
 #ifdef HAVE_MSG_ACCRIGHTS
   msg.msg_accrights = &fd;
   msg.msg_accrightslen = sizeof(fd);
 #else  
+  msg.msg_flags = 0;
   msg.msg_control = buf;
   msg.msg_controllen = sizeof(buf);
   cmsg = CMSG_FIRSTHDR(&msg);
@@ -130,11 +122,11 @@ ssize_t fdpass_recv(int sock, int *fd, void *p, size_t sz)
   msg.msg_namelen = 0;
   msg.msg_iov = &iov;
   msg.msg_iovlen = 1;
-  msg.msg_flags = 0;
 #ifdef HAVE_MSG_ACCRIGHTS
   msg.msg_accrights = fd;
   msg.msg_accrightslen = sizeof(*fd);
 #else
+  msg.msg_flags = 0;
   msg.msg_control = buf;
   msg.msg_controllen = sizeof(buf);
 #endif