diff options
| author | Yann Collet <cyan@fb.com> | 2020-11-13 20:57:26 -0800 |
|---|---|---|
| committer | Yann Collet <cyan@fb.com> | 2020-11-13 20:57:26 -0800 |
| commit | c8c3f8e62e8036e429732c4b954b37d34f80568a (patch) | |
| tree | eac1784dfcf227c2c598931afca259ac43738a3c /programs | |
| parent | a203cb2a6eda7b794ea648ee426704041c119e1d (diff) | |
| download | lz4-c8c3f8e62e8036e429732c4b954b37d34f80568a.tar.gz lz4-c8c3f8e62e8036e429732c4b954b37d34f80568a.tar.bz2 lz4-c8c3f8e62e8036e429732c4b954b37d34f80568a.zip | |
LZ4IO_decompressLZ4F() doesn't need mutable prefs
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/lz4io.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/programs/lz4io.c b/programs/lz4io.c index 3f85c56..3753271 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -1045,7 +1045,10 @@ static void LZ4IO_freeDResources(dRess_t ress) } -static unsigned long long LZ4IO_decompressLZ4F(LZ4IO_prefs_t* const prefs, dRess_t ress, FILE* srcFile, FILE* dstFile) +static unsigned long long +LZ4IO_decompressLZ4F(dRess_t ress, + FILE* const srcFile, FILE* const dstFile, + const LZ4IO_prefs_t* const prefs) { unsigned long long filesize = 0; LZ4F_errorCode_t nextToLoad; @@ -1144,7 +1147,10 @@ static int fseek_u32(FILE *fp, unsigned offset, int where) } #define ENDOFSTREAM ((unsigned long long)-1) -static unsigned long long selectDecoder(LZ4IO_prefs_t* const prefs, dRess_t ress, FILE* finput, FILE* foutput) +static unsigned long long +selectDecoder(LZ4IO_prefs_t* const prefs, + dRess_t ress, + FILE* finput, FILE* foutput) { unsigned char MNstore[MAGICNUMBER_SIZE]; unsigned magicNumber; @@ -1170,7 +1176,7 @@ static unsigned long long selectDecoder(LZ4IO_prefs_t* const prefs, dRess_t ress switch(magicNumber) { case LZ4IO_MAGICNUMBER: - return LZ4IO_decompressLZ4F(prefs, ress, finput, foutput); + return LZ4IO_decompressLZ4F(ress, finput, foutput, prefs); case LEGACY_MAGICNUMBER: DISPLAYLEVEL(4, "Detected : Legacy format \n"); return LZ4IO_decodeLegacyStream(finput, foutput, prefs); @@ -1207,7 +1213,10 @@ static unsigned long long selectDecoder(LZ4IO_prefs_t* const prefs, dRess_t ress } -static int LZ4IO_decompressSrcFile(LZ4IO_prefs_t* const prefs, dRess_t ress, const char* input_filename, const char* output_filename) +static int +LZ4IO_decompressSrcFile(LZ4IO_prefs_t* const prefs, + dRess_t ress, + const char* input_filename, const char* output_filename) { FILE* const foutput = ress.dstFile; unsigned long long filesize = 0; @@ -1215,6 +1224,7 @@ static int LZ4IO_decompressSrcFile(LZ4IO_prefs_t* const prefs, dRess_t ress, con /* Init */ FILE* const finput = LZ4IO_openSrcFile(input_filename); if (finput==NULL) return 1; + assert(foutput != NULL); /* Loop over multiple streams */ for ( ; ; ) { /* endless loop, see break condition */ |