ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# CDDL HEADER START
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# The contents of this file are subject to the terms of the
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# Common Development and Distribution License (the "License").
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# You may not use this file except in compliance with the License.
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# See the License for the specific language governing permissions
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# and limitations under the License.
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# When distributing Covered Code, include this CDDL HEADER in each
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# If applicable, add the following below this CDDL HEADER, with the
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# fields enclosed by brackets "[]" replaced with your own identifying
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# information: Portions Copyright [yyyy] [name of copyright owner]
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# CDDL HEADER END
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger# Use is subject to license terms.
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave PlaugerThe source in this directory has been derived from libbzip2 version
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross1.0.6 downloaded from http://www.bzip.org.
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave PlaugerIn an effort to provide ease of syncing with the upstream code, this
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plaugersource hasn't changed much. The usual Solaris coding standards have
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plaugerbeen waived. It does not pass cstyle. But, enough modifications were
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plaugermade so that the code does compile and lint cleanly.
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave PlaugerSome modifications have been made for use in the Solaris kernel:
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger1) compilation errors were corrected
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger2) lint complaints were fixed
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger3) a few utility interfaces were added
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger BZ2_bzCompressInitSize
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger BZ2_bzCompressReset
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger BZ2_bzDecompressReset
ca3e8d88e8c867355e441fbc914c52e7416fc537Dave Plauger BZ2_bzErrorString
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon RossHere is a complete list of changes made by Sun to the original 1.0.6
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross--- bzip2-1.0.6/bzlib.c Fri Sep 10 18:38:23 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+++ ./bzlib.c Wed Dec 29 20:47:11 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -96,11 +96,89 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ * Added for Solaris kernel
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#define BZES \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_OK) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_RUN_OK) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_FLUSH_OK) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_FINISH_OK) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_STREAM_END) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_SEQUENCE_ERROR) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_PARAM_ERROR) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_MEM_ERROR) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_DATA_ERROR) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_DATA_ERROR_MAGIC) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_IO_ERROR) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_UNEXPECTED_EOF) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_OUTBUFF_FULL) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZE(BZ_CONFIG_ERROR)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZ_EXTERN const char * BZ_API(BZ2_bzErrorString) (
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ int error_code
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ switch (error_code)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#define BZE(x) case x: return (#x);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ return ("BZ_UNKNOWN_ERROR");
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#ifdef _KERNEL
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+bz_internal_error(int errcode)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ panic("bzip2 internal error: %s\n", BZ2_bzErrorString(errcode));
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*---------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+typedef struct {
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ size_t sz = sizeof (bzap) + BZ2_BZALLOC_ALIGN + (items * size);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ uintptr_t p = (uintptr_t)kmem_alloc(sz, KM_SLEEP);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ if (p != NULL) {
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ bzap *pp = (bzap *)((p + sizeof (bzap) + BZ2_BZALLOC_ALIGN - 1) &
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ -BZ2_BZALLOC_ALIGN);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ pp[-1].buf = (void *)p;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ pp[-1].sz = sz;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ return (pp);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ return (NULL);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+void default_bzfree ( void* opaque, void* addr )
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ if (addr != NULL) {
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ bzap *pp = (bzap *)addr - 1;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ kmem_free(pp->buf, pp->sz);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+/*---------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross void* v = malloc ( items * size );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -110,8 +188,8 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross if (addr != NULL) free ( addr );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#endif /* _KERNEL */
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*---------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross void prepare_new_block ( EState* s )
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -210,8 +288,92 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross return BZ_OK;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+/*---------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ * returns the BZALLOC size needed for bzCompressInit
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+int BZ_API(BZ2_bzCompressInitSize) (
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ int blockSize100k)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ Int32 n, t;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ n = 100000 * blockSize100k;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ t += ( sizeof(EState) );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ t = P2ROUNDUP(t, BZ2_BZALLOC_ALIGN);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ t += ( n * sizeof(UInt32) );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ t = P2ROUNDUP(t, BZ2_BZALLOC_ALIGN);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ t += ( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ t = P2ROUNDUP(t, BZ2_BZALLOC_ALIGN);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ t += ( 65537 * sizeof(UInt32) );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ t = P2ROUNDUP(t, BZ2_BZALLOC_ALIGN);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ return (t);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*---------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ * added to allow reuse of bz_stream without malloc/free
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+int BZ_API(BZ2_bzCompressReset) ( bz_stream *strm )
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ EState* s = strm->state;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ if (!bz_config_ok()) return BZ_CONFIG_ERROR;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ if (s == NULL) return BZ_MEM_ERROR;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->strm = strm;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->blockNo = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->state = BZ_S_INPUT;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->mode = BZ_M_RUNNING;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->combinedCRC = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->nblockMAX = 100000 * s->blockSize100k - 19;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->block = (UChar*)s->arr2;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->mtfv = (UInt16*)s->arr1;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->zbits = NULL;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->ptr = (UInt32*)s->arr1;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ strm->state = s;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ strm->total_in_lo32 = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ strm->total_in_hi32 = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ strm->total_out_lo32 = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ strm->total_out_hi32 = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ init_RL ( s );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ prepare_new_block ( s );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ return BZ_OK;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+int BZ_API(BZ2_bzDecompressReset) ( bz_stream* strm )
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ DState* s = strm->state;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ if (!bz_config_ok()) return BZ_CONFIG_ERROR;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ if (strm == NULL) return BZ_PARAM_ERROR;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->strm = strm;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->state = BZ_X_MAGIC_1;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->bsLive = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->bsBuff = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->calculatedCombinedCRC = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ strm->total_in_lo32 = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ strm->total_in_hi32 = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ strm->total_out_lo32 = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ strm->total_out_hi32 = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->ll4 = NULL;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->ll16 = NULL;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->tt = NULL;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ s->currBlockNo = 0;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ return BZ_OK;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+/*---------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross void add_pair_to_block ( EState* s )
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -852,9 +1014,11 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross AssertH ( 0, 6001 );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross return 0; /*NOTREACHED*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -1078,7 +1242,7 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross *nbytes_out_hi32 = bzf->strm.total_out_hi32;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross BZ_SETERR(BZ_OK);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- BZ2_bzCompressEnd ( &(bzf->strm) );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ (void) BZ2_bzCompressEnd ( &(bzf->strm) );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross free ( bzf );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -1152,7 +1316,7 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross if (bzf->initialisedOk)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- (void)BZ2_bzDecompressEnd ( &(bzf->strm) );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ (void) BZ2_bzDecompressEnd ( &(bzf->strm) );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross free ( bzf );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -1282,15 +1446,15 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /* normal termination */
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- BZ2_bzCompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ (void) BZ2_bzCompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross return BZ_OK;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross output_overflow:
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- BZ2_bzCompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ (void) BZ2_bzCompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross return BZ_OUTBUFF_FULL;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- BZ2_bzCompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ (void) BZ2_bzCompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -1330,20 +1494,20 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /* normal termination */
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- BZ2_bzDecompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ (void) BZ2_bzDecompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross return BZ_OK;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross output_overflow_or_eof:
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- BZ2_bzDecompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ (void) BZ2_bzDecompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross return BZ_UNEXPECTED_EOF;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- BZ2_bzDecompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ (void) BZ2_bzDecompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross return BZ_OUTBUFF_FULL;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- BZ2_bzDecompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ (void) BZ2_bzDecompressEnd ( &strm );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross--- bzip2-1.0.6/bzlib.h Fri Sep 10 19:08:42 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+++ ./bzlib.h Wed Dec 29 20:59:21 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -18,10 +18,13 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross in the file LICENSE.
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross ------------------------------------------------------------------ */
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #ifndef _BZLIB_H
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define _BZLIB_H
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#ifdef _KERNEL
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#define BZ_NO_STDIO
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #ifdef __cplusplus
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross extern "C" {
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -97,6 +100,8 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*-- Core (low-level) library functions --*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#define BZ2_BZALLOC_ALIGN (64)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross BZ_EXTERN int BZ_API(BZ2_bzCompressInit) (
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross bz_stream* strm,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross int blockSize100k,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -104,6 +109,14 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross int workFactor
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZ_EXTERN int BZ_API(BZ2_bzCompressInitSize) (
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ int blockSize100k
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZ_EXTERN int BZ_API(BZ2_bzCompressReset) (
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ bz_stream* strm
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross BZ_EXTERN int BZ_API(BZ2_bzCompress) (
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross bz_stream* strm,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -119,6 +132,10 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZ_EXTERN int BZ_API(BZ2_bzDecompressReset) (
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ bz_stream* strm
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross bz_stream* strm
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -127,8 +144,12 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross bz_stream *strm
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+BZ_EXTERN const char * BZ_API(BZ2_bzErrorString) (
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ int error_code
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*-- High(er) level library functions --*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #ifndef BZ_NO_STDIO
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -275,8 +296,7 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*-------------------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*--- end bzlib.h ---*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*-------------------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#endif /* _BZLIB_H */
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Rossdiff -u bzip2-1.0.6/bzlib_private.h ./bzlib_private.h
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross--- bzip2-1.0.6/bzlib_private.h Fri Sep 10 18:41:55 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+++ ./bzlib_private.h Wed Dec 29 21:01:01 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -22,7 +22,11 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #ifndef _BZLIB_PRIVATE_H
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define _BZLIB_PRIVATE_H
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#ifdef _KERNEL
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#define BZ_NO_STDIO
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #ifndef BZ_NO_STDIO
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -85,9 +89,10 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#pragma weak bz_internal_error
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross extern void bz_internal_error ( int errcode );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define AssertH(cond,errcode) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- { if (!(cond)) bz_internal_error ( errcode ); }
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ { if (!(cond) && &bz_internal_error != NULL) bz_internal_error ( errcode ); }
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define AssertD(cond,msg) do { } while (0)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define VPrintf0(zf) do { } while (0)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define VPrintf1(zf,za1) do { } while (0)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -156,7 +161,7 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define BZ_INITIALISE_CRC(crcVar) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- crcVar = 0xffffffffL; \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ crcVar = 0xffffffffUL; \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define BZ_FINALISE_CRC(crcVar) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -492,9 +497,6 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross Int32, Int32, Int32 );
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #ifdef BZ_NO_STDIO
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -507,3 +509,4 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*-------------------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*--- end bzlib_private.h ---*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*-------------------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+#endif /* _BZLIB_PRIVATE_H */
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross--- bzip2-1.0.6/crctable.c Fri Sep 10 18:43:34 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+++ ./crctable.c Wed Dec 29 21:01:57 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -32,70 +32,70 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*-- Ugly, innit? --*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x00000000L, 0x04c11db7L, 0x09823b6eL, 0x0d4326d9L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x130476dcL, 0x17c56b6bL, 0x1a864db2L, 0x1e475005L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x2608edb8L, 0x22c9f00fL, 0x2f8ad6d6L, 0x2b4bcb61L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x350c9b64L, 0x31cd86d3L, 0x3c8ea00aL, 0x384fbdbdL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x4c11db70L, 0x48d0c6c7L, 0x4593e01eL, 0x4152fda9L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x5f15adacL, 0x5bd4b01bL, 0x569796c2L, 0x52568b75L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x6a1936c8L, 0x6ed82b7fL, 0x639b0da6L, 0x675a1011L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x791d4014L, 0x7ddc5da3L, 0x709f7b7aL, 0x745e66cdL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x9823b6e0L, 0x9ce2ab57L, 0x91a18d8eL, 0x95609039L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x8b27c03cL, 0x8fe6dd8bL, 0x82a5fb52L, 0x8664e6e5L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xbe2b5b58L, 0xbaea46efL, 0xb7a96036L, 0xb3687d81L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xad2f2d84L, 0xa9ee3033L, 0xa4ad16eaL, 0xa06c0b5dL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xd4326d90L, 0xd0f37027L, 0xddb056feL, 0xd9714b49L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xc7361b4cL, 0xc3f706fbL, 0xceb42022L, 0xca753d95L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xf23a8028L, 0xf6fb9d9fL, 0xfbb8bb46L, 0xff79a6f1L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xe13ef6f4L, 0xe5ffeb43L, 0xe8bccd9aL, 0xec7dd02dL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x34867077L, 0x30476dc0L, 0x3d044b19L, 0x39c556aeL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x278206abL, 0x23431b1cL, 0x2e003dc5L, 0x2ac12072L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x128e9dcfL, 0x164f8078L, 0x1b0ca6a1L, 0x1fcdbb16L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x018aeb13L, 0x054bf6a4L, 0x0808d07dL, 0x0cc9cdcaL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x7897ab07L, 0x7c56b6b0L, 0x71159069L, 0x75d48ddeL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x6b93dddbL, 0x6f52c06cL, 0x6211e6b5L, 0x66d0fb02L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x5e9f46bfL, 0x5a5e5b08L, 0x571d7dd1L, 0x53dc6066L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x4d9b3063L, 0x495a2dd4L, 0x44190b0dL, 0x40d816baL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xaca5c697L, 0xa864db20L, 0xa527fdf9L, 0xa1e6e04eL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xbfa1b04bL, 0xbb60adfcL, 0xb6238b25L, 0xb2e29692L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x8aad2b2fL, 0x8e6c3698L, 0x832f1041L, 0x87ee0df6L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x99a95df3L, 0x9d684044L, 0x902b669dL, 0x94ea7b2aL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xe0b41de7L, 0xe4750050L, 0xe9362689L, 0xedf73b3eL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xf3b06b3bL, 0xf771768cL, 0xfa325055L, 0xfef34de2L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xc6bcf05fL, 0xc27dede8L, 0xcf3ecb31L, 0xcbffd686L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xd5b88683L, 0xd1799b34L, 0xdc3abdedL, 0xd8fba05aL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x690ce0eeL, 0x6dcdfd59L, 0x608edb80L, 0x644fc637L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x7a089632L, 0x7ec98b85L, 0x738aad5cL, 0x774bb0ebL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x4f040d56L, 0x4bc510e1L, 0x46863638L, 0x42472b8fL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x5c007b8aL, 0x58c1663dL, 0x558240e4L, 0x51435d53L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x251d3b9eL, 0x21dc2629L, 0x2c9f00f0L, 0x285e1d47L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x36194d42L, 0x32d850f5L, 0x3f9b762cL, 0x3b5a6b9bL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x0315d626L, 0x07d4cb91L, 0x0a97ed48L, 0x0e56f0ffL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x1011a0faL, 0x14d0bd4dL, 0x19939b94L, 0x1d528623L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xf12f560eL, 0xf5ee4bb9L, 0xf8ad6d60L, 0xfc6c70d7L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xe22b20d2L, 0xe6ea3d65L, 0xeba91bbcL, 0xef68060bL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xd727bbb6L, 0xd3e6a601L, 0xdea580d8L, 0xda649d6fL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xc423cd6aL, 0xc0e2d0ddL, 0xcda1f604L, 0xc960ebb3L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xbd3e8d7eL, 0xb9ff90c9L, 0xb4bcb610L, 0xb07daba7L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xae3afba2L, 0xaafbe615L, 0xa7b8c0ccL, 0xa379dd7bL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x9b3660c6L, 0x9ff77d71L, 0x92b45ba8L, 0x9675461fL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x8832161aL, 0x8cf30badL, 0x81b02d74L, 0x857130c3L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x5d8a9099L, 0x594b8d2eL, 0x5408abf7L, 0x50c9b640L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x4e8ee645L, 0x4a4ffbf2L, 0x470cdd2bL, 0x43cdc09cL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x7b827d21L, 0x7f436096L, 0x7200464fL, 0x76c15bf8L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x68860bfdL, 0x6c47164aL, 0x61043093L, 0x65c52d24L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x119b4be9L, 0x155a565eL, 0x18197087L, 0x1cd86d30L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x029f3d35L, 0x065e2082L, 0x0b1d065bL, 0x0fdc1becL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x3793a651L, 0x3352bbe6L, 0x3e119d3fL, 0x3ad08088L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x2497d08dL, 0x2056cd3aL, 0x2d15ebe3L, 0x29d4f654L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xc5a92679L, 0xc1683bceL, 0xcc2b1d17L, 0xc8ea00a0L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xd6ad50a5L, 0xd26c4d12L, 0xdf2f6bcbL, 0xdbee767cL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xe3a1cbc1L, 0xe760d676L, 0xea23f0afL, 0xeee2ed18L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xf0a5bd1dL, 0xf464a0aaL, 0xf9278673L, 0xfde69bc4L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x89b8fd09L, 0x8d79e0beL, 0x803ac667L, 0x84fbdbd0L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0x9abc8bd5L, 0x9e7d9662L, 0x933eb0bbL, 0x97ffad0cL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xafb010b1L, 0xab710d06L, 0xa6322bdfL, 0xa2f33668L,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- 0xbcb4666dL, 0xb8757bdaL, 0xb5365d03L, 0xb1f740b4L
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x00000000UL, 0x04c11db7UL, 0x09823b6eUL, 0x0d4326d9UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x130476dcUL, 0x17c56b6bUL, 0x1a864db2UL, 0x1e475005UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x2608edb8UL, 0x22c9f00fUL, 0x2f8ad6d6UL, 0x2b4bcb61UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x350c9b64UL, 0x31cd86d3UL, 0x3c8ea00aUL, 0x384fbdbdUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x4c11db70UL, 0x48d0c6c7UL, 0x4593e01eUL, 0x4152fda9UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x5f15adacUL, 0x5bd4b01bUL, 0x569796c2UL, 0x52568b75UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x6a1936c8UL, 0x6ed82b7fUL, 0x639b0da6UL, 0x675a1011UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x791d4014UL, 0x7ddc5da3UL, 0x709f7b7aUL, 0x745e66cdUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x9823b6e0UL, 0x9ce2ab57UL, 0x91a18d8eUL, 0x95609039UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x8b27c03cUL, 0x8fe6dd8bUL, 0x82a5fb52UL, 0x8664e6e5UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xbe2b5b58UL, 0xbaea46efUL, 0xb7a96036UL, 0xb3687d81UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xad2f2d84UL, 0xa9ee3033UL, 0xa4ad16eaUL, 0xa06c0b5dUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xd4326d90UL, 0xd0f37027UL, 0xddb056feUL, 0xd9714b49UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xc7361b4cUL, 0xc3f706fbUL, 0xceb42022UL, 0xca753d95UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xf23a8028UL, 0xf6fb9d9fUL, 0xfbb8bb46UL, 0xff79a6f1UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xe13ef6f4UL, 0xe5ffeb43UL, 0xe8bccd9aUL, 0xec7dd02dUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x34867077UL, 0x30476dc0UL, 0x3d044b19UL, 0x39c556aeUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x278206abUL, 0x23431b1cUL, 0x2e003dc5UL, 0x2ac12072UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x128e9dcfUL, 0x164f8078UL, 0x1b0ca6a1UL, 0x1fcdbb16UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x018aeb13UL, 0x054bf6a4UL, 0x0808d07dUL, 0x0cc9cdcaUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x7897ab07UL, 0x7c56b6b0UL, 0x71159069UL, 0x75d48ddeUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x6b93dddbUL, 0x6f52c06cUL, 0x6211e6b5UL, 0x66d0fb02UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x5e9f46bfUL, 0x5a5e5b08UL, 0x571d7dd1UL, 0x53dc6066UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x4d9b3063UL, 0x495a2dd4UL, 0x44190b0dUL, 0x40d816baUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xaca5c697UL, 0xa864db20UL, 0xa527fdf9UL, 0xa1e6e04eUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xbfa1b04bUL, 0xbb60adfcUL, 0xb6238b25UL, 0xb2e29692UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x8aad2b2fUL, 0x8e6c3698UL, 0x832f1041UL, 0x87ee0df6UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x99a95df3UL, 0x9d684044UL, 0x902b669dUL, 0x94ea7b2aUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xe0b41de7UL, 0xe4750050UL, 0xe9362689UL, 0xedf73b3eUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xf3b06b3bUL, 0xf771768cUL, 0xfa325055UL, 0xfef34de2UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xc6bcf05fUL, 0xc27dede8UL, 0xcf3ecb31UL, 0xcbffd686UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xd5b88683UL, 0xd1799b34UL, 0xdc3abdedUL, 0xd8fba05aUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x690ce0eeUL, 0x6dcdfd59UL, 0x608edb80UL, 0x644fc637UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x7a089632UL, 0x7ec98b85UL, 0x738aad5cUL, 0x774bb0ebUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x4f040d56UL, 0x4bc510e1UL, 0x46863638UL, 0x42472b8fUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x5c007b8aUL, 0x58c1663dUL, 0x558240e4UL, 0x51435d53UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x251d3b9eUL, 0x21dc2629UL, 0x2c9f00f0UL, 0x285e1d47UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x36194d42UL, 0x32d850f5UL, 0x3f9b762cUL, 0x3b5a6b9bUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x0315d626UL, 0x07d4cb91UL, 0x0a97ed48UL, 0x0e56f0ffUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x1011a0faUL, 0x14d0bd4dUL, 0x19939b94UL, 0x1d528623UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xf12f560eUL, 0xf5ee4bb9UL, 0xf8ad6d60UL, 0xfc6c70d7UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xe22b20d2UL, 0xe6ea3d65UL, 0xeba91bbcUL, 0xef68060bUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xd727bbb6UL, 0xd3e6a601UL, 0xdea580d8UL, 0xda649d6fUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xc423cd6aUL, 0xc0e2d0ddUL, 0xcda1f604UL, 0xc960ebb3UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xbd3e8d7eUL, 0xb9ff90c9UL, 0xb4bcb610UL, 0xb07daba7UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xae3afba2UL, 0xaafbe615UL, 0xa7b8c0ccUL, 0xa379dd7bUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x9b3660c6UL, 0x9ff77d71UL, 0x92b45ba8UL, 0x9675461fUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x8832161aUL, 0x8cf30badUL, 0x81b02d74UL, 0x857130c3UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x5d8a9099UL, 0x594b8d2eUL, 0x5408abf7UL, 0x50c9b640UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x4e8ee645UL, 0x4a4ffbf2UL, 0x470cdd2bUL, 0x43cdc09cUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x7b827d21UL, 0x7f436096UL, 0x7200464fUL, 0x76c15bf8UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x68860bfdUL, 0x6c47164aUL, 0x61043093UL, 0x65c52d24UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x119b4be9UL, 0x155a565eUL, 0x18197087UL, 0x1cd86d30UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x029f3d35UL, 0x065e2082UL, 0x0b1d065bUL, 0x0fdc1becUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x3793a651UL, 0x3352bbe6UL, 0x3e119d3fUL, 0x3ad08088UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x2497d08dUL, 0x2056cd3aUL, 0x2d15ebe3UL, 0x29d4f654UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xc5a92679UL, 0xc1683bceUL, 0xcc2b1d17UL, 0xc8ea00a0UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xd6ad50a5UL, 0xd26c4d12UL, 0xdf2f6bcbUL, 0xdbee767cUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xe3a1cbc1UL, 0xe760d676UL, 0xea23f0afUL, 0xeee2ed18UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xf0a5bd1dUL, 0xf464a0aaUL, 0xf9278673UL, 0xfde69bc4UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x89b8fd09UL, 0x8d79e0beUL, 0x803ac667UL, 0x84fbdbd0UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0x9abc8bd5UL, 0x9e7d9662UL, 0x933eb0bbUL, 0x97ffad0cUL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xafb010b1UL, 0xab710d06UL, 0xa6322bdfUL, 0xa2f33668UL,
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ 0xbcb4666dUL, 0xb8757bdaUL, 0xb5365d03UL, 0xb1f740b4UL
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross--- bzip2-1.0.6/decompress.c Fri Sep 10 18:43:17 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+++ ./decompress.c Fri Dec 31 00:58:25 2010
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -38,7 +38,7 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /*---------------------------------------------------*/
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define RETURN(rrr) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- { retVal = rrr; goto save_state_and_return; };
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ { retVal = rrr; goto save_state_and_return; }
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross #define GET_BITS(lll,vvv,nnn) \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross case lll: s->state = lll; \
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -505,13 +505,13 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross for (i = 0; i <= 256; i++) {
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross if (s->cftab[i] < 0 || s->cftab[i] > nblock) {
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /* s->cftab[i] can legitimately be == nblock */
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- RETURN(BZ_DATA_ERROR);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ RETURN(BZ_DATA_ERROR)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross /* Check: cftab entries non-descending. */
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross for (i = 1; i <= 256; i++) {
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross if (s->cftab[i-1] > s->cftab[i]) {
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- RETURN(BZ_DATA_ERROR);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ RETURN(BZ_DATA_ERROR)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -575,7 +575,7 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- RETURN(BZ_OK);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ RETURN(BZ_OK)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross@@ -603,7 +603,7 @@
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross s->state = BZ_X_IDLE;
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross- RETURN(BZ_STREAM_END);
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross+ RETURN(BZ_STREAM_END)
b9071c34cb3102be3bbda85c57015ea13193aa6bGordon Ross default: AssertH ( False, 4001 );