Date: Sat, 19 Jan 2013 08:10:06 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r245668 - user/ae/inet6/sys/netinet6 Message-ID: <201301190810.r0J8A6eI045886@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Sat Jan 19 08:10:05 2013 New Revision: 245668 URL: http://svnweb.freebsd.org/changeset/base/245668 Log: Remove sa6_recoverscope calls. Modified: user/ae/inet6/sys/netinet6/in6_pcb.c Modified: user/ae/inet6/sys/netinet6/in6_pcb.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6_pcb.c Sat Jan 19 07:07:05 2013 (r245667) +++ user/ae/inet6/sys/netinet6/in6_pcb.c Sat Jan 19 08:10:05 2013 (r245668) @@ -449,15 +449,13 @@ in6_sockaddr(in_port_t port, struct in6_ { struct sockaddr_in6 *sin6; - sin6 = malloc(sizeof *sin6, M_SONAME, M_WAITOK); - bzero(sin6, sizeof *sin6); + sin6 = malloc(sizeof(*sin6), M_SONAME, M_WAITOK | M_ZERO); sin6->sin6_family = AF_INET6; sin6->sin6_len = sizeof(*sin6); sin6->sin6_port = port; sin6->sin6_addr = *addr_p; - (void)sa6_recoverscope(sin6); /* XXX: should catch errors */ - return (struct sockaddr *)sin6; + return ((struct sockaddr *)sin6); } struct sockaddr * @@ -1201,7 +1199,5 @@ init_sin6(struct sockaddr_in6 *sin6, str sin6->sin6_family = AF_INET6; sin6->sin6_addr = ip->ip6_src; - (void)sa6_recoverscope(sin6); /* XXX: should catch errors... */ - return; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301190810.r0J8A6eI045886>