From owner-svn-soc-all@FreeBSD.ORG  Tue Jul  9 07:41:25 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 70C333CC
 for <svn-soc-all@FreeBSD.org>; Tue,  9 Jul 2013 07:41:25 +0000 (UTC)
 (envelope-from dpl@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 by mx1.freebsd.org (Postfix) with ESMTP id 62A521E06
 for <svn-soc-all@FreeBSD.org>; Tue,  9 Jul 2013 07:41:25 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r697fPbl080225
 for <svn-soc-all@FreeBSD.org>; Tue, 9 Jul 2013 07:41:25 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r697fPos080222
 for svn-soc-all@FreeBSD.org; Tue, 9 Jul 2013 07:41:25 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Tue, 9 Jul 2013 07:41:25 GMT
Message-Id: <201307090741.r697fPos080222@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r254456 - soc2013/dpl/head/contrib/xz/src/xz
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jul 2013 07:41:25 -0000

Author: dpl
Date: Tue Jul  9 07:41:25 2013
New Revision: 254456
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254456

Log:
  Adhere to local preprocessor style.
  

Modified:
  soc2013/dpl/head/contrib/xz/src/xz/coder.c
  soc2013/dpl/head/contrib/xz/src/xz/file_io.h

Modified: soc2013/dpl/head/contrib/xz/src/xz/coder.c
==============================================================================
--- soc2013/dpl/head/contrib/xz/src/xz/coder.c	Tue Jul  9 07:32:47 2013	(r254455)
+++ soc2013/dpl/head/contrib/xz/src/xz/coder.c	Tue Jul  9 07:41:25 2013	(r254456)
@@ -641,9 +641,9 @@
 			// Don't open the destination file when --test
 			// is used.
 			if (opt_mode == MODE_TEST || !io_open_dest(pair)) {
-#			ifdef CAPSICUM
+#		if defined(CAPSICUM) //
 				limitfd(pair);
-#			endif
+#		endif
 				// Initialize the progress indicator.
 				const uint64_t in_size
 						= pair->src_st.st_size <= 0

Modified: soc2013/dpl/head/contrib/xz/src/xz/file_io.h
==============================================================================
--- soc2013/dpl/head/contrib/xz/src/xz/file_io.h	Tue Jul  9 07:32:47 2013	(r254455)
+++ soc2013/dpl/head/contrib/xz/src/xz/file_io.h	Tue Jul  9 07:41:25 2013	(r254456)
@@ -129,9 +129,12 @@
 extern bool io_write(file_pair *pair, const io_buf *buf, size_t size);
 
 
-#ifdef CAPSICUM
+#if defined(CAPSICUM)
 /// \brief      Limits fd using FreeBSD's Capsicum framework.
 ///
 /// \param      fd    File descriptor to limit.
-extern void limitfd(struct file_pair* pair);
-#endif
\ No newline at end of file
+extern void limitfd(file_pair *pair);
+
+/// \brief      Enters Capability mode, and limit stdin, stdout & stderr.
+extern void cap_init(void);
+#endif