dovecot-2.2: lib-fts: Partially reverted d097a9779c37 - don't us...

dovecot at dovecot.org dovecot at dovecot.org
Mon May 18 11:55:55 UTC 2015


details:   http://hg.dovecot.org/dovecot-2.2/rev/45013c8cf69c
changeset: 18730:45013c8cf69c
user:      Timo Sirainen <tss at iki.fi>
date:      Mon May 18 14:53:52 2015 +0300
description:
lib-fts: Partially reverted d097a9779c37 - don't use lib_atexit()
Because fts is loaded as plugin lib_atexit() is called after the plugin is
already unloaded, so it crashes.

diffstat:

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

diffs (33 lines):

diff -r 0ee3e734249a -r 45013c8cf69c src/lib-fts/fts-filter-normalizer-icu.c
--- a/src/lib-fts/fts-filter-normalizer-icu.c	Mon May 18 07:49:15 2015 -0400
+++ b/src/lib-fts/fts-filter-normalizer-icu.c	Mon May 18 14:53:52 2015 +0300
@@ -10,8 +10,6 @@
 #ifdef HAVE_LIBICU
 #include "fts-icu.h"
 
-#include <unicode/uclean.h>
-
 struct fts_filter_normalizer_icu {
 	struct fts_filter filter;
 	pool_t pool;
@@ -24,8 +22,6 @@
 	string_t *utf8_token;
 };
 
-static bool icu_exit_callback_set = FALSE;
-
 static void fts_filter_normalizer_icu_destroy(struct fts_filter *filter)
 {
 	struct fts_filter_normalizer_icu *np =
@@ -58,11 +54,6 @@
 		}
 	}
 
-	if (!icu_exit_callback_set) {
-		icu_exit_callback_set = TRUE;
-		lib_atexit(u_cleanup);
-	}
-
 	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);


More information about the dovecot-cvs mailing list