From 5b957ba8997e0ae5b32f8125ea02a8e2205aa3a9 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 17 Nov 2017 01:21:40 -0800 Subject: [PATCH] minor interface adjustments --- Makefile | 5 ----- programs/bench.c | 6 +++--- programs/bench.h | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9f4b1fe4d..9c2657052 100644 --- a/Makefile +++ b/Makefile @@ -130,11 +130,6 @@ uninstall: travis-install: $(MAKE) install PREFIX=~/install_test_dir -.PHONY: gppbuild -gppbuild: clean - g++ -v - CC=g++ $(MAKE) -C programs all CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror" - .PHONY: gcc5build gcc5build: clean gcc-5 -v diff --git a/programs/bench.c b/programs/bench.c index e28bed747..27952169f 100644 --- a/programs/bench.c +++ b/programs/bench.c @@ -622,7 +622,7 @@ static void BMK_benchFileTable(const char* const * const fileNamesTable, unsigne } -static void BMK_syntheticTest(int cLevel, int cLevelLast, double compressibility, ZSTD_compressionParameters* compressionParams) +static void BMK_syntheticTest(int cLevel, int cLevelLast, double compressibility, const ZSTD_compressionParameters* compressionParams) { char name[20] = {0}; size_t benchedSize = 10000000; @@ -643,10 +643,10 @@ static void BMK_syntheticTest(int cLevel, int cLevelLast, double compressibility } -int BMK_benchFiles(const char** const fileNamesTable, unsigned const nbFiles, +int BMK_benchFiles(const char** fileNamesTable, unsigned nbFiles, const char* dictFileName, int cLevel, int cLevelLast, - ZSTD_compressionParameters* compressionParams) + const ZSTD_compressionParameters* compressionParams) { double const compressibility = (double)g_compressibilityDefault / 100; diff --git a/programs/bench.h b/programs/bench.h index 597f25036..d2ec94ee3 100644 --- a/programs/bench.h +++ b/programs/bench.h @@ -16,8 +16,8 @@ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_compressionParameters */ #include "zstd.h" /* ZSTD_compressionParameters */ -int BMK_benchFiles(const char** fileNamesTable, unsigned nbFiles,const char* dictFileName, - int cLevel, int cLevelLast, ZSTD_compressionParameters* compressionParams); +int BMK_benchFiles(const char** fileNamesTable, unsigned nbFiles, const char* dictFileName, + int cLevel, int cLevelLast, const ZSTD_compressionParameters* compressionParams); /* Set Parameters */ void BMK_setNbSeconds(unsigned nbLoops);