diff options
author | Przemyslaw Skibinski <inikep@gmail.com> | 2016-12-27 09:43:07 (GMT) |
---|---|---|
committer | Przemyslaw Skibinski <inikep@gmail.com> | 2016-12-27 09:43:07 (GMT) |
commit | efaa9b7bc72a037bddee530b8dcaefa53c9c999d (patch) | |
tree | 2ae32cac8cd397e2d3604d8172d18c61761496fa /programs/bench.c | |
parent | b22e2bed5e44f2cdacb11cf01d4a15a00bcb76ca (diff) | |
parent | 19c0f21b000ababf11cb38e0d6154742f5e1cd83 (diff) | |
download | lz4-efaa9b7bc72a037bddee530b8dcaefa53c9c999d.zip lz4-efaa9b7bc72a037bddee530b8dcaefa53c9c999d.tar.gz lz4-efaa9b7bc72a037bddee530b8dcaefa53c9c999d.tar.bz2 |
Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
# Conflicts:
# lib/Makefile
Diffstat (limited to 'programs/bench.c')
-rw-r--r-- | programs/bench.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/programs/bench.c b/programs/bench.c index 01e610c..8311503 100644 --- a/programs/bench.c +++ b/programs/bench.c @@ -179,7 +179,7 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize, UTIL_initTimer(&ticksPerSecond); /* Init */ - if (cLevel < LZ4HC_MIN_CLEVEL) cfunctionId = 0; else cfunctionId = 1; + if (cLevel < LZ4HC_CLEVEL_MIN) cfunctionId = 0; else cfunctionId = 1; switch (cfunctionId) { #ifdef COMPRESSOR0 @@ -503,8 +503,8 @@ int BMK_benchFiles(const char** fileNamesTable, unsigned nbFiles, { double const compressibility = (double)g_compressibilityDefault / 100; - if (cLevel > LZ4HC_MAX_CLEVEL) cLevel = LZ4HC_MAX_CLEVEL; - if (cLevelLast > LZ4HC_MAX_CLEVEL) cLevelLast = LZ4HC_MAX_CLEVEL; + if (cLevel > LZ4HC_CLEVEL_MAX) cLevel = LZ4HC_CLEVEL_MAX; + if (cLevelLast > LZ4HC_CLEVEL_MAX) cLevelLast = LZ4HC_CLEVEL_MAX; if (cLevelLast < cLevel) cLevelLast = cLevel; if (cLevelLast > cLevel) DISPLAYLEVEL(2, "Benchmarking levels from %d to %d\n", cLevel, cLevelLast); |