From owner-svn-src-head@FreeBSD.ORG Thu Oct 6 21:40:08 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B56D9106564A; Thu, 6 Oct 2011 21:40:08 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9B4568FC0C; Thu, 6 Oct 2011 21:40:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p96Le8Pp078903; Thu, 6 Oct 2011 21:40:08 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96Le80C078901; Thu, 6 Oct 2011 21:40:08 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201110062140.p96Le80C078901@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 6 Oct 2011 21:40:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226078 - head/sys/compat/linux X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 21:40:08 -0000 Author: jkim Date: Thu Oct 6 21:40:08 2011 New Revision: 226078 URL: http://svn.freebsd.org/changeset/base/226078 Log: Remove a now-defunct variable. Modified: head/sys/compat/linux/linux_socket.c Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Thu Oct 6 21:31:21 2011 (r226077) +++ head/sys/compat/linux/linux_socket.c Thu Oct 6 21:40:08 2011 (r226078) @@ -81,7 +81,7 @@ static int linux_to_bsd_domain(int); * family and convert to sockaddr. */ static int -linux_getsockaddr(struct sockaddr **sap, const struct osockaddr *osa, int osalen) +linux_getsockaddr(struct sockaddr **sap, const struct osockaddr *osa, int salen) { struct sockaddr *sa; struct osockaddr *kosa; @@ -90,12 +90,11 @@ linux_getsockaddr(struct sockaddr **sap, int oldv6size; #endif char *name; - int alloclen, bdom, error, hdrlen, namelen; + int bdom, error, hdrlen, namelen; - if (osalen < 2 || osalen > UCHAR_MAX || !osa) + if (salen < 2 || salen > UCHAR_MAX || !osa) return (EINVAL); - alloclen = osalen; #ifdef INET6 oldv6size = 0; /* @@ -103,15 +102,15 @@ linux_getsockaddr(struct sockaddr **sap, * if it's a v4-mapped address, so reserve the proper space * for it. */ - if (alloclen == sizeof(struct sockaddr_in6) - sizeof(uint32_t)) { - alloclen = sizeof(struct sockaddr_in6); + if (salen == sizeof(struct sockaddr_in6) - sizeof(uint32_t)) { + salen += sizeof(uint32_t); oldv6size = 1; } #endif - kosa = malloc(alloclen, M_SONAME, M_WAITOK); + kosa = malloc(salen, M_SONAME, M_WAITOK); - if ((error = copyin(osa, kosa, osalen))) + if ((error = copyin(osa, kosa, salen))) goto out; bdom = linux_to_bsd_domain(kosa->sa_family); @@ -145,18 +144,18 @@ linux_getsockaddr(struct sockaddr **sap, goto out; } } else - alloclen -= sizeof(uint32_t); + salen -= sizeof(uint32_t); } #endif if (bdom == AF_INET) { - alloclen = sizeof(struct sockaddr_in); - if (osalen < alloclen) { + if (salen < sizeof(struct sockaddr_in)) { error = EINVAL; goto out; } + salen = sizeof(struct sockaddr_in); } - if (bdom == AF_LOCAL && osalen > sizeof(struct sockaddr_un)) { + if (bdom == AF_LOCAL && salen > sizeof(struct sockaddr_un)) { hdrlen = offsetof(struct sockaddr_un, sun_path); name = ((struct sockaddr_un *)kosa)->sun_path; if (*name == '\0') { @@ -164,19 +163,19 @@ linux_getsockaddr(struct sockaddr **sap, * Linux abstract namespace starts with a NULL byte. * XXX We do not support abstract namespace yet. */ - namelen = strnlen(name + 1, osalen - hdrlen - 1) + 1; + namelen = strnlen(name + 1, salen - hdrlen - 1) + 1; } else - namelen = strnlen(name, osalen - hdrlen); + namelen = strnlen(name, salen - hdrlen); if (hdrlen + namelen > sizeof(struct sockaddr_un)) { error = ENAMETOOLONG; goto out; } - alloclen = sizeof(struct sockaddr_un); + salen = sizeof(struct sockaddr_un); } sa = (struct sockaddr *)kosa; sa->sa_family = bdom; - sa->sa_len = alloclen; + sa->sa_len = salen; *sap = sa; return (0);