From 1ed13c54d8e78b81da512b3bd37799557d6bd65d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 18 Jul 2023 13:35:10 +0200 Subject: [PATCH] mbscasecmp: Optimize. * lib/mbscasecmp.c: Include mbuiterf.h instead of mbuiter.h. (mbscasecmp): Use mbuif_* macros instead of mbui_* macros. * modules/mbscasecmp (Depends-on): Add mbuiterf. Remove mbuiter. --- ChangeLog | 5 +++++ lib/mbscasecmp.c | 28 +++++++++++++++++----------- modules/mbscasecmp | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03a2465c0b..92d747f4e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2023-07-18 Bruno Haible + mbscasecmp: Optimize. + * lib/mbscasecmp.c: Include mbuiterf.h instead of mbuiter.h. + (mbscasecmp): Use mbuif_* macros instead of mbui_* macros. + * modules/mbscasecmp (Depends-on): Add mbuiterf. Remove mbuiter. + mbssep: Optimize. * lib/mbssep.c: Include mbuiterf.h instead of mbuiter.h. (mbssep): Use mbuif_* macros instead of mbui_* macros. diff --git a/lib/mbscasecmp.c b/lib/mbscasecmp.c index 03292a5cd7..58c0c7c56e 100644 --- a/lib/mbscasecmp.c +++ b/lib/mbscasecmp.c @@ -24,7 +24,7 @@ #include #include -#include "mbuiter.h" +#include "mbuiterf.h" #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) @@ -44,26 +44,32 @@ mbscasecmp (const char *s1, const char *s2) most often already in the very few first characters. */ if (MB_CUR_MAX > 1) { - mbui_iterator_t iter1; - mbui_iterator_t iter2; + mbuif_state_t state1; + const char *iter1; + mbuif_init (state1); + iter1 = s1; - mbui_init (iter1, s1); - mbui_init (iter2, s2); + mbuif_state_t state2; + const char *iter2; + mbuif_init (state2); + iter2 = s2; - while (mbui_avail (iter1) && mbui_avail (iter2)) + while (mbuif_avail (state1, iter1) && mbuif_avail (state2, iter2)) { - int cmp = mb_casecmp (mbui_cur (iter1), mbui_cur (iter2)); + mbchar_t cur1 = mbuif_next (state1, iter1); + mbchar_t cur2 = mbuif_next (state2, iter2); + int cmp = mb_casecmp (cur1, cur2); if (cmp != 0) return cmp; - mbui_advance (iter1); - mbui_advance (iter2); + iter1 += mb_len (cur1); + iter2 += mb_len (cur2); } - if (mbui_avail (iter1)) + if (mbuif_avail (state1, iter1)) /* s2 terminated before s1. */ return 1; - if (mbui_avail (iter2)) + if (mbuif_avail (state2, iter2)) /* s1 terminated before s2. */ return -1; return 0; diff --git a/modules/mbscasecmp b/modules/mbscasecmp index d0dcdf6d29..234b7bc7a3 100644 --- a/modules/mbscasecmp +++ b/modules/mbscasecmp @@ -5,7 +5,7 @@ Files: lib/mbscasecmp.c Depends-on: -mbuiter +mbuiterf string configure.ac: -- 2.39.5