diff options
| author | yann.collet.73@gmail.com <yann.collet.73@gmail.com@650e7d94-2a16-8b24-b05c-7c0b3f6821cd> | 2013-07-01 07:50:40 (GMT) |
|---|---|---|
| committer | yann.collet.73@gmail.com <yann.collet.73@gmail.com@650e7d94-2a16-8b24-b05c-7c0b3f6821cd> | 2013-07-01 07:50:40 (GMT) |
| commit | 002a93473db38e83fd309aead9567da4aba6834f (patch) | |
| tree | ea7895cec078274e8dfb8da18488cc9b80c35244 /lz4c.c | |
| parent | 16c09428225f466a2ee13e060d290e90663e776a (diff) | |
| download | lz4-002a93473db38e83fd309aead9567da4aba6834f.zip lz4-002a93473db38e83fd309aead9567da4aba6834f.tar.gz lz4-002a93473db38e83fd309aead9567da4aba6834f.tar.bz2 | |
Corrected issue 70, 'pack' instruction on IBM AIX
Added : fullbench : can select compression tests or decompression tests
Removed extern inline, for compatibility with GNU89, as reported by Maciej Adamczyk
lz4.c : made forceinline more explicit
Decompression : corrected corner case behaviors (inputSize == 0 and outputSize == 0), thanks Adrien for detailed suggestions
Makefile : Removed -march=native parameter, due to incompatibility with some GCC versions
git-svn-id: https://lz4.googlecode.com/svn/trunk@98 650e7d94-2a16-8b24-b05c-7c0b3f6821cd
Diffstat (limited to 'lz4c.c')
| -rw-r--r-- | lz4c.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -390,7 +390,7 @@ int compress_file_blockDependency(char* input_filename, char* output_filename, i *(out_buff+4) |= (blockIndependence & _1BIT) << 5;
*(out_buff+4) |= (blockChecksum & _1BIT) << 4;
*(out_buff+4) |= (streamChecksum & _1BIT) << 2;
- *(out_buff+5) = (blockSizeId & _3BITS) << 4;
+ *(out_buff+5) = (char)((blockSizeId & _3BITS) << 4);
checkbits = XXH32((out_buff+4), 2, LZ4S_CHECKSUM_SEED);
checkbits = LZ4S_GetCheckBits_FromXXH(checkbits);
*(out_buff+6) = (unsigned char) checkbits;
@@ -531,7 +531,7 @@ int compress_file(char* input_filename, char* output_filename, int compressionle *(out_buff+4) |= (blockIndependence & _1BIT) << 5;
*(out_buff+4) |= (blockChecksum & _1BIT) << 4;
*(out_buff+4) |= (streamChecksum & _1BIT) << 2;
- *(out_buff+5) = (blockSizeId & _3BITS) <<4;
+ *(out_buff+5) = (char)((blockSizeId & _3BITS) << 4);
checkbits = XXH32((out_buff+4), 2, LZ4S_CHECKSUM_SEED);
checkbits = LZ4S_GetCheckBits_FromXXH(checkbits);
*(out_buff+6) = (unsigned char) checkbits;
|