Date: Sat, 6 Jul 2013 17:40:46 GMT From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r254248 - soc2013/dpl/head/contrib/bzip2 Message-ID: <201307061740.r66HekM6037110@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dpl Date: Sat Jul 6 17:40:46 2013 New Revision: 254248 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254248 Log: Little changes, I get SIGSEGV at line 1234. Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/head/contrib/bzip2/bzip2.c Sat Jul 6 17:34:33 2013 (r254247) +++ soc2013/dpl/head/contrib/bzip2/bzip2.c Sat Jul 6 17:40:46 2013 (r254248) @@ -1177,12 +1177,11 @@ static void compress ( Char *name ) { -#ifndef CAPSICUM - FILE *inStr; - FILE *outStr; -#endif #if CAPSICUM pid_t forkpid; +#elif + FILE *inStr; + FILE *outStr; #endif Int32 n, i; struct MY_STATS statBuf; @@ -1387,13 +1386,13 @@ static void uncompress ( Char *name ) { -#ifndef CAPSICUM - FILE *inStr; - FILE *outStr; -#endif #if CAPSICUM pid_t forkpid; +#elif + FILE *inStr; + FILE *outStr; #endif + Int32 n, i; Bool magicNumberOK; Bool cantGuess; @@ -1616,7 +1615,9 @@ static void testf ( Char *name ) { +# ifndef CAPSICUM FILE *inStr; +# endif Bool allOK; struct MY_STATS statBuf;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307061740.r66HekM6037110>