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_socket2.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_socket2.c')
-rw-r--r-- | sys/kern/uipc_socket2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 16ee01e..ca2752e 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -1061,14 +1061,11 @@ pru_sosetlabel_null(struct socket *so) * Make a copy of a sockaddr in a malloced buffer of type M_SONAME. */ struct sockaddr * -dup_sockaddr(sa, canwait) - struct sockaddr *sa; - int canwait; +sodupsockaddr(const struct sockaddr *sa, int mflags) { struct sockaddr *sa2; - MALLOC(sa2, struct sockaddr *, sa->sa_len, M_SONAME, - canwait ? M_WAITOK : M_NOWAIT); + sa2 = malloc(sa->sa_len, M_SONAME, mflags); if (sa2) bcopy(sa, sa2, sa->sa_len); return sa2; |