dovecot-2.2: lib-fts: ICU normalizer code cleanup.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/d09d2ea2c31a
changeset: 18647:d09d2ea2c31a
user:      Teemu Huovila <teemu.huovila at dovecot.fi>
date:      Tue May 12 16:44:45 2015 +0300
description:
lib-fts: ICU normalizer code cleanup.

Fold some long lines. Rename the internal struct to be more
aligned with the other filters.

diffstat:

 src/lib-fts/fts-filter-normalizer-icu.c |  33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diffs (96 lines):

diff -r 58d7234a6658 -r d09d2ea2c31a src/lib-fts/fts-filter-normalizer-icu.c
--- a/src/lib-fts/fts-filter-normalizer-icu.c	Tue May 12 16:12:29 2015 +0300
+++ b/src/lib-fts/fts-filter-normalizer-icu.c	Tue May 12 16:44:45 2015 +0300
@@ -15,7 +15,7 @@
 #include <unicode/ucnv.h>
 #include <stdlib.h>
 
-struct fts_filter_normalizer {
+struct fts_filter_normalizer_icu {
 	struct fts_filter filter;
 	pool_t pool;
 	const char *transliterator_id;
@@ -116,8 +116,8 @@
 
 static void fts_filter_normalizer_icu_destroy(struct fts_filter *filter)
 {
-	struct fts_filter_normalizer *np =
-		(struct fts_filter_normalizer *)filter;
+	struct fts_filter_normalizer_icu *np =
+		(struct fts_filter_normalizer_icu *)filter;
 
 	if (np->transliterator != NULL)
 		utrans_close(np->transliterator);
@@ -130,7 +130,7 @@
 				 struct fts_filter **filter_r,
 				 const char **error_r)
 {
-	struct fts_filter_normalizer *np;
+	struct fts_filter_normalizer_icu *np;
 	pool_t pp;
 	unsigned int i;
 	const char *id = "Any-Lower; NFKD; [: Nonspacing Mark :] Remove; NFC";
@@ -146,9 +146,9 @@
 		}
 	}
 
-	pp = pool_alloconly_create(MEMPOOL_GROWING"fts_filter_normalizer",
-	                           sizeof(struct fts_filter_normalizer));
-	np = p_new(pp, struct fts_filter_normalizer, 1);
+	pp = pool_alloconly_create(MEMPOOL_GROWING"fts_filter_normalizer_icu",
+	                           sizeof(struct fts_filter_normalizer_icu));
+	np = p_new(pp, struct fts_filter_normalizer_icu, 1);
 	np->pool = pp;
 	np->filter = *fts_filter_normalizer_icu;
 	np->transliterator_id = p_strdup(pp, id);
@@ -156,8 +156,9 @@
 	return 0;
 }
 
-static int fts_filter_normalizer_icu_create_trans(struct fts_filter_normalizer *np,
-						  const char **error_r)
+static int
+fts_filter_normalizer_icu_create_trans(struct fts_filter_normalizer_icu *np,
+				       const char **error_r)
 {
 	UErrorCode err = U_ZERO_ERROR;
 	UParseError perr;
@@ -168,8 +169,8 @@
 
 	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);
+	np->transliterator = utrans_openU(id_uchar, u_strlen(id_uchar),
+					  UTRANS_FORWARD, NULL, 0, &perr, &err);
 	if (U_FAILURE(err)) {
 		string_t *str = t_str_new(128);
 
@@ -177,7 +178,8 @@
 			    np->transliterator_id, u_errorName(err));
 		if (perr.line >= 1) {
 			/* we have only one line in our ID */
-			str_printfa(str, " (parse error on offset %u)", perr.offset);
+			str_printfa(str, " (parse error on offset %u)",
+				    perr.offset);
 		}
 		*error_r = str_c(str);
 		return -1;
@@ -189,8 +191,8 @@
 fts_filter_normalizer_icu_filter(struct fts_filter *filter, const char **token,
 				 const char **error_r)
 {
-	struct fts_filter_normalizer *np =
-		(struct fts_filter_normalizer *)filter;
+	struct fts_filter_normalizer_icu *np =
+		(struct fts_filter_normalizer_icu *)filter;
 	UErrorCode err = U_ZERO_ERROR;
 	UChar *utext = NULL;
 	int32_t utext_cap = 0;
@@ -274,4 +276,5 @@
 	.v = &normalizer_filter_vfuncs
 };
 
-const struct fts_filter *fts_filter_normalizer_icu = &fts_filter_normalizer_icu_real;
+const struct fts_filter *fts_filter_normalizer_icu =
+	&fts_filter_normalizer_icu_real;