2023-07-18 Bruno Haible <bruno@clisp.org>
+ mbspcasecmp: Optimize.
+ * lib/mbspcasecmp.c: Include mbuiterf.h instead of mbuiter.h.
+ (mbspcasecmp): Use mbuif_* macros instead of mbui_* macros.
+ * modules/mbspcasecmp (Depends-on): Add mbuiterf. Remove mbuiter.
+
mbsncasecmp: Optimize.
* lib/mbsncasecmp.c: Include mbuiterf.h instead of mbuiter.h.
(mbsncasecmp): Use mbuif_* macros instead of mbui_* macros.
#include <ctype.h>
-#include "mbuiter.h"
+#include "mbuiterf.h"
#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
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 = string;
- mbui_init (iter1, string);
- mbui_init (iter2, prefix);
+ mbuif_state_t state2;
+ const char *iter2;
+ mbuif_init (state2);
+ iter2 = prefix;
- 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 NULL;
- mbui_advance (iter1);
- mbui_advance (iter2);
+ iter1 += mb_len (cur1);
+ iter2 += mb_len (cur2);
}
- if (!mbui_avail (iter2))
+ if (!mbuif_avail (state2, iter2))
/* PREFIX equals STRING or is terminated before STRING. */
- return (char *) mbui_cur_ptr (iter1);
+ return (char *) iter1;
else
/* STRING terminated before PREFIX. */
return NULL;