diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2014-12-13 14:05:46 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2014-12-13 14:05:46 (GMT) |
| commit | daa320f3f7bd9cc121462ef7a201fad87f540bd6 (patch) | |
| tree | 10a05dcdcfb7255c21e6663dbae8f5fa8351b51c /programs | |
| parent | 8f844fe70068d2a632e7f0e24ecfa05a1d3e1302 (diff) | |
| download | lz4-daa320f3f7bd9cc121462ef7a201fad87f540bd6.zip lz4-daa320f3f7bd9cc121462ef7a201fad87f540bd6.tar.gz lz4-daa320f3f7bd9cc121462ef7a201fad87f540bd6.tar.bz2 | |
New : lz4frame integrated into liblz4 (v1.5.0)
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/Makefile | 6 | ||||
| -rw-r--r-- | programs/frametest.c | 6 | ||||
| -rw-r--r-- | programs/lz4cli.c | 16 |
3 files changed, 14 insertions, 14 deletions
diff --git a/programs/Makefile b/programs/Makefile index aaaa00e..f097d06 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,11 +31,10 @@ # 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)\" FLAGS = -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) 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..b755ab8 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -55,7 +55,7 @@ //**************************** // Includes //**************************** -#include <stdio.h> // fprintf, fopen, fread, _fileno, stdin, stdout +#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 @@ -85,7 +85,7 @@ //**************************** #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__ @@ -136,13 +136,13 @@ static char* programName; #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) +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(); @@ -190,7 +190,7 @@ int usage_advanced(void) return 0; } -int usage_longhelp(void) +static int usage_longhelp(void) { DISPLAY( "\n"); DISPLAY( "Which values can get [output] ? \n"); @@ -240,7 +240,7 @@ int usage_longhelp(void) 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(); |