lib-language: lang-user - Rename Macros

diff --git a/src/lib-storage/lang-user.c b/src/lib-storage/lang-user.c
index f04f47a8cc8d858131c71905aae575c39e6447c7..363ab6883838f2948a375164f0619f1e7e30496c 100644 (file)
--- a/src/lib-storage/lang-user.c
+++ b/src/lib-storage/lang-user.c
@@ -7,14 +7,14 @@
 #include "language.h"
 #include "lang-filter.h"
 #include "lang-tokenizer.h"
-#include "fts-user.h"
+#include "lang-user.h"
 #include "settings.h"
-#include "fts-settings.h"
+#include "lang-settings.h"
 
-#define FTS_USER_CONTEXT(obj) \
-       MODULE_CONTEXT(obj, fts_user_module)
-#define FTS_USER_CONTEXT_REQUIRE(obj) \
-       MODULE_CONTEXT_REQUIRE(obj, fts_user_module)
+#define LANG_USER_CONTEXT(obj) \
+       MODULE_CONTEXT(obj, lang_user_module)
+#define LANG_USER_CONTEXT_REQUIRE(obj) \
+       MODULE_CONTEXT_REQUIRE(obj, lang_user_module)
 
 struct fts_user {
        union mail_user_module_context module_ctx;
@@ -26,7 +26,7 @@ struct fts_user {
        ARRAY_TYPE(fts_user_language) languages, data_languages;
 };
 
-static MODULE_CONTEXT_DEFINE_INIT(fts_user_module,
+static MODULE_CONTEXT_DEFINE_INIT(lang_user_module,
                                  &mail_user_module_register);
 
 static const char *const *str_keyvalues_to_array(const char *str)
@@ -240,7 +240,7 @@ fts_user_language_find(struct mail_user *user,
                       const struct language *lang)
 {
        struct fts_user_language *user_lang;
-       struct fts_user *fuser = FTS_USER_CONTEXT_REQUIRE(user);
+       struct fts_user *fuser = LANG_USER_CONTEXT_REQUIRE(user);
 
        array_foreach_elem(&fuser->languages, user_lang) {
                if (strcmp(user_lang->lang->name, lang->name) == 0)
@@ -308,7 +308,7 @@ fts_user_init_data_language(struct mail_user *user, struct fts_user *fuser,
 
 struct language_list *fts_user_get_language_list(struct mail_user *user)
 {
-       struct fts_user *fuser = FTS_USER_CONTEXT_REQUIRE(user);
+       struct fts_user *fuser = LANG_USER_CONTEXT_REQUIRE(user);
 
        return fuser->lang_list;
 }
@@ -316,7 +316,7 @@ struct language_list *fts_user_get_language_list(struct mail_user *user)
 const ARRAY_TYPE(fts_user_language) *
 fts_user_get_all_languages(struct mail_user *user)
 {
-       struct fts_user *fuser = FTS_USER_CONTEXT_REQUIRE(user);
+       struct fts_user *fuser = LANG_USER_CONTEXT_REQUIRE(user);
 
        return &fuser->languages;
 }
@@ -324,21 +324,21 @@ fts_user_get_all_languages(struct mail_user *user)
 const ARRAY_TYPE(fts_user_language) *
 fts_user_get_data_languages(struct mail_user *user)
 {
-       struct fts_user *fuser = FTS_USER_CONTEXT_REQUIRE(user);
+       struct fts_user *fuser = LANG_USER_CONTEXT_REQUIRE(user);
 
        return &fuser->data_languages;
 }
 
 struct fts_user_language *fts_user_get_data_lang(struct mail_user *user)
 {
-       struct fts_user *fuser = FTS_USER_CONTEXT_REQUIRE(user);
+       struct fts_user *fuser = LANG_USER_CONTEXT_REQUIRE(user);
 
        return fuser->data_lang;
 }
 
 const struct fts_settings *fts_user_get_settings(struct mail_user *user)
 {
-       struct fts_user *fuser = FTS_USER_CONTEXT_REQUIRE(user);
+       struct fts_user *fuser = LANG_USER_CONTEXT_REQUIRE(user);
        return fuser->set;
 }
 
@@ -384,7 +384,7 @@ fts_mail_user_init_libfts(struct mail_user *user, struct fts_user *fuser,
 int fts_mail_user_init(struct mail_user *user, bool initialize_libfts,
                       const char **error_r)
 {
-       struct fts_user *fuser = FTS_USER_CONTEXT(user);
+       struct fts_user *fuser = LANG_USER_CONTEXT(user);
 
        if (fuser != NULL) {
                /* multiple fts plugins are loaded */
@@ -406,13 +406,13 @@ int fts_mail_user_init(struct mail_user *user, bool initialize_libfts,
                }
        }
 
-       MODULE_CONTEXT_SET(user, fts_user_module, fuser);
+       MODULE_CONTEXT_SET(user, lang_user_module, luser);
        return 0;
 }
 
 void fts_mail_user_deinit(struct mail_user *user)
 {
-       struct fts_user *fuser = FTS_USER_CONTEXT(user);
+       struct fts_user *fuser = LANG_USER_CONTEXT(user);
 
        if (fuser != NULL) {
                i_assert(fuser->refcount > 0);

diff --git a/src/lib-storage/lang-user.h b/src/lib-storage/lang-user.h
index 7648bf8e59ab45fb48304623fa07983f674bfb94..6972f8b94fb83e4ced0236c928c1e017f3df0104 100644 (file)
--- a/src/lib-storage/lang-user.h
+++ b/src/lib-storage/lang-user.h
@@ -1,5 +1,5 @@
-#ifndef FTS_USER_H
-#define FTS_USER_H
+#ifndef LANG_USER_H
+#define LANG_USER_H
 
 #include "fts-settings.h"