Author: glebius
Date: Wed Jan 18 17:21:28 2017
New Revision: 312388
URL: https://svnweb.freebsd.org/changeset/base/312388
Log:
Format and sort MSG_* flags, to prevent misedits in future. There is no
functional change.
Modified:
head/sys/sys/socket.h
Modified: head/sys/sys/socket.h
==============================================================================
--- head/sys/sys/socket.h Wed Jan 18 17:09:22 2017 (r312387)
+++ head/sys/sys/socket.h Wed Jan 18 17:21:28 2017 (r312388)
@@ -425,28 +425,36 @@ struct msghdr {
int msg_flags; /* flags on received message */
};
-#define MSG_OOB 0x1 /* process out-of-band data */
-#define MSG_PEEK 0x2 /* peek at incoming message */
-#define MSG_DONTROUTE 0x4 /* send without using routing
tables */
-#define MSG_EOR 0x8 /* data completes record */
-#define MSG_TRUNC 0x10 /* data discarded before
delivery */
-#define MSG_CTRUNC 0x20 /* control data lost before
delivery */
-#define MSG_WAITALL 0x40 /* wait for full request or
error */
+#define MSG_OOB 0x00000001 /* process out-of-band data */
+#define MSG_PEEK 0x00000002 /* peek at incoming message */
+#define MSG_DONTROUTE 0x00000004 /* send without using routing
tables */
+#define MSG_EOR 0x00000008 /* data completes record */
+#define MSG_TRUNC 0x00000010 /* data discarded before
delivery */
+#define MSG_CTRUNC 0x00000020 /* control data lost before
delivery */
+#define MSG_WAITALL 0x00000040 /* wait for full request or
error */
+#if __BSD_VISIBLE
+#define MSG_DONTWAIT 0x00000080 /* this message should be
nonblocking */
+#define MSG_EOF 0x00000100 /* data completes connection */
+/* 0x00000200 unused */
+/* 0x00000400 unused */
+/* 0x00000800 unused */
+/* 0x00001000 unused */
+#define MSG_NOTIFICATION 0x00002000 /* SCTP notification */
+#define MSG_NBIO 0x00004000 /* FIONBIO mode, used by fifofs
*/
+#define MSG_COMPAT 0x00008000 /* used in sendit() */
+#endif
+#ifdef _KERNEL
+#define MSG_SOCALLBCK 0x00010000 /* for use by socket callbacks
- soreceive (TCP) */
+#endif
#if __POSIX_VISIBLE >= 200809
-#define MSG_NOSIGNAL 0x20000 /* do not generate SIGPIPE on
EOF */
+#define MSG_NOSIGNAL 0x00020000 /* do not generate SIGPIPE on
EOF */
#endif
#if __BSD_VISIBLE
-#define MSG_DONTWAIT 0x80 /* this message should be
nonblocking */
-#define MSG_EOF 0x100 /* data completes connection */
-#define MSG_NOTIFICATION 0x2000 /* SCTP notification */
-#define MSG_NBIO 0x4000 /* FIONBIO mode, used by fifofs
*/
-#define MSG_COMPAT 0x8000 /* used in sendit() */
-#define MSG_CMSG_CLOEXEC 0x40000 /* make received fds
close-on-exec */
-#define MSG_WAITFORONE 0x80000 /* for recvmmsg() */
+#define MSG_CMSG_CLOEXEC 0x00040000 /* make received fds
close-on-exec */
+#define MSG_WAITFORONE 0x00080000 /* for recvmmsg() */
#endif
#ifdef _KERNEL
-#define MSG_SOCALLBCK 0x10000 /* for use by socket callbacks
- soreceive (TCP) */
-#define MSG_MORETOCOME 0x100000 /* additional data pending */
+#define MSG_MORETOCOME 0x00100000 /* additional data pending */
#endif
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
