root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Tests: Fix C99/C11 compatibility when features are disabled 

The array could become empty and then the initializer would be
simply {} which is allowed only in GNU-C and C23.

(cherry picked from commit b101e1d1db)
This commit is contained in:
Lasse Collin 2024-04-22 16:39:44 +03:00
parent 9a70e93fef
commit d2ed675959
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_filter_flags.c
View File

@ -50,6 +50,7 @@ static lzma_filter bcj_filters_encoders[] = {
#ifdef HAVE_ENCODER_RISCV #ifdef HAVE_ENCODER_RISCV
{ LZMA_FILTER_RISCV, NULL }, { LZMA_FILTER_RISCV, NULL },
#endif #endif
{ LZMA_VLI_UNKNOWN, NULL }
}; };
// HAVE_ENCODERS ifdef not terminated here because decoders are // HAVE_ENCODERS ifdef not terminated here because decoders are
@ -82,6 +83,7 @@ static lzma_filter bcj_filters_decoders[] = {
#ifdef HAVE_DECODER_RISCV #ifdef HAVE_DECODER_RISCV
{ LZMA_FILTER_RISCV, NULL }, { LZMA_FILTER_RISCV, NULL },
#endif #endif
{ LZMA_VLI_UNKNOWN, NULL }
}; };
#endif #endif
#endif #endif
@ -109,12 +111,8 @@ test_lzma_filter_flags_size(void)
assert_true(size != 0 && size < LZMA_BLOCK_HEADER_SIZE_MAX); assert_true(size != 0 && size < LZMA_BLOCK_HEADER_SIZE_MAX);
} }
// Do not use macro ARRAY_SIZE() in the for loop condition directly. for (size_t i = 0; bcj_filters_encoders[i].id != LZMA_VLI_UNKNOWN;
// If the BCJ filters are not configured and built, then ARRAY_SIZE() ++i) {
// will return 0 and cause a warning because the for loop will never
// execute since any unsigned number cannot be < 0 (-Werror=type-limits).
const uint32_t bcj_array_size = ARRAY_SIZE(bcj_filters_encoders);
for (uint32_t i = 0; i < bcj_array_size; i++) {
assert_lzma_ret(lzma_filter_flags_size(&size, assert_lzma_ret(lzma_filter_flags_size(&size,
&bcj_filters_encoders[i]), LZMA_OK); &bcj_filters_encoders[i]), LZMA_OK);
assert_true(size != 0 && size < LZMA_BLOCK_HEADER_SIZE_MAX); assert_true(size != 0 && size < LZMA_BLOCK_HEADER_SIZE_MAX);
@ -225,8 +223,8 @@ test_lzma_filter_flags_encode(void)
.start_offset = 257 .start_offset = 257
}; };
const uint32_t bcj_array_size = ARRAY_SIZE(bcj_filters_encoders); for (size_t i = 0; bcj_filters_encoders[i].id != LZMA_VLI_UNKNOWN;
for (uint32_t i = 0; i < bcj_array_size; i++) { ++i) {
// NULL options should pass for bcj filters // NULL options should pass for bcj filters
verify_filter_flags_encode(&bcj_filters_encoders[i], true); verify_filter_flags_encode(&bcj_filters_encoders[i], true);
lzma_filter bcj_with_options = { lzma_filter bcj_with_options = {
@ -388,8 +386,8 @@ test_lzma_filter_flags_decode(void)
free(decoded); free(decoded);
} }
const uint32_t bcj_array_size = ARRAY_SIZE(bcj_filters_decoders); for (size_t i = 0; bcj_filters_decoders[i].id != LZMA_VLI_UNKNOWN;
for (uint32_t i = 0; i < bcj_array_size; i++) { ++i) {
if (lzma_filter_encoder_is_supported( if (lzma_filter_encoder_is_supported(
bcj_filters_decoders[i].id)) { bcj_filters_decoders[i].id)) {
lzma_filter bcj_decoded = { lzma_filter bcj_decoded = {