From: Bruno Haible Date: Tue, 18 Jul 2023 11:04:04 +0000 (+0200) Subject: mbiterf: Fix compiler warnings. X-Git-Tag: v1.0~1076 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=f8461b3c2085d05bab23e39a365af5edd503b0a9;p=gnulib.git mbiterf: Fix compiler warnings. * lib/mbiterf.h (mbiterf_next): Use C99 designated initializer syntax. * tests/bench-mbiterf.c (do_test): Use a 'const char *' pointer. --- diff --git a/ChangeLog b/ChangeLog index af0f128722..a4aa3b1714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2023-07-18 Bruno Haible + mbiterf: Fix compiler warnings. + * lib/mbiterf.h (mbiterf_next): Use C99 designated initializer syntax. + * tests/bench-mbiterf.c (do_test): Use a 'const char *' pointer. + trim: Optimize. * lib/trim.c: Include mbiterf.h instead of mbiter.h. (trim2): Use mbif_* macros instead of mbi_* macros. diff --git a/lib/mbiterf.h b/lib/mbiterf.h index 0059c97fbd..f5a817dbed 100644 --- a/lib/mbiterf.h +++ b/lib/mbiterf.h @@ -120,7 +120,7 @@ mbiterf_next (struct mbif_state *ps, const char *iter, const char *endptr) their char code. For the few other ones, this is the case as well, in all locale encodings that are in use. The 32-bit wide character code is the same as well. */ - return (mbchar_t) { ptr: iter, bytes: 1, wc_valid: true, wc: *iter }; + return (mbchar_t) { .ptr = iter, .bytes = 1, .wc_valid = true, .wc = *iter }; } else { @@ -140,7 +140,7 @@ mbiterf_next (struct mbif_state *ps, const char *iter, const char *endptr) ps->in_shift = false; #endif mbszero (&ps->state); - return (mbchar_t) { ptr: iter, bytes: 1, wc_valid: false }; + return (mbchar_t) { .ptr = iter, .bytes = 1, .wc_valid = false }; } else if (bytes == (size_t) -2) { @@ -150,7 +150,7 @@ mbiterf_next (struct mbif_state *ps, const char *iter, const char *endptr) #endif /* Whether to reset ps->state or not is not important; the string end is reached anyway. */ - return (mbchar_t) { ptr: iter, bytes: endptr - iter, wc_valid: false }; + return (mbchar_t) { .ptr = iter, .bytes = endptr - iter, .wc_valid = false }; } else { @@ -174,7 +174,7 @@ mbiterf_next (struct mbif_state *ps, const char *iter, const char *endptr) if (mbsinit (&ps->state)) ps->in_shift = false; #endif - return (mbchar_t) { ptr: iter, bytes: bytes, wc_valid: true, wc: wc }; + return (mbchar_t) { .ptr = iter, .bytes = bytes, .wc_valid = true, .wc = wc }; } } } diff --git a/tests/bench-mbiterf.c b/tests/bench-mbiterf.c index 0949fb6752..bc3fbe4828 100644 --- a/tests/bench-mbiterf.c +++ b/tests/bench-mbiterf.c @@ -43,7 +43,7 @@ do_test (char test, int repeat, const char *locale_name, const char *text) unsigned long long sum = 0; const char *text_end = text + text_len; mbif_state_t state; - char *iter; + const char *iter; for (mbif_init (state), iter = text; mbif_avail (state, iter, text_end); ) { mbchar_t cur = mbif_next (state, iter, text_end);