From owner-p4-projects@FreeBSD.ORG Sat Jun 20 15:41:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C0C81065673; Sat, 20 Jun 2009 15:41:18 +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 5C3861065670 for ; Sat, 20 Jun 2009 15:41:18 +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 487598FC1A for ; Sat, 20 Jun 2009 15:41:18 +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.3/8.14.3) with ESMTP id n5KFfIMA022459 for ; Sat, 20 Jun 2009 15:41:18 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 n5KFfISm022457 for perforce@freebsd.org; Sat, 20 Jun 2009 15:41:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Jun 2009 15:41:18 GMT Message-Id: <200906201541.n5KFfISm022457@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 164761 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: Sat, 20 Jun 2009 15:41:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=164761 Change 164761 by rwatson@rwatson_freebsd_capabilities on 2009/06/20 15:40:21 FreeBSD has closefrom(2), so no need for a local prototype. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#21 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#20 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#21 $ */ #include @@ -78,8 +78,6 @@ NULL, }; -int closefrom(int lowfd); - int lch_autosandbox_isenabled(__unused const char *servicename) { @@ -141,9 +139,7 @@ * Close the descriptors that we moved, as well as any others that * were left open by the caller. */ - if (closefrom(fd_count) < 0) - return (-1); - + closefrom(fd_count); return (0); }