diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-03-01 03:14:23 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-03-01 03:14:23 +0000 |
| commit | b0b5f961bd295aee20ca2584b96ebf00e9cb92f3 (patch) | |
| tree | 6b16845a701c80c2675bb9aed085227f806e915d /sys/kern/uipc_socket.c | |
| parent | 9fe9a307306d35d1219be5eb3a88475032b080d0 (diff) | |
| download | FreeBSD-src-b0b5f961bd295aee20ca2584b96ebf00e9cb92f3.zip FreeBSD-src-b0b5f961bd295aee20ca2584b96ebf00e9cb92f3.tar.gz | |
Rename dup_sockaddr() to sodupsockaddr() for consistency with other
functions in kern_socket.c.
Rename the "canwait" field to "mflags" and pass M_WAITOK and M_NOWAIT
in from the caller context rather than "1" or "0".
Correct mflags pass into mac_init_socket() from previous commit to not
include M_ZERO.
Submitted by: sam
Diffstat (limited to 'sys/kern/uipc_socket.c')
| -rw-r--r-- | sys/kern/uipc_socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 70ef43a..8bd487d 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -138,7 +138,7 @@ soalloc(int mflags) so = uma_zalloc(socket_zone, mflags | M_ZERO); if (so) { #ifdef MAC - error = mac_init_socket(so, mflags | M_ZERO); + error = mac_init_socket(so, mflags); if (error != 0) { uma_zfree(socket_zone, so); so = NULL; @@ -908,8 +908,8 @@ dontblock: ("m->m_type == %d", m->m_type)); orig_resid = 0; if (psa) - *psa = dup_sockaddr(mtod(m, struct sockaddr *), - mp0 == 0); + *psa = sodupsockaddr(mtod(m, struct sockaddr *), + mp0 == NULL ? M_WAITOK : M_NOWAIT); if (flags & MSG_PEEK) { m = m->m_next; } else { |
