From owner-p4-projects@FreeBSD.ORG Wed Jul 23 18:35:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4307F106566C; Wed, 23 Jul 2008 18:35:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD2D3106568F for ; Wed, 23 Jul 2008 18:35:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADD178FC29 for ; Wed, 23 Jul 2008 18:35:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6NIZb88061179 for ; Wed, 23 Jul 2008 18:35:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6NIZbUO061177 for perforce@freebsd.org; Wed, 23 Jul 2008 18:35:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Jul 2008 18:35:37 GMT Message-Id: <200807231835.m6NIZbUO061177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 145743 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jul 2008 18:35:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=145743 Change 145743 by rwatson@rwatson_cinnamon on 2008/07/23 18:35:35 Minor white space/style/etc tweaks. Obtained from: Apple Inc. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#67 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#67 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#66 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#67 $ */ #include @@ -179,7 +179,7 @@ /* * Darwin defines the size for the file mode as 2 bytes; BSM defines - '8 4 so pad with 0. + * 4 so pad with 0. */ ADD_U_INT16(dptr, pad0_16); ADD_U_INT16(dptr, vni->vn_mode); @@ -296,7 +296,7 @@ default: errno = EINVAL; - return (NULL); + return (NULL); } totdata = datasize * unit_count; @@ -343,7 +343,7 @@ au_to_groups(int *groups) { - return (au_to_newgroups(AUDIT_MAX_GROUPS, (gid_t*)groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, (gid_t *)groups)); } /* @@ -394,7 +394,7 @@ /* * token ID 1 byte * address type/length 4 bytes - * Address 16 bytes + * address 16 bytes */ token_t * au_to_in_addr_ex(struct in6_addr *internet_addr) @@ -949,14 +949,13 @@ * * XXXRW: Should a name space conversion be taking place on the value * of sin_family? - */ + */ family = so->sin_family; ADD_U_INT16(dptr, family); ADD_MEM(dptr, &so->sin_port, sizeof(uint16_t)); ADD_MEM(dptr, &so->sin_addr.s_addr, sizeof(uint32_t)); return (t); - } token_t * @@ -973,8 +972,8 @@ ADD_U_CHAR(dptr, AUT_SOCKINET128); /* * In Darwin, sin6_family is one octet, but BSM defines the token - * to store two. So we copy in a 0 first. - */ + * to store two. So we copy in a 0 first. + */ ADD_U_CHAR(dptr, 0); ADD_U_CHAR(dptr, so->sin6_family); @@ -982,7 +981,6 @@ ADD_MEM(dptr, &so->sin6_addr, 4 * sizeof(uint32_t)); return (t); - } token_t *