Mercurial > dovecot > core-2.2
changeset 19380:6bf404e276c6
fts: Added fts_library_init() and _deinit()
Replaces calling three different functions on init and deinit.
author | Teemu Huovila <teemu.huovila@dovecot.fi> |
---|---|
date | Tue, 17 Nov 2015 11:51:45 +0200 |
parents | 92aa48461150 |
children | d39daee9d72c |
files | src/lib-fts/Makefile.am src/lib-fts/fts-library.c src/lib-fts/fts-library.h src/plugins/fts/fts-plugin.c |
diffstat | 4 files changed, 31 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- /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(); +}
--- /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
--- 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); }