# HG changeset patch # User Timo Sirainen # Date 1181525870 -10800 # Node ID d7302155b97f6ba666c62bcf871332d19191ec03 # Parent 8101787cdd1c29339f4103cb3be9da1744843e83 Fixed to work with the new unichar API diff -r 8101787cdd1c -r d7302155b97f src/plugins/fts-squat/squat-trie.c --- a/src/plugins/fts-squat/squat-trie.c Mon Jun 11 04:37:29 2007 +0300 +++ b/src/plugins/fts-squat/squat-trie.c Mon Jun 11 04:37:50 2007 +0300 @@ -226,14 +226,13 @@ /* FIXME: can we do anything better than just truncate with >16bit values? */ - uchr = uni_utf8_get_char_len(src+i, size-i); - if (uchr == (unichar_t)-1) + if (uni_utf8_get_char_n(src+i, size-i, &uchr) <= 0) chr = 0; else { uchr -= 32 - 26; chr = uchr < (uint16_t)-1 ? uchr : 0; } - i += uni_utf8_skip[src[i] & 0xff] - 1; + i += uni_utf8_char_bytes(src[i]) - 1; } buffer_append(dest, &chr, sizeof(chr)); }