dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bzip2 code cleanup

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1293 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
justin1014 2002-10-03 06:48:06 +00:00
parent ce90415670
commit aee7274442
6 changed files with 204 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/bzip2/blocksort.c
View file

@ -1,5 +1,6 @@
#include "../exehead/config.h"
#if (defined(EXEHEAD) && defined(NSIS_COMPRESS_USE_BZIP2)) || !defined(EXEHEAD)
#include "bzlib.h"
#if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
/*-------------------------------------------------------------*/
/*--- Block sorting machinery ---*/
/*--- blocksort.c ---*/
@ -66,18 +67,13 @@
file implements the algorithm called cache in the paper.
--*/
#include "bzlib.h"
/*---------------------------------------------*/
/*--- Fallback O(N log(N)^2) sorting ---*/
/*--- algorithm, for repetitive blocks ---*/
/*---------------------------------------------*/
/*---------------------------------------------*/
static
__inline__
void fallbackSimpleSort ( UInt32* fmap,
static void fallbackSimpleSort ( UInt32* fmap,
UInt32* eclass,
Int32 lo,
Int32 hi )
@ -379,9 +375,7 @@ void fallbackSort ( UInt32* fmap,
/*---------------------------------------------*/
/*---------------------------------------------*/
static
__inline__
Bool mainGtU ( UInt32 i1,
static Bool mainGtU ( UInt32 i1,
UInt32 i2,
UChar* block,
UInt16* quadrant,
@ -616,7 +610,6 @@ void mainSimpleSort ( UInt32* ptr,
}
static
__inline__
UChar mmed3 ( UChar a, UChar b, UChar c )
{
UChar t;