From owner-p4-projects@FreeBSD.ORG  Sun Jan 21 22:36:36 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6F2C716A46F; Sun, 21 Jan 2007 22:36:36 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3F01816A412
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:36:36 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 1EE5A13C474
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:36:36 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LMaaQw064237
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:36:36 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMaZLw064234
	for perforce@freebsd.org; Sun, 21 Jan 2007 22:36:35 GMT
	(envelope-from millert@freebsd.org)
Date: Sun, 21 Jan 2007 22:36:35 GMT
Message-Id: <200701212236.l0LMaZLw064234@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113286 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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, 21 Jan 2007 22:36:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=113286

Change 113286 by millert@millert_macbook on 2007/01/21 22:35:36

	Reduce vendor diffs.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_right.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_right.c#4 (text+ko) ====

@@ -1491,7 +1491,6 @@
 	task_t self = current_task();
 	int    rc;
 #endif
-	int    dead;
 	
 	bits = entry->ie_bits;
 
@@ -1637,15 +1636,12 @@
 		port = (ipc_port_t) entry->ie_object;
 		assert(port != IP_NULL);
 
-		dead = ipc_right_check(space, port, name, entry);
+		if (ipc_right_check(space, port, name, entry)) {
+			bits = entry->ie_bits;
+			goto copy_dead;
+		}
 		/* port is locked and active */
 
-		if (dead)
-		  {
-		    bits = entry->ie_bits;
-		    goto copy_dead;
-		  }
-
 #ifdef MAC
 		tasklabel_lock(self);
 		rc = mac_port_check_copy_send(&self->maclabel, &port->ip_label);
@@ -1692,14 +1688,12 @@
 		port = (ipc_port_t) entry->ie_object;
 		assert(port != IP_NULL);
 
-		dead = ipc_right_check(space, port, name, entry);
+		if (ipc_right_check(space, port, name, entry)) {
+			bits = entry->ie_bits;
+			goto move_dead;
+		}
 		/* port is locked and active */
 
-		if (dead) {
-		  bits = entry->ie_bits;
-		  goto move_dead;
-		}
-
 #ifdef MAC
 		tasklabel_lock(self);
 		rc = mac_port_check_move_send(&self->maclabel, &port->ip_label);
@@ -1770,14 +1764,12 @@
 		port = (ipc_port_t) entry->ie_object;
 		assert(port != IP_NULL);
 
-		dead = ipc_right_check(space, port, name, entry);
+		if (ipc_right_check(space, port, name, entry)) {
+			bits = entry->ie_bits;
+			goto move_dead;
+		}
 		/* port is locked and active */
 
-		if (dead) {
-		  bits = entry->ie_bits;
-		  goto move_dead;
-		}
-
 #ifdef MAC
 		tasklabel_lock(self);
 		rc = mac_port_check_move_send_once(&self->maclabel,