From 2a68c7bfc95c9e4fb58a29362bbb8de66e70add8 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sun, 5 Jan 2025 21:07:28 +0100 Subject: [PATCH 1/2] Fix -Wunterminated-string-initialization warning Unbreaks the Cygwin build. --- cutils.c | 8 +++++++- tests/test_conv.c | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cutils.c b/cutils.c index 9f202e52e..8dc27dd45 100644 --- a/cutils.c +++ b/cutils.c @@ -590,7 +590,13 @@ size_t utf8_encode_buf16(char *dest, size_t dest_len, const uint16_t *src, size_ */ /* 2 <= base <= 36 */ -char const digits36[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; +char const digits36[36] = { + '0','1','2','3','4','5','6','7','8','9', + 'a','b','c','d','e','f','g','h','i','j', + 'k','l','m','n','o','p','q','r','s','t', + 'u','v','w','x','y','z' +}; + #define USE_SPECIAL_RADIX_10 1 // special case base 10 radix conversions #define USE_SINGLE_CASE_FAST 1 // special case single digit numbers diff --git a/tests/test_conv.c b/tests/test_conv.c index d53e18858..b9c80a66f 100644 --- a/tests/test_conv.c +++ b/tests/test_conv.c @@ -133,7 +133,12 @@ size_t i64toa_radix(char buf[minimum_length(66)], int64_t n, unsigned base); */ /* 2 <= base <= 36 */ -char const digits36[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; +char const digits36[36] = { + '0','1','2','3','4','5','6','7','8','9', + 'a','b','c','d','e','f','g','h','i','j', + 'k','l','m','n','o','p','q','r','s','t', + 'u','v','w','x','y','z' +}; /*---- variants ----*/ From c0546df073666b65cf7ac22bcc4da3570f11bb0f Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sun, 5 Jan 2025 21:18:12 +0100 Subject: [PATCH 2/2] squash! one more --- tests/test_conv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_conv.c b/tests/test_conv.c index b9c80a66f..db4e58dac 100644 --- a/tests/test_conv.c +++ b/tests/test_conv.c @@ -243,7 +243,7 @@ define_i64toa(shift) #endif /* TEST_SHIFTBUF */ #if defined(TEST_DIGIT_PAIRS) || defined(TEST_DIGIT_1PASS) -static char const digits100[200] = +static char const digits100[] = "00010203040506070809" "10111213141516171819" "20212223242526272829"