From owner-p4-projects@FreeBSD.ORG Sat Jan 30 12:58:59 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B3921065679; Sat, 30 Jan 2010 12:58:59 +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 5FB671065672 for ; Sat, 30 Jan 2010 12:58:59 +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 4BB608FC1B for ; Sat, 30 Jan 2010 12:58:59 +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 o0UCwx0T052835 for ; Sat, 30 Jan 2010 12:58:59 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 o0UCwx0Q052833 for perforce@freebsd.org; Sat, 30 Jan 2010 12:58:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 12:58:59 GMT Message-Id: <201001301258.o0UCwx0Q052833@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 Precedence: bulk Cc: Subject: PERFORCE change 173948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 12:58:59 -0000 http://p4web.freebsd.org/chv.cgi?CH=173948 Change 173948 by rwatson@rwatson_vimage_client on 2010/01/30 12:58:42 Trim excess vertical whitespace. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#8 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#6 (text+ko) ==== @@ -94,8 +94,6 @@ exit( main(argc, argv, env) ); } - - /* The Capsicum entry function. */ void _capstart(char **ap, void (*cleanup)(void)) ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#8 (text+ko) ==== @@ -52,8 +52,6 @@ __FreeBSD_version }; - - extern int cap_main(int, char **, char **) __attribute__((weak)); int cap_main(__unused int argc, __unused char **argv, __unused char **env) { @@ -61,6 +59,5 @@ "ERROR: attempting to run a regular binary in capability mode!\n\nIf you want to run a binary in a sandbox, you must provide a cap_main() function, which takes the same arguments as main().\n"; write(2, warning, sizeof(warning)); - return (-1); }