greg/pcompress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix initialization of adaptive modes.

Browse source
This commit is contained in:
Moinak Ghosh 2012-08-10 10:15:20 +05:30
parent f2ffcad2fd
commit 6b6e564886
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
adaptive_compress.c
View file

@ -87,8 +87,8 @@ adapt_init(void **data, int *level, ssize_t chunksize)
if (!adat) { if (!adat) {
adat = (struct adapt_data *)slab_alloc(NULL, sizeof (struct adapt_data)); adat = (struct adapt_data *)slab_alloc(NULL, sizeof (struct adapt_data));
adat->adapt_mode = 1; adat->adapt_mode = 1;
adat->ppmd_data = NULL; rv = ppmd_init(&(adat->ppmd_data), level, chunksize);
rv = lzma_init(&(adat->lzma_data), level, chunksize); adat->lzma_data = NULL;
*data = adat; *data = adat;
if (*level > 9) *level = 9; if (*level > 9) *level = 9;
} }
@ -109,10 +109,10 @@ adapt2_init(void **data, int *level, ssize_t chunksize)
adat->adapt_mode = 2; adat->adapt_mode = 2;
adat->ppmd_data = NULL; adat->ppmd_data = NULL;
lv = *level; lv = *level;
rv = lzma_init(&(adat->lzma_data), &lv, chunksize); rv = ppmd_init(&(adat->ppmd_data), &lv, chunksize);
lv = *level; lv = *level;
if (rv == 0) if (rv == 0)
ppmd_init(&(adat->ppmd_data), &lv, chunksize); rv = lzma_init(&(adat->lzma_data), &lv, chunksize);
*data = adat; *data = adat;
if (*level > 9) *level = 9; if (*level > 9) *level = 9;
} }
@ -126,9 +126,9 @@ adapt_deinit(void **data)
int rv; int rv;
if (adat) { if (adat) {
rv = lzma_deinit(&(adat->lzma_data)); rv = ppmd_deinit(&(adat->ppmd_data));
if (adat->ppmd_data) if (adat->lzma_data)
rv += ppmd_deinit(&(adat->ppmd_data)); rv += lzma_deinit(&(adat->lzma_data));
slab_free(NULL, adat); slab_free(NULL, adat);
*data = NULL; *data = NULL;
} }