diff options
Diffstat (limited to 'maildir')
| -rw-r--r-- | maildir/maildirsearch.c | 6 | ||||
| -rw-r--r-- | maildir/maildirsearch.h | 13 | ||||
| -rw-r--r-- | maildir/testmaildirsearch.c | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/maildir/maildirsearch.c b/maildir/maildirsearch.c index 40b7409..5853785 100644 --- a/maildir/maildirsearch.c +++ b/maildir/maildirsearch.c @@ -8,7 +8,7 @@ int maildir_search_start_unicode(struct maildir_searchengine *sei, - const unicode_char *s) + const char32_t *s) { unsigned i, j, *r; @@ -54,7 +54,7 @@ int maildir_search_start_unicode(struct maildir_searchengine *sei, int maildir_search_start_str(struct maildir_searchengine *sei, const char *s) { - unicode_char *uc=malloc((strlen(s)+1) * sizeof(unicode_char)); + char32_t *uc=malloc((strlen(s)+1) * sizeof(char32_t)); size_t n; int rc; @@ -75,7 +75,7 @@ int maildir_search_start_str_chset(struct maildir_searchengine *engine, { #define SPC(s) ((s) == ' '|| (s) == '\t' || (s) == '\r' || (s) == '\n') - unicode_char *ucptr; + char32_t *ucptr; size_t ucsize; unicode_convert_handle_t h=unicode_convert_tou_init(chset, &ucptr, &ucsize, 1); diff --git a/maildir/maildirsearch.h b/maildir/maildirsearch.h index b134c6d..64b257c 100644 --- a/maildir/maildirsearch.h +++ b/maildir/maildirsearch.h @@ -46,9 +46,9 @@ extern "C" { #endif struct maildir_searchengine { - unicode_char *string; + char32_t *string; size_t string_l; - const unicode_char *ptr; + const char32_t *ptr; unsigned *r; /* Retry backoff indexes */ unsigned i; int spc; @@ -64,7 +64,7 @@ int maildir_search_start_str_chset(struct maildir_searchengine *engine, const char *string, const char *chset); int maildir_search_start_unicode(struct maildir_searchengine *engine, - const unicode_char *string); + const char32_t *string); #define maildir_search_reset(si) ((si)->i=0, (si)->ptr=(si)->string) @@ -79,7 +79,7 @@ int maildir_search_start_unicode(struct maildir_searchengine *engine, {\ for (;;) \ {\ - if ( (unicode_char)(sie)->ptr[(sie)->i] == (unicode_char)(ch) )\ + if ( (char32_t)(sie)->ptr[(sie)->i] == (char32_t)(ch) )\ { (sie)->i++; break; }\ if ( (sie)->i == 0) break;\ (sie)->i=(sie)->r[(sie)->i];\ @@ -89,7 +89,7 @@ int maildir_search_start_unicode(struct maildir_searchengine *engine, #define maildir_search_step_unicode_lc(sie,ch) do \ { \ - unicode_char c=(ch); \ + char32_t c=(ch); \ int spc=0; \ \ \ @@ -162,7 +162,7 @@ class Search { void operator<<(char c) { maildir_search_step(&sei, c); } - void operator<<(unicode_char ch) + void operator<<(char32_t ch) { maildir_search_step_unicode_lc(&sei, ch); } @@ -184,4 +184,3 @@ class Search { #endif #endif - diff --git a/maildir/testmaildirsearch.c b/maildir/testmaildirsearch.c index 504304d..dc3288a 100644 --- a/maildir/testmaildirsearch.c +++ b/maildir/testmaildirsearch.c @@ -10,7 +10,7 @@ static int testmaildirsearch(const char *chset, const char *needle, const char *haystack) { struct maildir_searchengine se; - unicode_char *ucptr; + char32_t *ucptr; size_t ucsize; size_t i; unicode_convert_handle_t h=unicode_convert_tou_init(chset, &ucptr, |