From owner-cvs-all@FreeBSD.ORG Thu Jan 6 20:23:57 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AE4016A4CE; Thu, 6 Jan 2005 20:23:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A39443D64; Thu, 6 Jan 2005 20:23:57 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j06KNvuJ042153; Thu, 6 Jan 2005 20:23:57 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j06KNvga042152; Thu, 6 Jan 2005 20:23:57 GMT (envelope-from rwatson) Message-Id: <200501062023.j06KNvga042152@repoman.freebsd.org> From: Robert Watson Date: Thu, 6 Jan 2005 20:23:57 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5 Subject: cvs commit: src/sys/kern uipc_socket.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jan 2005 20:23:57 -0000 rwatson 2005-01-06 20:23:57 UTC FreeBSD src repository Modified files: (Branch: RELENG_5) sys/kern uipc_socket.c Log: Merge uipc_socket.c:1.222 from HEAD to RELENG_5: date: 2004/12/23 00:59:43; author: rwatson; state: Exp; lines: +3 -14 In soalloc(), simplify the mac_init_socket() handling to remove unnecessary use of a global variable and simplify the return case. While here, use ()'s around return values. In sodealloc(), remove a comment about why we bump the gencnt and decrement the socket count separately. It doesn't add substantially to the reading, and clutters the function. MFC after: 2 weeks Revision Changes Path 1.208.2.7 +3 -14 src/sys/kern/uipc_socket.c