From d1389ac3ffadfc0fd105b62b4c462dba49217727 Mon Sep 17 00:00:00 2001 From: Bimba Shrestha Date: Mon, 3 Feb 2020 09:52:39 -0800 Subject: [PATCH] Adding assert(NB_STRATEGIES == upperLimit) --- programs/zstdcli.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/zstdcli.c b/programs/zstdcli.c index c9187475..341f38cb 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -544,9 +544,7 @@ static int init_cLevel(void) { return ZSTDCLI_CLEVEL_DEFAULT; } -#define ZSTD_CLI_STATIC_ASSERT(c) (void)sizeof(char[(c) ? 1 : -1]) - -#define ZSTD_NB_STRATEGIES ZSTD_STRATEGY_MAX +#define ZSTD_NB_STRATEGIES 9 static const char* ZSTD_strategyMap[ZSTD_NB_STRATEGIES + 1] = { "", "ZSTD_fast", "ZSTD_dfast", "ZSTD_greedy", "ZSTD_lazy", "ZSTD_lazy2", "ZSTD_btlazy2", @@ -1230,7 +1228,9 @@ int main(int const argCount, const char* argv[]) if (adaptMin > cLevel) cLevel = adaptMin; if (adaptMax < cLevel) cLevel = adaptMax; - ZSTD_CLI_STATIC_ASSERT(ZSTD_NB_STRATEGIES >= ZSTD_STRATEGY_MIN && ZSTD_NB_STRATEGIES <= ZSTD_STRATEGY_MAX); + /* Compare strategies constant with the ground truth */ + { ZSTD_bounds strategyBounds = ZSTD_cParam_getBounds(ZSTD_c_strategy); + assert(ZSTD_NB_STRATEGIES == strategyBounds.upperBound);} if (showDefaultCParams) { size_t fileNb;