From owner-svn-soc-all@FreeBSD.ORG Wed Jul 10 15:17:22 2013 Return-Path: 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 4ABA2BF4 for ; Wed, 10 Jul 2013 15:17:22 +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 3CD5E165D for ; Wed, 10 Jul 2013 15:17:22 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6AFHMtM086315 for ; Wed, 10 Jul 2013 15:17:22 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6AFHM8E086310 for svn-soc-all@FreeBSD.org; Wed, 10 Jul 2013 15:17:22 GMT (envelope-from dpl@FreeBSD.org) Date: Wed, 10 Jul 2013 15:17:22 GMT Message-Id: <201307101517.r6AFHM8E086310@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: r254565 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jul 2013 15:17:22 -0000 Author: dpl Date: Wed Jul 10 15:17:22 2013 New Revision: 254565 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254565 Log: Adhere to preprocessor style, and save to make some code changes. Modified: soc2013/dpl/head/contrib/xz/src/xz/coder.c Modified: soc2013/dpl/head/contrib/xz/src/xz/coder.c ============================================================================== --- soc2013/dpl/head/contrib/xz/src/xz/coder.c Wed Jul 10 15:14:23 2013 (r254564) +++ soc2013/dpl/head/contrib/xz/src/xz/coder.c Wed Jul 10 15:17:22 2013 (r254565) @@ -12,7 +12,6 @@ #include "private.h" - /// Return value type for coder_init(). enum coder_init_ret { CODER_INIT_NORMAL, @@ -641,9 +640,9 @@ // Don't open the destination file when --test // is used. if (opt_mode == MODE_TEST || !io_open_dest(pair)) { -# if defined(CAPSICUM) // +#if defined(CAPSICUM) limitfd(pair); -# endif +#endif // Initialize the progress indicator. const uint64_t in_size = pair->src_st.st_size <= 0 @@ -666,4 +665,6 @@ io_close(pair, success); return; + + }