From 51c2f5acd64ef87f1023d9907e9c47daad624e35 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 18 Jul 2023 13:33:08 +0200 Subject: [PATCH] mbssep: Optimize. * lib/mbssep.c: Include mbuiterf.h instead of mbuiter.h. (mbssep): Use mbuif_* macros instead of mbui_* macros. * modules/mbssep (Depends-on): Add mbuiterf. Remove mbuiter. --- ChangeLog | 5 +++++ lib/mbssep.c | 13 ++++++------- modules/mbssep | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0288b7ebc..03a2465c0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2023-07-18 Bruno Haible + mbssep: Optimize. + * lib/mbssep.c: Include mbuiterf.h instead of mbuiter.h. + (mbssep): Use mbuif_* macros instead of mbui_* macros. + * modules/mbssep (Depends-on): Add mbuiterf. Remove mbuiter. + mbsrchr: Optimize. * lib/mbsrchr.c: Include mbuiterf.h instead of mbuiter.h. (mbsrchr): Use mbuif_* macros instead of mbui_* macros. diff --git a/lib/mbssep.c b/lib/mbssep.c index 6158b55562..31df5d1cef 100644 --- a/lib/mbssep.c +++ b/lib/mbssep.c @@ -22,7 +22,7 @@ #include -#include "mbuiter.h" +#include "mbuiterf.h" char * mbssep (char **stringp, const char *delim) @@ -47,14 +47,13 @@ mbssep (char **stringp, const char *delim) } else { - mbui_iterator_t iter; - - mbui_init (iter, ptr); - if (!mbui_avail (iter)) + mbuif_state_t state; + mbuif_init (state); + if (!mbuif_avail (state, ptr)) abort (); - mbui_advance (iter); + mbchar_t cur = mbuif_next (state, ptr); *ptr = '\0'; - *stringp = (char *) mbui_cur_ptr (iter); + *stringp = ptr + mb_len (cur); return start; } } diff --git a/modules/mbssep b/modules/mbssep index a79538e21e..6672d64641 100644 --- a/modules/mbssep +++ b/modules/mbssep @@ -5,7 +5,7 @@ Files: lib/mbssep.c Depends-on: -mbuiter +mbuiterf string mbspbrk strsep -- 2.39.5