diff options
| author | Rob Landley <rob@landley.net> | 2006-04-10 17:07:15 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-04-10 17:07:15 +0000 |
| commit | c57ec37959390ff2e43faa5e4dd5281b2923ced3 (patch) | |
| tree | 8325e7bd6a9a270e931b383d33b5901751dd2a5e /archival/libunarchive/decompress_bunzip2.c | |
| parent | 998f4493756423877217239d2cc42eb8b83d50b3 (diff) | |
| download | busybox-c57ec37959390ff2e43faa5e4dd5281b2923ced3.tar.gz | |
Patch from Rob Sullivan to consolidate crc32 table generation.
Diffstat (limited to 'archival/libunarchive/decompress_bunzip2.c')
| -rw-r--r-- | archival/libunarchive/decompress_bunzip2.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index 3d07d9e03..1879f7255 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libunarchive/decompress_bunzip2.c @@ -84,8 +84,8 @@ typedef struct { /* The CRC values stored in the block header and calculated from the data */ - unsigned int crc32Table[256],headerCRC, totalCRC, writeCRC; - + uint32_t headerCRC, totalCRC, writeCRC; + uint32_t *crc32Table; /* Intermediate buffer and its size (in bytes) */ unsigned int *dbuf, dbufSize; @@ -620,7 +620,7 @@ decode_next_byte: bd->writeCount=previous; return (previous!=RETVAL_LAST_BLOCK) ? previous : gotcount; } - bd->writeCRC=0xffffffffUL; + bd->writeCRC=~0; pos=bd->writePos; current=bd->writeCurrent; goto decode_next_byte; @@ -634,7 +634,7 @@ static int start_bunzip(bunzip_data **bdp, int in_fd, unsigned char *inbuf, int len) { bunzip_data *bd; - unsigned int i,j,c; + unsigned int i; const unsigned int BZh0=(((unsigned int)'B')<<24)+(((unsigned int)'Z')<<16) +(((unsigned int)'h')<<8)+(unsigned int)'0'; @@ -657,12 +657,7 @@ static int start_bunzip(bunzip_data **bdp, int in_fd, unsigned char *inbuf, /* Init the CRC32 table (big endian) */ - for(i=0;i<256;i++) { - c=i<<24; - for(j=8;j;j--) - c=c&0x80000000 ? (c<<1)^0x04c11db7 : (c<<1); - bd->crc32Table[i]=c; - } + bd->crc32Table = bb_crc32_filltable(1); /* Setup for I/O error handling via longjmp */ |