dovecot-2.2: fts: Added fts_library_init() and _deinit()
dovecot at dovecot.org
dovecot at dovecot.org
Tue Nov 17 09:56:50 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/6bf404e276c6
changeset: 19380:6bf404e276c6
user: Teemu Huovila <teemu.huovila at dovecot.fi>
date: Tue Nov 17 11:51:45 2015 +0200
description:
fts: Added fts_library_init() and _deinit()
Replaces calling three different functions on init and deinit.
diffstat:
src/lib-fts/Makefile.am | 2 ++
src/lib-fts/fts-library.c | 19 +++++++++++++++++++
src/lib-fts/fts-library.h | 7 +++++++
src/plugins/fts/fts-plugin.c | 8 +++-----
4 files changed, 31 insertions(+), 5 deletions(-)
diffs (83 lines):
diff -r 92aa48461150 -r 6bf404e276c6 src/lib-fts/Makefile.am
--- a/src/lib-fts/Makefile.am Tue Nov 17 11:50:16 2015 +0200
+++ b/src/lib-fts/Makefile.am Tue Nov 17 11:51:45 2015 +0200
@@ -71,6 +71,7 @@
fts-filter-stopwords.c \
fts-filter-stemmer-snowball.c \
fts-language.c \
+ fts-library.c \
fts-tokenizer.c \
fts-tokenizer-address.c \
fts-tokenizer-generic.c \
@@ -82,6 +83,7 @@
fts-filter-private.h \
fts-icu.h \
fts-language.h \
+ fts-library.h \
fts-tokenizer.h \
fts-tokenizer-private.h \
fts-tokenizer-generic-private.h
diff -r 92aa48461150 -r 6bf404e276c6 src/lib-fts/fts-library.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib-fts/fts-library.c Tue Nov 17 11:51:45 2015 +0200
@@ -0,0 +1,19 @@
+#include "lib.h"
+#include "fts-language.h"
+#include "fts-tokenizer.h"
+#include "fts-filter.h"
+#include "fts-library.h"
+
+void fts_library_init(void)
+{
+ fts_languages_init();
+ fts_tokenizers_init();
+ fts_filters_init();
+}
+
+void fts_library_deinit(void)
+{
+ fts_languages_deinit();
+ fts_tokenizers_deinit();
+ fts_filters_deinit();
+}
diff -r 92aa48461150 -r 6bf404e276c6 src/lib-fts/fts-library.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib-fts/fts-library.h Tue Nov 17 11:51:45 2015 +0200
@@ -0,0 +1,7 @@
+#ifndef FTS_LIBRARY_H
+#define FTS_LIBRARY_H
+
+void fts_library_init(void);
+void fts_library_deinit(void);
+
+#endif
diff -r 92aa48461150 -r 6bf404e276c6 src/plugins/fts/fts-plugin.c
--- a/src/plugins/fts/fts-plugin.c Tue Nov 17 11:50:16 2015 +0200
+++ b/src/plugins/fts/fts-plugin.c Tue Nov 17 11:51:45 2015 +0200
@@ -8,7 +8,7 @@
#include "fts-storage.h"
#include "fts-user.h"
#include "fts-plugin.h"
-
+#include "fts-library.h"
const char *fts_plugin_version = DOVECOT_ABI_VERSION;
@@ -20,15 +20,13 @@
void fts_plugin_init(struct module *module)
{
- fts_filters_init();
- fts_tokenizers_init();
+ fts_library_init();
mail_storage_hooks_add(module, &fts_mail_storage_hooks);
}
void fts_plugin_deinit(void)
{
- fts_filters_deinit();
- fts_tokenizers_deinit();
+ fts_library_deinit();
fts_parsers_unload();
mail_storage_hooks_remove(&fts_mail_storage_hooks);
}
More information about the dovecot-cvs
mailing list