From owner-p4-projects@FreeBSD.ORG Wed Jul 23 08:03:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 406811065674; Wed, 23 Jul 2008 08:03:48 +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 03A371065672 for ; Wed, 23 Jul 2008 08:03:48 +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 011738FC17 for ; Wed, 23 Jul 2008 08:03:48 +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 m6N83l8i041831 for ; Wed, 23 Jul 2008 08:03:47 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 m6N83ldr041829 for perforce@freebsd.org; Wed, 23 Jul 2008 08:03:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Jul 2008 08:03:47 GMT Message-Id: <200807230803.m6N83ldr041829@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 145680 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 08:03:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=145680 Change 145680 by rwatson@rwatson_cinnamon on 2008/07/23 08:03:30 Minor style tweaks; copyright update. Obtained from: Apple Inc. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#66 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#66 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 Apple Computer, Inc. + * Copyright (c) 2004-2008 Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * @@ -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#65 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#66 $ */ #include @@ -119,7 +119,6 @@ ADD_STRING(dptr, text, textlen); return (t); - } token_t * @@ -144,7 +143,6 @@ ADD_STRING(dptr, text, textlen); return (t); - } token_t * @@ -180,8 +178,8 @@ ADD_U_CHAR(dptr, AUT_ATTR32); /* - * Darwin defines the size for the file mode - * as 2 bytes; BSM defines 4 so pad with 0 + * Darwin defines the size for the file mode as 2 bytes; BSM defines + '8 4 so pad with 0. */ ADD_U_INT16(dptr, pad0_16); ADD_U_INT16(dptr, vni->vn_mode); @@ -191,7 +189,7 @@ ADD_U_INT32(dptr, vni->vn_fsid); /* - * Some systems use 32-bit file ID's, other's use 64-bit file IDs. + * Some systems use 32-bit file ID's, others use 64-bit file IDs. * Attempt to handle both, and let the compiler sort it out. If we * could pick this out at compile-time, it would be better, so as to * avoid the else case below. @@ -225,8 +223,8 @@ ADD_U_CHAR(dptr, AUT_ATTR64); /* - * Darwin defines the size for the file mode - * as 2 bytes; BSM defines 4 so pad with 0 + * Darwin defines the size for the file mode as 2 bytes; BSM defines + * 4 so pad with 0. */ ADD_U_INT16(dptr, pad0_16); ADD_U_INT16(dptr, vni->vn_mode); @@ -484,8 +482,8 @@ ADD_U_CHAR(dptr, AUT_IPC_PERM); /* - * Darwin defines the sizes for ipc_perm members - * as 2 bytes; BSM defines 4 so pad with 0 + * Darwin defines the sizes for ipc_perm members as 2 bytes; BSM + * defines 4 so pad with 0. */ ADD_U_INT16(dptr, pad0); ADD_U_INT16(dptr, perm->uid); @@ -1170,8 +1168,8 @@ #if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS) /* - * Collects audit information for the current process - * and creates a subject token from it + * Collects audit information for the current process and creates a subject + * token from it. */ token_t * au_to_me(void)