From: Bruno Haible Date: Mon, 3 Apr 2023 12:24:39 +0000 (+0200) Subject: mbrtoc32 tests: Prefer *c32* functions. X-Git-Tag: v1.0~1526 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=13679eb960abb41db5557bf364d7b31bc27d6f55;p=gnulib.git mbrtoc32 tests: Prefer *c32* functions. * tests/test-mbrtoc32.c (main): Use btoc32 instead of btowc. * modules/mbrtoc32-tests (Depends-on): Add btoc32. --- diff --git a/ChangeLog b/ChangeLog index 7bc1a008f1..901aa4331a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-04-03 Bruno Haible + + mbrtoc32 tests: Prefer *c32* functions. + * tests/test-mbrtoc32.c (main): Use btoc32 instead of btowc. + * modules/mbrtoc32-tests (Depends-on): Add btoc32. + 2023-04-03 Bruno Haible mbrtoc32 tests: Add comment. diff --git a/modules/mbrtoc32-tests b/modules/mbrtoc32-tests index e123772a20..95cc4750bd 100644 --- a/modules/mbrtoc32-tests +++ b/modules/mbrtoc32-tests @@ -22,6 +22,7 @@ m4/codeset.m4 Depends-on: mbsinit +btoc32 c32tob setlocale localcharset diff --git a/tests/test-mbrtoc32.c b/tests/test-mbrtoc32.c index a40309004e..ecde031f36 100644 --- a/tests/test-mbrtoc32.c +++ b/tests/test-mbrtoc32.c @@ -397,7 +397,7 @@ main (int argc, char *argv[]) else /* On most platforms, the bytes 0x80..0xFF map to U+0080..U+00FF. But on musl libc, the bytes 0x80..0xFF map to U+DF80..U+DFFF. */ - ASSERT (wc == (btowc (c) == 0xDF00 + c ? btowc (c) : c)); + ASSERT (wc == (btoc32 (c) == 0xDF00 + c ? btoc32 (c) : c)); ASSERT (mbsinit (&state)); ret = mbrtoc32 (NULL, buf, 1, &state);