From b0b5f961bd295aee20ca2584b96ebf00e9cb92f3 Mon Sep 17 00:00:00 2001 From: rwatson Date: Mon, 1 Mar 2004 03:14:23 +0000 Subject: 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 --- sys/kern/uipc_sockbuf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sys/kern/uipc_sockbuf.c') diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 16ee01e..ca2752e 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.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; -- cgit v1.1