686b0ef7d
Denis Vlasenko
2007-10-16
Subject
bzip2: move state pointer to the offset 0 (smaller code) ifdef out DecompressEnd if FEATURE_CLEAN_UP is not seleted
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/bz/bzlib.c+2 -0
| @@ -363,6 +363,7 @@ case_BZ_M_FLUSHING: | |
| /*---------------------------------------------------*/ | |
| + | #if ENABLE_FEATURE_CLEAN_UP |
| static | |
| void BZ2_bzCompressEnd(bz_stream *strm) | |
| { | |
| @@ -375,6 +376,7 @@ void BZ2_bzCompressEnd(bz_stream *strm) | |
| free(s->crc32table); | |
| free(strm->state); | |
| } | |
| + | #endif |
| /*---------------------------------------------------*/ | |
archival/bz/bzlib.h+3 -1
| @@ -43,20 +43,22 @@ in the file LICENSE. | |
| #define BZ_CONFIG_ERROR (-9) | |
| typedef struct bz_stream { | |
| + | void *state; |
| char *next_in; | |
| char *next_out; | |
| unsigned avail_in; | |
| unsigned avail_out; | |
| /*unsigned long long total_in;*/ | |
| unsigned long long total_out; | |
| - | void *state; |
| } bz_stream; | |
| /*-- Core (low-level) library functions --*/ | |
| static void BZ2_bzCompressInit(bz_stream *strm, int blockSize100k); | |
| static int BZ2_bzCompress(bz_stream *strm, int action); | |
| + | #if ENABLE_FEATURE_CLEAN_UP |
| static void BZ2_bzCompressEnd(bz_stream *strm); | |
| + | #endif |
| /*-------------------------------------------------------------*/ | |
| /*--- end bzlib.h ---*/ | |
archival/bzip2.c+2 -0
| @@ -116,7 +116,9 @@ USE_DESKTOP(long long) int bz_write_tail(bz_stream *strm, void *wbuf) | |
| total = 0 USE_DESKTOP( + strm->total_out ); | |
| err: | |
| + | #if ENABLE_FEATURE_CLEAN_UP |
| BZ2_bzCompressEnd(strm); | |
| + | #endif |
| return total; | |
| } | |