From owner-p4-projects@FreeBSD.ORG Thu Aug 28 19:40:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54BCB16A4C1; Thu, 28 Aug 2003 19:40:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 166C416A4BF for ; Thu, 28 Aug 2003 19:40:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DDB843FE5 for ; Thu, 28 Aug 2003 19:40:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7T2eC0U072154 for ; Thu, 28 Aug 2003 19:40:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7T2eB36072151 for perforce@freebsd.org; Thu, 28 Aug 2003 19:40:11 -0700 (PDT) Date: Thu, 28 Aug 2003 19:40:11 -0700 (PDT) Message-Id: <200308290240.h7T2eB36072151@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 Subject: PERFORCE change 37140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Aug 2003 02:40:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=37140 Change 37140 by rwatson@rwatson_tislabs on 2003/08/28 19:39:16 Whitespace cleanup from ipc merge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#407 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#407 (text+ko) ==== @@ -211,7 +211,7 @@ static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, - nmacipqs, nmacpipes, nmacprocs, nmacipcmsgs, nmacipcmsqs, + nmacipqs, nmacpipes, nmacprocs, nmacipcmsgs, nmacipcmsqs, nmacipcsemas, nmacipcshms; #define MAC_DEBUG_COUNTER_INC(x) atomic_add_int(x, 1); @@ -871,7 +871,7 @@ mac_init_ifnet_label(&ifp->if_label); } -void +void mac_init_ipc_msgmsg(struct msg *msgptr) { @@ -880,7 +880,7 @@ MAC_DEBUG_COUNTER_INC(&nmacipcmsgs); } -void +void mac_init_ipc_msgqueue(struct msqid_kernel *msqkptr) { @@ -889,7 +889,7 @@ MAC_DEBUG_COUNTER_INC(&nmacipcmsqs); } -void +void mac_init_ipc_sema(struct semid_kernel *semakptr) { @@ -898,7 +898,7 @@ MAC_DEBUG_COUNTER_INC(&nmacipcsemas); } -void +void mac_init_ipc_shm(struct shmid_kernel *shmsegptr) { @@ -2341,28 +2341,28 @@ MAC_PERFORM(create_bpfdesc, cred, bpf_d, &bpf_d->bd_label); } -void +void mac_create_ipc_msgmsg(struct ucred *cred, struct msg *msgptr) { MAC_PERFORM(create_ipc_msgmsg, cred, msgptr, &msgptr->label); } -void +void mac_create_ipc_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr) { MAC_PERFORM(create_ipc_msgqueue, cred, msqkptr, &msqkptr->label); } -void +void mac_create_ipc_sema(struct ucred *cred, struct semid_kernel *semakptr) { MAC_PERFORM(create_ipc_sema, cred, semakptr, &semakptr->label); } -void +void mac_create_ipc_shm(struct ucred *cred, struct shmid_kernel *shmsegptr) { @@ -2627,21 +2627,21 @@ MAC_PERFORM(cleanup_ipc_msgmsg, &msgptr->label); } -void +void mac_cleanup_ipc_msgqueue(struct msqid_kernel *msqkptr) { MAC_PERFORM(cleanup_ipc_msgqueue, &msqkptr->label); } -void +void mac_cleanup_ipc_sema(struct semid_kernel *semakptr) { MAC_PERFORM(cleanup_ipc_sema, &semakptr->label); } -void +void mac_cleanup_ipc_shm(struct shmid_kernel *shmsegptr) { @@ -2705,7 +2705,7 @@ } int -mac_check_ipc_msgmsq(struct ucred *cred, struct msg *msgptr, +mac_check_ipc_msgmsq(struct ucred *cred, struct msg *msgptr, struct msqid_kernel *msqkptr) { int error; @@ -2848,7 +2848,7 @@ return(error); } -int +int mac_check_ipc_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, int shmflg) { @@ -2878,7 +2878,7 @@ return(error); } -int +int mac_check_ipc_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr) { int error; @@ -2892,7 +2892,7 @@ return(error); } -int +int mac_check_ipc_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, int shmflg) {