From 9ca0b47c2ae72c9c55f7443c2bf68feacb95290a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 16 Jul 2023 07:30:27 +0200 Subject: [PATCH] btoc32: Optimize clearing an mbstate_t. * lib/btoc32.c: Include . (btoc32): Use mbszero. * modules/btoc32 (Depends-on): Add mbszero. --- ChangeLog | 7 +++++++ lib/btoc32.c | 3 ++- modules/btoc32 | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8694418f5a..efb0dbf600 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-07-16 Bruno Haible + + btoc32: Optimize clearing an mbstate_t. + * lib/btoc32.c: Include . + (btoc32): Use mbszero. + * modules/btoc32 (Depends-on): Add mbszero. + 2023-07-16 Bruno Haible btowc: Optimize clearing an mbstate_t. diff --git a/lib/btoc32.c b/lib/btoc32.c index c5ed227a8b..4d5b9067e7 100644 --- a/lib/btoc32.c +++ b/lib/btoc32.c @@ -24,6 +24,7 @@ #include #include +#include #if GL_CHAR32_T_IS_UNICODE # include "lc-charset-unicode.h" @@ -44,7 +45,7 @@ btoc32 (int c) char s[1]; char32_t wc; - memset (&state, '\0', sizeof (mbstate_t)); + mbszero (&state); s[0] = (unsigned char) c; if (mbrtoc32 (&wc, s, 1, &state) <= 1) return wc; diff --git a/modules/btoc32 b/modules/btoc32 index 1a532a9eb3..e6385398ec 100644 --- a/modules/btoc32 +++ b/modules/btoc32 @@ -6,6 +6,7 @@ lib/btoc32.c Depends-on: uchar +mbszero mbrtoc32 btowc -- 2.39.5