dovecot-2.2: lib-fts: Removed make_uchar() return value.
dovecot at dovecot.org
dovecot at dovecot.org
Sat May 9 08:32:24 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/8c33d375c73e
changeset: 18554:8c33d375c73e
user: Teemu Huovila <teemu.huovila at dovecot.fi>
date: Sat May 09 11:10:31 2015 +0300
description:
lib-fts: Removed make_uchar() return value.
It was already de facto meaningless, so best we remove it.
diffstat:
src/lib-fts/fts-filter-normalizer-icu.c | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diffs (66 lines):
diff -r 3ae8ae7f1022 -r 8c33d375c73e src/lib-fts/fts-filter-normalizer-icu.c
--- a/src/lib-fts/fts-filter-normalizer-icu.c Sat May 09 11:09:37 2015 +0300
+++ b/src/lib-fts/fts-filter-normalizer-icu.c Sat May 09 11:10:31 2015 +0300
@@ -48,8 +48,7 @@
va_end(args);
}
-/* Helper to create UTF16, which libicu wants as input. Returns -1 on
- error, 0 on success.
+/* Helper to create UTF16, which libicu wants as input.
On input, if *dst_uchars_r > 0, it indicates the number of UChar
sized units that should be allocated for the text. However, the
@@ -59,7 +58,7 @@
On return *dst_uchars_r will contain the number of UChar sized units
allocated for the dst. NOT the number of bytes nor the length of the
text. */
-static int make_uchar(const char *src, UChar **dst, int32_t *dst_uchars_r)
+static void make_uchar(const char *src, UChar **dst, int32_t *dst_uchars_r)
{
UErrorCode err = U_ZERO_ERROR;
int32_t len = strlen(src);
@@ -96,7 +95,6 @@
i_panic("Lib ICU u_strFromUTF8 failed: %s", u_errorName(err));
i_assert(retp == *dst);
i_assert(ustr_len == ustr_len_actual);
- return 0;
}
static int make_utf8(const UChar *src, const char **_dst, const char **error_r)
@@ -204,9 +202,8 @@
memset(&perr, 0, sizeof(perr));
- if (make_uchar(np->transliterator_id, &id_uchar, &id_len_uchar) < 0) {
- return -1;
- }
+ make_uchar(np->transliterator_id, &id_uchar, &id_len_uchar);
+
np->transliterator = utrans_openU(id_uchar, u_strlen(id_uchar), UTRANS_FORWARD,
NULL, 0, &perr, &err);
if (U_FAILURE(err)) {
@@ -242,11 +239,7 @@
if (fts_filter_normalizer_icu_create_trans(np) < 0)
goto err_exit;
- if (make_uchar(*token, &utext, &utext_cap) < 0) {
- fts_filter_normalizer_icu_error(&np->error, "Conversion to UChar failed");
- goto err_exit;
- }
-
+ make_uchar(*token, &utext, &utext_cap);
utext_limit = u_strlen(utext);
utrans_transUChars(np->transliterator, utext, &utext_len,
utext_cap, 0, &utext_limit, &err);
@@ -258,9 +251,7 @@
size utrans_transUChars indicated */
utext_len++; /* room for '\0' bytes(2) */
utext_cap = utext_len;
- if (make_uchar(*token, &utext, &utext_cap) < 0) {
- goto err_exit;
- }
+ make_uchar(*token, &utext, &utext_cap);
i_assert(utext_cap == utext_len);
utext_limit = u_strlen(utext);
utext_len = -1;
More information about the dovecot-cvs
mailing list