Date: Sun, 21 Jan 2007 22:36:35 GMT From: Todd Miller <millert@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 113286 for review Message-ID: <200701212236.l0LMaZLw064234@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701212236.l0LMaZLw064234>