socsvn commit: r254456 - soc2013/dpl/head/contrib/xz/src/xz

[dpl at FreeBSD.org]

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