diff options
author | Yann Collet <yann.collet.73@gmail.com> | 2014-12-19 08:51:32 (GMT) |
---|---|---|
committer | Yann Collet <yann.collet.73@gmail.com> | 2014-12-19 08:51:32 (GMT) |
commit | e25b51de7b51101e04ceea194dd557fcc23c03ca (patch) | |
tree | e6b6f4e9d0363f2ac6b9fd8e6563b068bb2fa3f7 /programs | |
parent | a5358e602a526b844d6872c0b46087044651feb3 (diff) | |
parent | f68eead36c0eb8f6f4e5c912dfe204c52bb7b7c5 (diff) | |
download | lz4-e25b51de7b51101e04ceea194dd557fcc23c03ca.zip lz4-e25b51de7b51101e04ceea194dd557fcc23c03ca.tar.gz lz4-e25b51de7b51101e04ceea194dd557fcc23c03ca.tar.bz2 |
Dev
Diffstat (limited to 'programs')
-rw-r--r-- | programs/Makefile | 15 | ||||
-rw-r--r-- | programs/bench.c | 135 | ||||
-rw-r--r-- | programs/datagen.c | 41 | ||||
-rw-r--r-- | programs/frametest.c | 6 | ||||
-rw-r--r-- | programs/lz4cli.c | 219 | ||||
-rw-r--r-- | programs/lz4io.c | 184 |
6 files changed, 302 insertions, 298 deletions
diff --git a/programs/Makefile b/programs/Makefile index aaaa00e..543eb7c 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -1,6 +1,7 @@ # ########################################################################## # LZ4 programs - Makefile -# Copyright (C) Yann Collet 2011-2014 +# Copyright (C) Yann Collet 2011-2015 +# # GPL v2 License # # This program is free software; you can redistribute it and/or modify @@ -30,13 +31,12 @@ # fullbench32: Same as fullbench, but forced to compile in 32-bits mode # ########################################################################## -RELEASE=r125 +RELEASE?= r126 DESTDIR?= PREFIX ?= /usr -CC := $(CC) CFLAGS ?= -O3 -CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -DLZ4_VERSION=\"$(RELEASE)\" +CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\" FLAGS = -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) BINDIR=$(PREFIX)/bin @@ -142,11 +142,12 @@ test-travis: $(TRAVIS_TARGET) test-lz4: lz4 datagen ./datagen -g16KB | ./lz4 -9 | ./lz4 -vdq > $(VOID) ./datagen | ./lz4 | ./lz4 -vdq > $(VOID) + ./datagen -g6M -p100 | ./lz4 -9BD | ./lz4 -vdq > $(VOID) ./datagen -g256MB | ./lz4 -vqB4D | ./lz4 -vdq > $(VOID) ./datagen -g6GB | ./lz4 -vqB5D | ./lz4 -vdq > $(VOID) # test frame concatenation with null-length frame - echo -n > empty.test - echo hi > nonempty.test + @echo -n > empty.test + @echo hi > nonempty.test cat nonempty.test empty.test nonempty.test > orig.test @./lz4 -zq empty.test > empty.lz4.test @./lz4 -zq nonempty.test > nonempty.lz4.test @@ -159,7 +160,7 @@ test-lz4: lz4 datagen test-lz4c: lz4c datagen - ./datagen -g256MB | ./lz4c -l -v -B4D | ./lz4c -vdq > $(VOID) + ./datagen -g256MB | ./lz4c -l -v | ./lz4c -vdq > $(VOID) test-lz4c32: lz4 lz4c32 lz4 datagen ./datagen -g16KB | ./lz4c32 -9 | ./lz4c32 -vdq > $(VOID) diff --git a/programs/bench.c b/programs/bench.c index 6db1628..02e56c9 100644 --- a/programs/bench.c +++ b/programs/bench.c @@ -22,40 +22,40 @@ - LZ4 source repository : http://code.google.com/p/lz4/ */ -//************************************** -// Compiler Options -//************************************** -// Disable some Visual warning messages +/************************************** +* Compiler Options +***************************************/ +/* Disable some Visual warning messages */ #define _CRT_SECURE_NO_WARNINGS -#define _CRT_SECURE_NO_DEPRECATE // VS2005 +#define _CRT_SECURE_NO_DEPRECATE /* VS2005 */ -// Unix Large Files support (>4GB) +/* Unix Large Files support (>4GB) */ #define _FILE_OFFSET_BITS 64 -#if (defined(__sun__) && (!defined(__LP64__))) // Sun Solaris 32-bits requires specific definitions +#if (defined(__sun__) && (!defined(__LP64__))) /* Sun Solaris 32-bits requires specific definitions */ # define _LARGEFILE_SOURCE -#elif ! defined(__LP64__) // No point defining Large file for 64 bit +#elif ! defined(__LP64__) /* No point defining Large file for 64 bit */ # define _LARGEFILE64_SOURCE #endif -// S_ISREG & gettimeofday() are not supported by MSVC +/* S_ISREG & gettimeofday() are not supported by MSVC */ #if defined(_MSC_VER) || defined(_WIN32) # define BMK_LEGACY_TIMER 1 #endif -//************************************** -// Includes -//************************************** -#include <stdlib.h> // malloc -#include <stdio.h> // fprintf, fopen, ftello64 -#include <sys/types.h> // stat64 -#include <sys/stat.h> // stat64 +/************************************** +* Includes +***************************************/ +#include <stdlib.h> /* malloc */ +#include <stdio.h> /* fprintf, fopen, ftello64 */ +#include <sys/types.h> /* stat64 */ +#include <sys/stat.h> /* stat64 */ -// Use ftime() if gettimeofday() is not available on your target +/* Use ftime() if gettimeofday() is not available on your target */ #if defined(BMK_LEGACY_TIMER) -# include <sys/timeb.h> // timeb, ftime +# include <sys/timeb.h> /* timeb, ftime */ #else -# include <sys/time.h> // gettimeofday +# include <sys/time.h> /* gettimeofday */ #endif #include "lz4.h" @@ -68,18 +68,18 @@ static int LZ4_compress_local(const char* src, char* dst, int size, int clevel) #include "xxhash.h" -//************************************** -// Compiler specifics -//************************************** +/************************************** +* Compiler specifics +***************************************/ #if !defined(S_ISREG) # define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) #endif -//************************************** -// Basic Types -//************************************** -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L // C99 +/************************************** +* Basic Types +***************************************/ +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */ # include <stdint.h> typedef uint8_t BYTE; typedef uint16_t U16; @@ -95,24 +95,23 @@ static int LZ4_compress_local(const char* src, char* dst, int size, int clevel) #endif -//************************************** -// Constants -//************************************** +/************************************** +* Constants +***************************************/ #define NBLOOPS 3 #define TIMELOOP 2000 -#define KB *(1U<<10) -#define MB *(1U<<20) +#define KB *(1 <<10) +#define MB *(1 <<20) #define GB *(1U<<30) -#define KNUTH 2654435761U #define MAX_MEM (2 GB - 64 MB) #define DEFAULT_CHUNKSIZE (4 MB) -//************************************** -// Local structures -//************************************** +/************************************** +* Local structures +***************************************/ struct chunkParameters { U32 id; @@ -129,15 +128,15 @@ struct compressionParameters }; -//************************************** -// MACRO -//************************************** +/************************************** +* MACRO +***************************************/ #define DISPLAY(...) fprintf(stderr, __VA_ARGS__) -//************************************** -// Benchmark Parameters -//************************************** +/************************************** +* Benchmark Parameters +***************************************/ static int chunkSize = DEFAULT_CHUNKSIZE; static int nbIterations = NBLOOPS; static int BMK_pause = 0; @@ -153,17 +152,17 @@ void BMK_SetNbIterations(int nbLoops) void BMK_SetPause(void) { BMK_pause = 1; } -//********************************************************* -// Private functions -//********************************************************* +/********************************************************* +* Private functions +**********************************************************/ #if defined(BMK_LEGACY_TIMER) static int BMK_GetMilliStart(void) { - // Based on Legacy ftime() - // Rolls over every ~ 12.1 days (0x100000/24/60/60) - // Use GetMilliSpan to correct for rollover + /* Based on Legacy ftime() + Rolls over every ~ 12.1 days (0x100000/24/60/60) + Use GetMilliSpan to correct for rollover */ struct timeb tb; int nCount; ftime( &tb ); @@ -175,8 +174,8 @@ static int BMK_GetMilliStart(void) static int BMK_GetMilliStart(void) { - // Based on newer gettimeofday() - // Use GetMilliSpan to correct for rollover + /* Based on newer gettimeofday() + Use GetMilliSpan to correct for rollover */ struct timeval tv; int nCount; gettimeofday(&tv, NULL); @@ -198,7 +197,7 @@ static int BMK_GetMilliSpan( int nTimeStart ) static size_t BMK_findMaxMem(U64 requiredMem) { - size_t step = (64 MB); + size_t step = 64 MB; BYTE* testmem=NULL; requiredMem = (((requiredMem >> 26) + 1) << 26); @@ -226,14 +225,14 @@ static U64 BMK_GetFileSize(char* infilename) struct stat statbuf; r = stat(infilename, &statbuf); #endif - if (r || !S_ISREG(statbuf.st_mode)) return 0; // No good... + if (r || !S_ISREG(statbuf.st_mode)) return 0; /* No good... */ return (U64)statbuf.st_size; } -//********************************************************* -// Public function -//********************************************************* +/********************************************************* +* Public function +**********************************************************/ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) { @@ -248,7 +247,7 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) double totald = 0.; - // Init + /* Init */ if (cLevel <= 3) cfunctionId = 0; else cfunctionId = 1; switch (cfunctionId) { @@ -262,7 +261,7 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) } compP.decompressionFunction = LZ4_decompress_fast; - // Loop for each file + /* Loop for each file */ while (fileIdx<nbFiles) { FILE* inFile; @@ -276,7 +275,7 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) struct chunkParameters* chunkP; U32 crcOrig; - // Check file existence + /* Check file existence */ inFileName = fileNamesTable[fileIdx++]; inFile = fopen( inFileName, "rb" ); if (inFile==NULL) @@ -285,7 +284,7 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) return 11; } - // Memory allocation & restrictions + /* Memory allocation & restrictions */ inFileSize = BMK_GetFileSize(inFileName); benchedSize = (size_t) BMK_findMaxMem(inFileSize * 2) / 2; if ((U64)benchedSize > inFileSize) benchedSize = (size_t)inFileSize; @@ -294,7 +293,7 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) DISPLAY("Not enough memory for '%s' full size; testing %i MB only...\n", inFileName, (int)(benchedSize>>20)); } - // Alloc + /* Alloc */ chunkP = (struct chunkParameters*) malloc(((benchedSize / (size_t)chunkSize)+1) * sizeof(struct chunkParameters)); orig_buff = (char*)malloc((size_t )benchedSize); nbChunks = (int) ((int)benchedSize / chunkSize) + 1; @@ -313,7 +312,7 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) return 12; } - // Init chunks data + /* Init chunks data */ { int i; size_t remaining = benchedSize; @@ -329,7 +328,7 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) } } - // Fill input buffer + /* Fill input buffer */ DISPLAY("Loading %s... \r", inFileName); readSize = fread(orig_buff, 1, benchedSize, inFile); fclose(inFile); @@ -343,11 +342,11 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) return 13; } - // Calculating input Checksum + /* Calculating input Checksum */ crcOrig = XXH32(orig_buff, (unsigned int)benchedSize,0); - // Bench + /* Bench */ { int loopNb, chunkNb; size_t cSize=0; @@ -361,9 +360,9 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) int nbLoops; int milliTime; - // Compression + /* Compression */ DISPLAY("%1i-%-14.14s : %9i ->\r", loopNb, inFileName, (int)benchedSize); - { size_t i; for (i=0; i<benchedSize; i++) compressedBuffer[i]=(char)i; } // warmimg up memory + { size_t i; for (i=0; i<benchedSize; i++) compressedBuffer[i]=(char)i; } /* warmimg up memory */ nbLoops = 0; milliTime = BMK_GetMilliStart(); @@ -383,8 +382,8 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) DISPLAY("%1i-%-14.14s : %9i -> %9i (%5.2f%%),%7.1f MB/s\r", loopNb, inFileName, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000.); - // Decompression - { size_t i; for (i=0; i<benchedSize; i++) orig_buff[i]=0; } // zeroing area, for CRC checking + /* Decompression */ + { size_t i; for (i=0; i<benchedSize; i++) orig_buff[i]=0; } /* zeroing area, for CRC checking */ nbLoops = 0; milliTime = BMK_GetMilliStart(); @@ -401,7 +400,7 @@ int BMK_benchFile(char** fileNamesTable, int nbFiles, int cLevel) if ((double)milliTime < fastestD*nbLoops) fastestD = (double)milliTime/nbLoops; DISPLAY("%1i-%-14.14s : %9i -> %9i (%5.2f%%),%7.1f MB/s ,%7.1f MB/s\r", loopNb, inFileName, (int)benchedSize, (int)cSize, ratio, (double)benchedSize / fastestC / 1000., (double)benchedSize / fastestD / 1000.); - // CRC Checking + /* CRC Checking */ crcCheck = XXH32(orig_buff, (unsigned int)benchedSize,0); if (crcOrig!=crcCheck) { DISPLAY("\n!!! WARNING !!! %14s : Invalid Checksum : %x != %x\n", inFileName, (unsigned)crcOrig, (unsigned)crcCheck); break; } } diff --git a/programs/datagen.c b/programs/datagen.c index 706c30f..0f07477 100644 --- a/programs/datagen.c +++ b/programs/datagen.c @@ -1,6 +1,7 @@ /* datagen.c - compressible data generator test tool - Copyright (C) Yann Collet 2012-2014 + Copyright (C) Yann Collet 2012-2015 + GPL v2 License This program is free software; you can redistribute it and/or modify @@ -18,8 +19,9 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. You can contact the author at : - - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html - - LZ4 source repository : http://code.google.com/p/lz4/ + - LZ4 source repository : http://code.google.com/p/lz4 + - LZ4 source mirror : https://github.com/Cyan4973/lz4 + - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c */ /************************************** @@ -31,7 +33,6 @@ /************************************** Includes **************************************/ -//#include <stdlib.h> #include <stdio.h> // fgets, sscanf #include <string.h> // strcmp @@ -59,11 +60,11 @@ Constants **************************************/ #ifndef LZ4_VERSION -# define LZ4_VERSION "rc118" +# define LZ4_VERSION "r125" #endif -#define KB *(1U<<10) -#define MB *(1U<<20) +#define KB *(1 <<10) +#define MB *(1 <<20) #define GB *(1U<<30) #define CDG_SIZE_DEFAULT (64 KB) @@ -83,13 +84,13 @@ /************************************** Local Parameters **************************************/ -static int no_prompt = 0; -static char* programName; -static int displayLevel = 2; +static unsigned no_prompt = 0; +static char* programName; +static unsigned displayLevel = 2; /********************************************************* - Fuzzer functions + functions *********************************************************/ #define CDG_rotl32(x,r) ((x << r) | (x >> (32 - r))) @@ -113,10 +114,11 @@ static void CDG_generate(U64 size, U32* seed, double proba) BYTE* buff = fullbuff + 32 KB; U64 total=0; U32 P32 = (U32)(32768 * proba); - U32 pos=0; + U32 pos=1; U32 genBlockSize = 128 KB; // Build initial prefix + fullbuff[0] = CDG_RANDCHAR; while (pos<32 KB) { // Select : Literal (char) or Match (within 32K) @@ -135,9 +137,7 @@ static void CDG_generate(U64 size, U32* seed, double proba) else { // Literal (noise) - U32 d; - int length = CDG_RANDLENGTH; - d = pos + length; + U32 d = pos + CDG_RANDLENGTH; while (pos < d) fullbuff[pos++] = CDG_RANDCHAR; } } @@ -175,8 +175,10 @@ static void CDG_generate(U64 size, U32* seed, double proba) while (pos < d) buff[pos++] = CDG_RANDCHAR; } } + // output datagen pos=0; - for (;pos+512<=genBlockSize;pos+=512) printf("%512.512s", buff+pos); + for (;pos+512<=genBlockSize;pos+=512) + printf("%512.512s", buff+pos); for (;pos<genBlockSize;pos++) printf("%c", buff[pos]); // Regenerate prefix memcpy(fullbuff, buff + 96 KB, 32 KB); @@ -215,13 +217,13 @@ int main(int argc, char** argv) if(!argument) continue; // Protection if argument empty // Decode command (note : aggregated commands are allowed) - if (argument[0]=='-') + if (*argument=='-') { if (!strcmp(argument, "--no-prompt")) { no_prompt=1; continue; } - while (argument[1]!=0) + argument++; + while (*argument!=0) { - argument++; switch(*argument) { case 'h': @@ -264,6 +266,7 @@ int main(int argc, char** argv) break; case 'v': displayLevel = 4; + argument++; break; default: ; } diff --git a/programs/frametest.c b/programs/frametest.c index 2a0c603..71490a6 100644 --- a/programs/frametest.c +++ b/programs/frametest.c @@ -38,13 +38,13 @@ /************************************** - Includes + Includes **************************************/ -#include <stdlib.h> +#include <stdlib.h> // free #include <stdio.h> // fgets, sscanf #include <sys/timeb.h> // timeb #include <string.h> // strcmp -#include "lz4frame.h" +#include "lz4frame_static.h" #include "xxhash.h" // XXH64 diff --git a/programs/lz4cli.c b/programs/lz4cli.c index 6f62095..0da5dce 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -30,62 +30,62 @@ The license of this compression CLI program is GPLv2. */ -//************************************** -// Tuning parameters -//************************************** -// ENABLE_LZ4C_LEGACY_OPTIONS : -// Control the availability of -c0, -c1 and -hc legacy arguments -// Default : Legacy options are disabled -// #define ENABLE_LZ4C_LEGACY_OPTIONS - - -//************************************** -// Compiler Options -//************************************** -// Disable some Visual warning messages -#ifdef _MSC_VER // Visual Studio +/************************************** +* Tuning parameters +***************************************/ +/* ENABLE_LZ4C_LEGACY_OPTIONS : + Control the availability of -c0, -c1 and -hc legacy arguments + Default : Legacy options are disabled */ +/* #define ENABLE_LZ4C_LEGACY_OPTIONS */ + + +/************************************** +* Compiler Options +***************************************/ +/* Disable some Visual warning messages */ +#ifdef _MSC_VER # define _CRT_SECURE_NO_WARNINGS -# define _CRT_SECURE_NO_DEPRECATE // VS2005 -# pragma warning(disable : 4127) // disable: C4127: conditional expression is constant +# define _CRT_SECURE_NO_DEPRECATE /* VS2005 */ +# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ #endif -#define _POSIX_SOURCE 1 // for fileno() within <stdio.h> on unix +#define _POSIX_SOURCE 1 /* for fileno() within <stdio.h> on unix */ -//**************************** -// Includes -//**************************** -#include <stdio.h> // fprintf, fopen, fread, _fileno, stdin, stdout -#include <stdlib.h> // exit, calloc, free -#include <string.h> // strcmp, strlen -#include "bench.h" // BMK_benchFile, BMK_SetNbIterations, BMK_SetBlocksize, BMK_SetPause +/**************************** +* Includes +*****************************/ +#include <stdio.h> /* fprintf, getchar */ +#include <stdlib.h> /* exit, calloc, free */ +#include <string.h> /* strcmp, strlen */ +#include "bench.h" /* BMK_benchFile, BMK_SetNbIterations, BMK_SetBlocksize, BMK_SetPause */ #include "lz4io.h" -//**************************** -// OS-specific Includes -//**************************** +/**************************** +* OS-specific Includes +*****************************/ #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) -# include <fcntl.h> // _O_BINARY -# include <io.h> // _setmode, _isatty +# include <fcntl.h> /* _O_BINARY */ +# include <io.h> /* _setmode, _isatty */ # ifdef __MINGW32__ - int _fileno(FILE *stream); // MINGW somehow forgets to include this windows declaration into <stdio.h> + int _fileno(FILE *stream); /* MINGW somehow forgets to include this prototype into <stdio.h> */ # endif # define SET_BINARY_MODE(file) _setmode(_fileno(file), _O_BINARY) # define IS_CONSOLE(stdStream) _isatty(_fileno(stdStream)) #else -# include <unistd.h> // isatty +# include <unistd.h> /* isatty */ # define SET_BINARY_MODE(file) # define IS_CONSOLE(stdStream) isatty(fileno(stdStream)) #endif -//**************************** -// Constants -//**************************** +/***************************** +* Constants +******************************/ #define COMPRESSOR_NAME "LZ4 command line interface" #ifndef LZ4_VERSION -# define LZ4_VERSION "r125" +# define LZ4_VERSION "r126" #endif #define AUTHOR "Yann Collet" #define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), LZ4_VERSION, AUTHOR, __DATE__ @@ -99,23 +99,23 @@ #define LZ4_BLOCKSIZEID_DEFAULT 7 -//************************************** -// Macros -//************************************** +/************************************** +* Macros +***************************************/ #define DISPLAY(...) fprintf(stderr, __VA_ARGS__) #define DISPLAYLEVEL(l, ...) if (displayLevel>=l) { DISPLAY(__VA_ARGS__); } -static unsigned displayLevel = 2; // 0 : no display // 1: errors // 2 : + result + interaction + warnings ; // 3 : + progression; // 4 : + information +static unsigned displayLevel = 2; /* 0 : no display ; 1: errors ; 2 : + result + interaction + warnings ; 3 : + progression; 4 : + information */ -//************************************** -// Local Variables -//************************************** +/************************************** +* Local Variables +***************************************/ static char* programName; -//************************************** -// Exceptions -//************************************** +/************************************** +* Exceptions +***************************************/ #define DEBUG 0 #define DEBUGOUTPUT(...) if (DEBUG) DISPLAY(__VA_ARGS__); #define EXM_THROW(error, ...) \ @@ -128,21 +128,21 @@ static char* programName; } -//************************************** -// Version modifiers -//************************************** +/************************************** +* Version modifiers +***************************************/ #define EXTENDED_ARGUMENTS #define EXTENDED_HELP #define EXTENDED_FORMAT #define DEFAULT_COMPRESSOR LZ4IO_compressFilename #define DEFAULT_DECOMPRESSOR LZ4IO_decompressFilename -int LZ4IO_compressFilename_Legacy(char* input_filename, char* output_filename, int compressionlevel); +int LZ4IO_compressFilename_Legacy(char* input_filename, char* output_filename, int compressionlevel); /* hidden function */ -//**************************** -// Functions -//**************************** -int usage(void) +/**************************** +* Functions +*****************************/ +static int usage(void) { DISPLAY( "Usage :\n"); DISPLAY( " %s [arg] [input] [output]\n", programName); @@ -159,7 +159,7 @@ int usage(void) return 0; } -int usage_advanced(void) +static int usage_advanced(void) { DISPLAY(WELCOME_MESSAGE); usage(); @@ -173,7 +173,7 @@ int usage_advanced(void) DISPLAY( " -l : compress using Legacy format (Linux kernel compression)\n"); DISPLAY( " -B# : Block size [4-7](default : 7)\n"); DISPLAY( " -BD : Block dependency (improve compression ratio)\n"); - //DISPLAY( " -BX : enable block checksum (default:disabled)\n"); // Option currently inactive + /* DISPLAY( " -BX : enable block checksum (default:disabled)\n"); *//* Option currently inactive */ DISPLAY( " -Sx : disable stream checksum (default:enabled)\n"); DISPLAY( "Benchmark arguments :\n"); DISPLAY( " -b : benchmark file(s)\n"); @@ -185,12 +185,12 @@ int usage_advanced(void) DISPLAY( " -hc : high compression\n"); DISPLAY( " -y : overwrite output without prompting \n"); DISPLAY( " -s : suppress warnings \n"); -#endif // ENABLE_LZ4C_LEGACY_OPTIONS +#endif /* ENABLE_LZ4C_LEGACY_OPTIONS */ EXTENDED_HELP; return 0; } -int usage_longhelp(void) +static int usage_longhelp(void) { DISPLAY( "\n"); DISPLAY( "Which values can get [output] ? \n"); @@ -236,11 +236,11 @@ int usage_longhelp(void) DISPLAY( "It is not equivalent to :\n"); DISPLAY( " %s -h -c filename\n", programName); DISPLAY( "which would display help text and exit\n"); -#endif // ENABLE_LZ4C_LEGACY_OPTIONS +#endif /* ENABLE_LZ4C_LEGACY_OPTIONS */ return 0; } -int badusage(void) +static int badusage(void) { DISPLAYLEVEL(1, "Incorrect parameters\n"); if (displayLevel >= 1) usage(); @@ -248,7 +248,7 @@ int badusage(void) } -void waitEnter(void) +static void waitEnter(void) { DISPLAY("Press enter to continue...\n"); getchar(); @@ -273,25 +273,25 @@ int main(int argc, char** argv) char extension[] = LZ4_EXTENSION; int blockSize; - // Init + /* Init */ programName = argv[0]; LZ4IO_setOverwrite(0); blockSize = LZ4IO_setBlockSizeID(LZ4_BLOCKSIZEID_DEFAULT); - // lz4cat behavior + /* lz4cat behavior */ if (!strcmp(programName, LZ4_CAT)) { decode=1; forceStdout=1; output_filename=stdoutmark; displayLevel=1; } - // command switches + /* command switches */ for(i=1; i<argc; i++) { char* argument = argv[i]; - if(!argument) continue; // Protection if argument empty + if(!argument) continue; /* Protection if argument empty */ - // Decode command (note : aggregated commands are allowed) + /* Decode command (note : aggregated commands are allowed) */ if (argument[0]=='-') { - // '-' means stdin/stdout + /* '-' means stdin/stdout */ if (argument[1]==0) { if (!input_filename) input_filename=stdinmark; @@ -303,13 +303,13 @@ int main(int argc, char** argv) argument ++; #if defined(ENABLE_LZ4C_LEGACY_OPTIONS) - // Legacy options (-c0, -c1, -hc, -y, -s) - if ((argument[0]=='c') && (argument[1]=='0')) { cLevel=0; argument++; continue; } // -c0 (fast compression) - if ((argument[0]=='c') && (argument[1]=='1')) { cLevel=9; argument++; continue; } // -c1 (high compression) - if ((argument[0]=='h') && (argument[1]=='c')) { cLevel=9; argument++; continue; } // -hc (high compression) - if (*argument=='y') { LZ4IO_setOverwrite(1); continue; } // -y (answer 'yes' to overwrite permission) - if (*argument=='s') { displayLevel=1; continue; } // -s (silent mode) -#endif // ENABLE_LZ4C_LEGACY_OPTIONS + /* Legacy arguments (-c0, -c1, -hc, -y, -s) */ + if ((argument[0]=='c') && (argument[1]=='0')) { cLevel=0; argument++; continue; } /* -c0 (fast compression) */ + if ((argument[0]=='c') && (argument[1]=='1')) { cLevel=9; argument++; continue; } /* -c1 (high compression) */ + if ((argument[0]=='h') && (argument[1]=='c')) { cLevel=9; argument++; continue; } /* -hc (high compression) */ + if (*argument=='y') { LZ4IO_setOverwrite(1); continue; } /* -y (answer 'yes' to overwrite permission) */ + if (*argument=='s') { displayLevel=1; continue; } /* -s (silent mode) */ +#endif /* ENABLE_LZ4C_LEGACY_OPTIONS */ if ((*argument>='0') && (*argument<='9')) { @@ -326,39 +326,39 @@ int main(int argc, char** argv) switch(argument[0]) { - // Display help - case 'V': DISPLAY(WELCOME_MESSAGE); return 0; // Version + /* Display help */ + case 'V': DISPLAY(WELCOME_MESSAGE); return 0; /* Version */ case 'h': usage_advanced(); return 0; case 'H': usage_advanced(); usage_longhelp(); return 0; - // Compression (default) + /* Compression (default) */ case 'z': forceCompress = 1; break; - // Use Legacy format (for Linux kernel compression) - case 'l': legacy_format=1; break; + /* Use Legacy format (ex : Linux kernel compression) */ + case 'l': legacy_format = 1; blockSize = 8 MB; break; - // Decoding + /* Decoding */ case 'd': decode=1; break; - // Force stdout, even if stdout==console + /* Force stdout, even if stdout==console */ case 'c': forceStdout=1; output_filename=stdoutmark; displayLevel=1; break; - // Test + /* Test integrity */ case 't': decode=1; LZ4IO_setOverwrite(1); output_filename=nulmark; break; - // Overwrite + /* Overwrite */ case 'f': LZ4IO_setOverwrite(1); break; - // Verbose mode + /* Verbose mode */ case 'v': displayLevel=4; break; - // Quiet mode + /* Quiet mode */ case 'q': displayLevel--; break; - // keep source file (default anyway, so useless) (for xz/lzma compatibility) + /* keep source file (default anyway, so useless) (for xz/lzma compatibility) */ case 'k': break; - // Modify Block Properties + /* Modify Block Properties */ case 'B': while (argument[1]!=0) { @@ -377,20 +377,20 @@ int main(int argc, char** argv) break; } case 'D': LZ4IO_setBlockMode(LZ4IO_blockLinked); argument++; break; - case 'X': LZ4IO_setBlockChecksumMode(1); argument ++; break; + case 'X': LZ4IO_setBlockChecksumMode(1); argument ++; break; /* currently disables */ default : exitBlockProperties=1; } if (exitBlockProperties) break; } break; - // Modify Stream properties + /* Modify Stream properties */ case 'S': if (argument[1]=='x') { LZ4IO_setStreamChecksumMode(0); argument++; break; } else { badusage(); } - // Benchmark + /* Benchmark */ case 'b': bench=1; break; - // Modify Nb Iterations (benchmark only) + /* Modify Nb Iterations (benchmark only) */ case 'i': if ((argument[1] >='1') && (argument[1] <='9')) { @@ -400,22 +400,23 @@ int main(int argc, char** argv) } break; - // Pause at the end (hidden option) + /* Pause at the end (hidden option) */ case 'p': main_pause=1; BMK_SetPause(); break; + /* Specific commands for customized versions */ EXTENDED_ARGUMENTS; - // Unrecognised command + /* Unrecognised command */ default : badusage(); } } continue; } - // first provided filename is input + /* first provided filename is input */ if (!input_filename) { input_filename=argument; filenamesStart=i; continue; } - // second provided filename is output + /* second provided filename is output */ if (!output_filename) { output_filename=argument; @@ -427,25 +428,25 @@ int main(int argc, char** argv) DISPLAYLEVEL(3, WELCOME_MESSAGE); if (!decode) DISPLAYLEVEL(4, "Blocks size : %i KB\n", blockSize>>10); - // No input filename ==> use stdin + /* No input filename ==> use stdin */ if(!input_filename) { input_filename=stdinmark; } - // Check if input or output are defined as console; trigger an error in this case - if (!strcmp(input_filename, stdinmark) && IS_CONSOLE(stdin) ) badusage(); + /* Check if input or output are defined as console; trigger an error in this case */ + if (!strcmp(input_filename, stdinmark) && IS_CONSOLE(stdin) ) badusage(); - // Check if benchmark is selected + /* Check if benchmark is selected */ if (bench) return BMK_benchFile(argv+filenamesStart, argc-filenamesStart, cLevel); - // No output filename ==> try to select one automatically (when possible) + /* No output filename ==> try to select one automatically (when possible) */ while (!output_filename) { - if (!IS_CONSOLE(stdout)) { output_filename=stdoutmark; break; } // Default to stdout whenever possible (i.e. not a console) - if ((!decode) && !(forceCompress)) // auto-determine compression or decompression, based on file extension + if (!IS_CONSOLE(stdout)) { output_filename=stdoutmark; break; } /* Default to stdout whenever possible (i.e. not a console) */ + if ((!decode) && !(forceCompress)) /* auto-determine compression or decompression, based on file extension */ { size_t l = strlen(input_filename); if (!strcmp(input_filename+(l-4), LZ4_EXTENSION)) decode=1; } - if (!decode) // compression to file + if (!decode) /* compression to file */ { size_t l = strlen(input_filename); dynNameSpace = (char*)calloc(1,l+5); @@ -455,7 +456,7 @@ int main(int argc, char** argv) DISPLAYLEVEL(2, "Compressed filename will be : %s \n", output_filename); break; } - // decompression to file (automatic name will work only if input filename has correct format extension) + /* decompression to file (automatic name will work only if input filename has correct format extension) */ { size_t outl; size_t inl = strlen(input_filename); @@ -470,19 +471,19 @@ int main(int argc, char** argv) } } - // No warning message in pure pipe mode (stdin + stdout) + /* Check if output is defined as console; trigger an error in this case */ + if (!strcmp(output_filename,stdoutmark) && IS_CONSOLE(stdout) && !forceStdout) badusage(); + + /* No warning message in pure pipe mode (stdin + stdout) */ if (!strcmp(input_filename, stdinmark) && !strcmp(output_filename,stdoutmark) && (displayLevel==2)) displayLevel=1; - // Check if input or output are defined as console; trigger an error in this case - if (!strcmp(input_filename, stdinmark) && IS_CONSOLE(stdin) ) badusage(); - if (!strcmp(output_filename,stdoutmark) && IS_CONSOLE(stdout) && !forceStdout) badusage(); - // IO Stream/File + /* IO Stream/File */ LZ4IO_setNotificationLevel(displayLevel); if (decode) DEFAULT_DECOMPRESSOR(input_filename, output_filename); else - // compression is default action { + /* compression is default action */ if (legacy_format) { DISPLAYLEVEL(3, "! Generating compressed LZ4 using Legacy format (deprecated) ! \n"); diff --git a/programs/lz4io.c b/programs/lz4io.c index a886ac7..fa1f0f9 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -29,13 +29,13 @@ - The license of this source file is GPLv2. */ -//************************************** -// Compiler Options -//************************************** +/************************************** +* Compiler Options +***************************************/ #ifdef _MSC_VER /* Visual Studio */ # define _CRT_SECURE_NO_WARNINGS -# define _CRT_SECURE_NO_DEPRECATE // VS2005 -# pragma warning(disable : 4127) // disable: C4127: conditional expression is constant +# define _CRT_SECURE_NO_DEPRECATE /* VS2005 */ +# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ #endif #define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) @@ -44,45 +44,45 @@ # pragma GCC diagnostic ignored "-Wmissing-field-initializers" /* GCC bug 53119 : doesn't accept { 0 } as initializer (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119) */ #endif -#define _LARGE_FILES // Large file support on 32-bits AIX -#define _FILE_OFFSET_BITS 64 // Large file support on 32-bits unix -#define _POSIX_SOURCE 1 // for fileno() within <stdio.h> on unix +#define _LARGE_FILES /* Large file support on 32-bits AIX */ +#define _FILE_OFFSET_BITS 64 /* Large file support on 32-bits unix */ +#define _POSIX_SOURCE 1 /* for fileno() within <stdio.h> on unix */ -//**************************** -// Includes -//**************************** -#include <stdio.h> // fprintf, fopen, fread, _fileno, stdin, stdout -#include <stdlib.h> // malloc, free -#include <string.h> // strcmp, strlen -#include <time.h> // clock +/**************************** +* Includes +*****************************/ +#include <stdio.h> /* fprintf, fopen, fread, _fileno, stdin, stdout */ +#include <stdlib.h> /* malloc, free */ +#include <string.h> /* strcmp, strlen */ +#include <time.h> /* clock */ #include "lz4io.h" -#include "lz4.h" // still required for legacy format -#include "lz4hc.h" // still required for legacy format +#include "lz4.h" /* still required for legacy format */ +#include "lz4hc.h" /* still required for legacy format */ #include "lz4frame.h" -//**************************** -// OS-specific Includes -//**************************** +/**************************** +* OS-specific Includes +*****************************/ #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) -# include <fcntl.h> // _O_BINARY -# include <io.h> // _setmode, _isatty +# include <fcntl.h> /* _O_BINARY */ +# include <io.h> /* _setmode, _isatty */ # ifdef __MINGW32__ - int _fileno(FILE *stream); // MINGW somehow forgets to include this windows declaration into <stdio.h> + int _fileno(FILE *stream); /* MINGW somehow forgets to include this windows declaration into <stdio.h> */ # endif # define SET_BINARY_MODE(file) _setmode(_fileno(file), _O_BINARY) # define IS_CONSOLE(stdStream) _isatty(_fileno(stdStream)) #else -# include <unistd.h> // isatty +# include <unistd.h> /* isatty */ # define SET_BINARY_MODE(file) # define IS_CONSOLE(stdStream) isatty(fileno(stdStream)) #endif -//**************************** -// Constants -//**************************** +/**************************** +* Constants +*****************************/ #define KB *(1 <<10) #define MB *(1 <<20) #define GB *(1U<<30) @@ -108,9 +108,9 @@ #define LZ4S_MAXHEADERSIZE (MAGICNUMBER_SIZE+2+8+4+1) -//************************************** -// Macros -//************************************** +/************************************** +* Macros +***************************************/ #define DISPLAY(...) fprintf(stderr, __VA_ARGS__) #define DISPLAYLEVEL(l, ...) if (displayLevel>=l) { DISPLAY(__VA_ARGS__); } #define DISPLAYUPDATE(l, ...) if (displayLevel>=l) { \ @@ -121,10 +121,10 @@ static const unsigned refreshRate = 150; static clock_t g_time = 0; -//************************************** -// Local Parameters -//************************************** -static int displayLevel = 0; // 0 : no display // 1: errors // 2 : + result + interaction + warnings ; // 3 : + progression; // 4 : + information +/************************************** +* Local Parameters +***************************************/ +static int displayLevel = 0; /* 0 : no display ; 1: errors ; 2 : + result + interaction + warnings ; 3 : + progression; 4 : + information */ static int overwrite = 1; static int globalBlockSizeId = LZ4S_BLOCKSIZEID_DEFAULT; static int blockChecksum = 0; @@ -135,9 +135,9 @@ static const int minBlockSizeID = 4; static const int maxBlockSizeID = 7; -//************************************** -// Exceptions -//************************************** +/************************************** +* Exceptions +***************************************/ #define DEBUG 0 #define DEBUGOUTPUT(...) if (DEBUG) DISPLAY(__VA_ARGS__); #define EXM_THROW(error, ...) \ @@ -150,9 +150,9 @@ static const int maxBlockSizeID = 7; } -//************************************** -// Version modifiers -//************************************** +/************************************** +* Version modifiers +***************************************/ #define EXTENDED_ARGUMENTS #define EXTENDED_HELP #define EXTENDED_FORMAT @@ -245,7 +245,7 @@ static int get_fileHandle(char* input_filename, char* output_filename, FILE** pf } else { - // Check if destination file already exists + /* Check if destination file already exists */ *pfoutput=0; if (output_filename != nulmark) *pfoutput = fopen( output_filename, "rb" ); if (*pfoutput!=0) @@ -256,7 +256,7 @@ static int get_fileHandle(char* input_filename, char* output_filename, FILE** pf char ch; DISPLAYLEVEL(2, "Warning : %s already exists\n", output_filename); DISPLAYLEVEL(2, "Overwrite ? (Y/N) : "); - if (displayLevel <= 1) EXM_THROW(11, "Operation aborted : %s already exists", output_filename); // No interaction possible + if (displayLevel <= 1) EXM_THROW(11, "Operation aborted : %s already exists", output_filename); /* No interaction possible */ ch = (char)getchar(); if ((ch!='Y') && (ch!='y')) EXM_THROW(11, "Operation aborted : %s already exists", output_filename); } @@ -303,44 +303,44 @@ int LZ4IO_compressFilename_Legacy(char* input_filename, char* output_filename, i size_t sizeCheck; - // Init + /* Init */ start = clock(); if (compressionlevel < 3) compressionFunction = LZ4_compress; else compressionFunction = LZ4_compressHC; get_fileHandle(input_filename, output_filename, &finput, &foutput); if ((displayLevel==2) && (compressionlevel==1)) displayLevel=3; - // Allocate Memory + /* Allocate Memory */ in_buff = (char*)malloc(LEGACY_BLOCKSIZE); out_buff = (char*)malloc(LZ4_compressBound(LEGACY_BLOCKSIZE)); if (!in_buff || !out_buff) EXM_THROW(21, "Allocation error : not enough memory"); - // Write Archive Header + /* Write Archive Header */ LZ4IO_writeLE32(out_buff, LEGACY_MAGICNUMBER); sizeCheck = fwrite(out_buff, 1, MAGICNUMBER_SIZE, foutput); if (sizeCheck!=MAGICNUMBER_SIZE) EXM_THROW(22, "Write error : cannot write header"); - // Main Loop + /* Main Loop */ while (1) { unsigned int outSize; - // Read Block + /* Read Block */ int inSize = (int) fread(in_buff, (size_t)1, (size_t)LEGACY_BLOCKSIZE, finput); if( inSize<=0 ) break; filesize += inSize; - // Compress Block + /* Compress Block */ outSize = compressionFunction(in_buff, out_buff+4, inSize); compressedfilesize += outSize+4; DISPLAYUPDATE(3, "\rRead : %i MB ==> %.2f%% ", (int)(filesize>>20), (double)compressedfilesize/filesize*100); - // Write Block + /* Write Block */ LZ4IO_writeLE32(out_buff, outSize); sizeCheck = fwrite(out_buff, 1, outSize+4, foutput); if (sizeCheck!=(size_t)(outSize+4)) EXM_THROW(23, "Write error : cannot write compressed block"); } - // Status + /* Status */ end = clock(); DISPLAYLEVEL(2, "\r%79s\r", ""); DISPLAYLEVEL(2,"Compressed %llu bytes into %llu bytes ==> %.2f%%\n", @@ -350,7 +350,7 @@ int LZ4IO_compressFilename_Legacy(char* input_filename, char* output_filename, i DISPLAYLEVEL(4,"Done in %.2f s ==> %.2f MB/s\n", seconds, (double)filesize / seconds / 1024 / 1024); } - // Close & Free + /* Close & Free */ free(in_buff); free(out_buff); fclose(finput); @@ -380,7 +380,7 @@ int LZ4IO_compressFilename(char* input_filename, char* output_filename, int comp LZ4F_preferences_t prefs = {0}; - // Init + /* Init */ start = clock(); if ((displayLevel==2) && (compressionLevel>=3)) displayLevel=3; errorCode = LZ4F_createCompressionContext(&ctx, LZ4F_VERSION); @@ -388,51 +388,51 @@ int LZ4IO_compressFilename(char* input_filename, char* output_filename, int comp get_fileHandle(input_filename, output_filename, &finput, &foutput); blockSize = LZ4S_GetBlockSize_FromBlockId (globalBlockSizeId); - // Set compression parameters + /* Set compression parameters */ prefs.autoFlush = 1; prefs.compressionLevel = compressionLevel; prefs.frameInfo.blockMode = blockIndependence; prefs.frameInfo.blockSizeID = globalBlockSizeId; prefs.frameInfo.contentChecksumFlag = streamChecksum; - // Allocate Memory + /* Allocate Memory */ in_buff = (char*)malloc(blockSize); outBuffSize = LZ4F_compressBound(blockSize, &prefs); out_buff = (char*)malloc(outBuffSize); if (!in_buff || !out_buff) EXM_THROW(31, "Allocation error : not enough memory"); - // Write Archive Header + /* Write Archive Header */ headerSize = LZ4F_compressBegin(ctx, out_buff, outBuffSize, &prefs); if (LZ4F_isError(headerSize)) EXM_THROW(32, "File header generation failed : %s", LZ4F_getErrorName(headerSize)); sizeCheck = fwrite(out_buff, 1, headerSize, foutput); if (sizeCheck!=headerSize) EXM_THROW(33, "Write error : cannot write header"); compressedfilesize += headerSize; - // read first block + /* read first block */ readSize = fread(in_buff, (size_t)1, (size_t)blockSize, finput); filesize += readSize; - // Main Loop + /* Main Loop */ while (readSize>0) { size_t outSize; - // Compress Block + /* Compress Block */ outSize = LZ4F_compressUpdate(ctx, out_buff, outBuffSize, in_buff, readSize, NULL); if (LZ4F_isError(outSize)) EXM_THROW(34, "Compression failed : %s", LZ4F_getErrorName(outSize)); compressedfilesize += outSize; DISPLAYUPDATE(3, "\rRead : %i MB ==> %.2f%% ", (int)(filesize>>20), (double)compressedfilesize/filesize*100); - // Write Block + /* Write Block */ sizeCheck = fwrite(out_buff, 1, outSize, foutput); if (sizeCheck!=outSize) EXM_THROW(35, "Write error : cannot write compressed block"); - // Read next block + /* Read next block */ readSize = fread(in_buff, (size_t)1, (size_t)blockSize, finput); filesize += readSize; } - // End of Stream mark + /* End of Stream mark */ headerSize = LZ4F_compressEnd(ctx, out_buff, outBuffSize, NULL); if (LZ4F_isError(headerSize)) EXM_THROW(36, "End of file generation failed : %s", LZ4F_getErrorName(headerSize)); @@ -440,7 +440,7 @@ int LZ4IO_compressFilename(char* input_filename, char* output_filename, int comp if (sizeCheck!=headerSize) EXM_THROW(37, "Write error : cannot write end of stream"); compressedfilesize += headerSize; - // Close & Free + /* Close & Free */ free(in_buff); free(out_buff); fclose(finput); @@ -448,7 +448,7 @@ int LZ4IO_compressFilename(char* input_filename, char* output_filename, int comp errorCode = LZ4F_freeCompressionContext(ctx); if (LZ4F_isError(errorCode)) EXM_THROW(38, "Error : can't free LZ4F context resource : %s", LZ4F_getErrorName(errorCode)); - // Final Status + /* Final Status */ end = clock(); DISPLAYLEVEL(2, "\r%79s\r", ""); DISPLAYLEVEL(2, "Compressed %llu bytes into %llu bytes ==> %.2f%%\n", @@ -482,42 +482,42 @@ static unsigned long long decodeLegacyStream(FILE* finput, FILE* foutput) char* in_buff; char* out_buff; - // Allocate Memory + /* Allocate Memory */ in_buff = (char*)malloc(LZ4_compressBound(LEGACY_BLOCKSIZE)); out_buff = (char*)malloc(LEGACY_BLOCKSIZE); if (!in_buff || !out_buff) EXM_THROW(51, "Allocation error : not enough memory"); - // Main Loop + /* Main Loop */ while (1) { int decodeSize; size_t sizeCheck; unsigned int blockSize; - // Block Size + /* Block Size */ sizeCheck = fread(in_buff, 1, 4, finput); - if (sizeCheck==0) break; // Nothing to read : file read is completed - blockSize = LZ4IO_readLE32(in_buff); // Convert to Little Endian + if (sizeCheck==0) break; /* Nothing to read : file read is completed */ + blockSize = LZ4IO_readLE32(in_buff); /* Convert to Little Endian */ if (blockSize > LZ4_COMPRESSBOUND(LEGACY_BLOCKSIZE)) - { // Cannot read next block : maybe new stream ? + { /* Cannot read next block : maybe new stream ? */ fseek(finput, -4, SEEK_CUR); break; } - // Read Block + /* Read Block */ sizeCheck = fread(in_buff, 1, blockSize, finput); - // Decode Block + /* Decode Block */ decodeSize = LZ4_decompress_safe(in_buff, out_buff, blockSize, LEGACY_BLOCKSIZE); if (decodeSize < 0) EXM_THROW(52, "Decoding Failed ! Corrupted input detected !"); filesize += decodeSize; - // Write Block + /* Write Block */ sizeCheck = fwrite(out_buff, 1, decodeSize, foutput); if (sizeCheck != (size_t)decodeSize) EXM_THROW(53, "Write error : cannot write decoded block into output\n"); } - // Free + /* Free */ free(in_buff); free(out_buff); @@ -537,12 +537,12 @@ static unsigned long long decodeLZ4S(FILE* finput, FILE* foutput) LZ4F_errorCode_t errorCode; LZ4F_frameInfo_t frameInfo; - // init + /* init */ errorCode = LZ4F_createDecompressionContext(&ctx, LZ4F_VERSION); if (LZ4F_isError(errorCode)) EXM_THROW(60, "Allocation error : can't create context : %s", LZ4F_getErrorName(errorCode)); LZ4IO_writeLE32(headerBuff, LZ4S_MAGICNUMBER); /* regenerated here, as it was already read from finput */ - // Decode stream descriptor + /* Decode stream descriptor */ outBuffSize = 0; inBuffSize = 0; sizeCheck = MAGICNUMBER_SIZE; nextToRead = LZ4F_decompress(ctx, NULL, &outBuffSize, headerBuff, &sizeCheck, NULL); if (LZ4F_isError(nextToRead)) EXM_THROW(61, "Decompression error : %s", LZ4F_getErrorName(nextToRead)); @@ -553,35 +553,35 @@ static unsigned long long decodeLZ4S(FILE* finput, FILE* foutput) errorCode = LZ4F_getFrameInfo(ctx, &frameInfo, NULL, &inBuffSize); if (LZ4F_isError(errorCode)) EXM_THROW(64, "can't decode frame header : %s", LZ4F_getErrorName(errorCode)); - // Allocate Memory + /* Allocate Memory */ outBuffSize = LZ4IO_setBlockSizeID(frameInfo.blockSizeID); inBuffSize = outBuffSize + 4; inBuff = (char*)malloc(inBuffSize); outBuff = (char*)malloc(outBuffSize); if (!inBuff || !outBuff) EXM_THROW(65, "Allocation error : not enough memory"); - // Main Loop + /* Main Loop */ while (nextToRead != 0) { size_t decodedBytes = outBuffSize; - // Read Block + /* Read Block */ sizeCheck = fread(inBuff, 1, nextToRead, finput); if (sizeCheck!=nextToRead) EXM_THROW(66, "Read error "); - // Decode Block + /* Decode Block */ errorCode = LZ4F_decompress(ctx, outBuff, &decodedBytes, inBuff, &sizeCheck, NULL); if (LZ4F_isError(errorCode)) EXM_THROW(67, "Decompression error : %s", LZ4F_getErrorName(errorCode)); if (sizeCheck!=nextToRead) EXM_THROW(67, "Synchronization error"); nextToRead = errorCode; filesize += decodedBytes; - // Write Block + /* Write Block */ sizeCheck = fwrite(outBuff, 1, decodedBytes, foutput); if (sizeCheck != decodedBytes) EXM_THROW(68, "Write error : cannot write decoded block\n"); } - // Free + /* Free */ free(inBuff); free(outBuff); errorCode = LZ4F_freeDecompressionContext(ctx); @@ -599,12 +599,12 @@ static unsigned long long selectDecoder( FILE* finput, FILE* foutput) int errorNb; size_t nbReadBytes; - // Check Archive Header + /* Check Archive Header */ nbReadBytes = fread(U32store, 1, MAGICNUMBER_SIZE, finput); - if (nbReadBytes==0) return ENDOFSTREAM; // EOF + if (nbReadBytes==0) return ENDOFSTREAM; /* EOF */ if (nbReadBytes != MAGICNUMBER_SIZE) EXM_THROW(40, "Unrecognized header : Magic Number unreadable"); - magicNumber = LZ4IO_readLE32(U32store); // Convert to Little Endian format - if (LZ4S_isSkippableMagicNumber(magicNumber)) magicNumber = LZ4S_SKIPPABLE0; // fold skippable magic numbers + magicNumber = LZ4IO_readLE32(U32store); /* Little Endian format */ + if (LZ4S_isSkippableMagicNumber(magicNumber)) magicNumber = LZ4S_SKIPPABLE0; /* fold skippable magic numbers */ switch(magicNumber) { @@ -617,13 +617,13 @@ static unsigned long long selectDecoder( FILE* finput, FILE* foutput) DISPLAYLEVEL(4, "Skipping detected skippable area \n"); nbReadBytes = fread(U32store, 1, 4, finput); if (nbReadBytes != 4) EXM_THROW(42, "Stream error : skippable size unreadable"); - size = LZ4IO_readLE32(U32store); // Convert to Little Endian format + size = LZ4IO_readLE32(U32store); /* Little Endian format */ errorNb = fseek(finput, size, SEEK_CUR); if (errorNb != 0) EXM_THROW(43, "Stream error : cannot skip skippable area"); return selectDecoder(finput, foutput); EXTENDED_FORMAT; default: - if (ftell(finput) == MAGICNUMBER_SIZE) EXM_THROW(44,"Unrecognized header : file cannot be decoded"); // Wrong magic number at the beginning of 1st stream + if (ftell(finput) == MAGICNUMBER_SIZE) EXM_THROW(44,"Unrecognized header : file cannot be decoded"); /* Wrong magic number at the beginning of 1st stream */ DISPLAYLEVEL(2, "Stream followed by unrecognized data\n"); return ENDOFSTREAM; } @@ -638,11 +638,11 @@ int LZ4IO_decompressFilename(char* input_filename, char* output_filename) clock_t start, end; - // Init + /* Init */ start = clock(); get_fileHandle(input_filename, output_filename, &finput, &foutput); - // Loop over multiple streams + /* Loop over multiple streams */ do { decodedSize = selectDecoder(finput, foutput); @@ -650,7 +650,7 @@ int LZ4IO_decompressFilename(char* input_filename, char* output_filename) filesize += decodedSize; } while (decodedSize != ENDOFSTREAM); - // Final Status + /* Final Status */ end = clock(); DISPLAYLEVEL(2, "\r%79s\r", ""); DISPLAYLEVEL(2, "Successfully decoded %llu bytes \n", filesize); @@ -659,11 +659,11 @@ int LZ4IO_decompressFilename(char* input_filename, char* output_filename) DISPLAYLEVEL(4, "Done in %.2f s ==> %.2f MB/s\n", seconds, (double)filesize / seconds / 1024 / 1024); } - // Close + /* Close */ fclose(finput); fclose(foutput); - // Error status = OK + /* Error status = OK */ return 0; } |