From owner-p4-projects@FreeBSD.ORG  Sun Jul 18 14:53:22 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 901A7106567B; Sun, 18 Jul 2010 14:53:22 +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 49159106564A
	for <perforce@freebsd.org>; Sun, 18 Jul 2010 14:53:22 +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 35F218FC21
	for <perforce@freebsd.org>; Sun, 18 Jul 2010 14:53:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6IErMwD062726
	for <perforce@freebsd.org>; Sun, 18 Jul 2010 14:53:22 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6IErMcj062724
	for perforce@freebsd.org; Sun, 18 Jul 2010 14:53:22 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 18 Jul 2010 14:53:22 GMT
Message-Id: <201007181453.o6IErMcj062724@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 <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181138 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jul 2010 14:53:22 -0000

http://p4web.freebsd.org/@@181138?ac=10

Change 181138 by rwatson@rwatson_vimage_client on 2010/07/18 14:52:48

	Minor style(9) tweaks to kern_capwrap().

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#31 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#31 (text+ko) ====

@@ -50,7 +50,7 @@
 #include "opt_capabilities.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#30 $");
+__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#31 $");
 
 #include <sys/param.h>
 #include <sys/capability.h>
@@ -314,8 +314,9 @@
 /*
  * Create a capability to wrap around an existing file.
  */
-int kern_capwrap(struct thread *td, struct file *fp, cap_rights_t rights,
-                 struct file **cap, int *capfd)
+int
+kern_capwrap(struct thread *td, struct file *fp, cap_rights_t rights,
+    struct file **cap, int *capfd)
 {
 	struct capability *c, *c_old;
 	struct file *fp_object;
@@ -326,7 +327,6 @@
 
 	c = uma_zalloc(capability_zone, M_WAITOK | M_ZERO);
 
-
 	/*
 	 * If a new capability is being derived from an existing capability,
 	 * then the new capability rights must be a subset of the existing
@@ -378,7 +378,6 @@
 	 * Release our private reference (the proc filedesc still has one).
 	 */
 	fdrop(*cap, td);
-
 	return (0);
 
 fail: