From cce302ee0b1688f7e0314362970045e440d362f2 Mon Sep 17 00:00:00 2001 From: Nathan Moinvaziri Date: Thu, 1 Oct 2020 23:10:19 -0700 Subject: [PATCH] Fixed conditional expression is constant maintainer warnings. chunkset_tpl.h(42,47): warning C4127: conditional expression is constant functable.c(381,44): warning C4127: conditional expression is constant --- chunkset_tpl.h | 3 ++- functable.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/chunkset_tpl.h b/chunkset_tpl.h index 29e514fb..9e8ede55 100644 --- a/chunkset_tpl.h +++ b/chunkset_tpl.h @@ -38,7 +38,8 @@ Z_INTERNAL uint8_t* CHUNKCOPY(uint8_t *out, uint8_t const *from, unsigned len) { /* Behave like chunkcopy, but avoid writing beyond of legal output. */ Z_INTERNAL uint8_t* CHUNKCOPY_SAFE(uint8_t *out, uint8_t const *from, unsigned len, uint8_t *safe) { if ((safe - out) < (ptrdiff_t)sizeof(chunk_t)) { - if (sizeof(chunk_t) > 16 && (len & 16)) { + int32_t use_chunk16 = sizeof(chunk_t) > 16 && (len & 16); + if (use_chunk16) { memcpy(out, from, 16); out += 16; from += 16; diff --git a/functable.c b/functable.c index 782e7fd0..acae4464 100644 --- a/functable.c +++ b/functable.c @@ -371,6 +371,7 @@ Z_INTERNAL uint8_t* chunkmemset_safe_stub(uint8_t *out, unsigned dist, unsigned } Z_INTERNAL uint32_t crc32_stub(uint32_t crc, const unsigned char *buf, uint64_t len) { + int32_t use_byfour = sizeof(void *) == sizeof(ptrdiff_t); Assert(sizeof(uint64_t) >= sizeof(size_t), "crc32_z takes size_t but internally we have a uint64_t len"); @@ -378,7 +379,7 @@ Z_INTERNAL uint32_t crc32_stub(uint32_t crc, const unsigned char *buf, uint64_t cpu_check_features(); - if (sizeof(void *) == sizeof(ptrdiff_t)) { + if (use_byfour) { #if BYTE_ORDER == LITTLE_ENDIAN functable.crc32 = crc32_little; # if defined(ARM_ACLE_CRC_HASH) -- 2.47.2