lib-fts: Use array_foreach_elem() where possible

diff --git a/src/lib-fts/fts-filter.c b/src/lib-fts/fts-filter.c
index 01375ed7c63012c9fcf1ef1d7318808bd30c449e..89e554a03feacbb3fcfcebb6b7f68cd573fdc97f 100644 (file)
--- a/src/lib-fts/fts-filter.c
+++ b/src/lib-fts/fts-filter.c
@@ -41,11 +41,11 @@ void fts_filter_register(const struct fts_filter *filter_class)
 
 const struct fts_filter *fts_filter_find(const char *name)
 {
-       const struct fts_filter *const *fp = NULL;
+       const struct fts_filter *filter;
 
-       array_foreach(&fts_filter_classes, fp) {
-               if (strcmp((*fp)->class_name, name) == 0)
-                       return *fp;
+       array_foreach_elem(&fts_filter_classes, filter) {
+               if (strcmp(filter->class_name, name) == 0)
+                       return filter;
        }
        return NULL;
 }

diff --git a/src/lib-fts/fts-language.c b/src/lib-fts/fts-language.c
index 2f1d11228f22329e58086895d109e4170bbfaf3d..2efb6e4d65ce917564a2a432dfcc66f8c30c4e3a 100644 (file)
--- a/src/lib-fts/fts-language.c
+++ b/src/lib-fts/fts-language.c
@@ -88,11 +88,11 @@ void fts_language_register(const char *name)
 
 const struct fts_language *fts_language_find(const char *name)
 {
-       const struct fts_language *const *langp = NULL;
+       const struct fts_language *lang;
 
-       array_foreach(&fts_languages, langp) {
-               if (strcmp((*langp)->name, name) == 0)
-                       return *langp;
+       array_foreach_elem(&fts_languages, lang) {
+               if (strcmp(lang->name, name) == 0)
+                       return lang;
        }
        return NULL;
 }
@@ -150,11 +150,11 @@ void fts_language_list_deinit(struct fts_language_list **list)
 static const struct fts_language *
 fts_language_list_find(struct fts_language_list *list, const char *name)
 {
-       const struct fts_language *const *langp;
+       const struct fts_language *lang;
 
-       array_foreach(&list->languages, langp) {
-               if (strcmp((*langp)->name, name) == 0)
-                       return *langp;
+       array_foreach_elem(&list->languages, lang) {
+               if (strcmp(lang->name, name) == 0)
+                       return lang;
        }
        return NULL;
 }

diff --git a/src/lib-fts/fts-tokenizer.c b/src/lib-fts/fts-tokenizer.c
index 989b52133986babe72cd761245f6c0505d30674c..1f872b39d6354e7e8765eed4e816ea3916b506cd 100644 (file)
--- a/src/lib-fts/fts-tokenizer.c
+++ b/src/lib-fts/fts-tokenizer.c
@@ -52,11 +52,11 @@ void fts_tokenizer_unregister(const struct fts_tokenizer *tok_class)
 
 const struct fts_tokenizer *fts_tokenizer_find(const char *name)
 {
-       const struct fts_tokenizer *const *tp;
+       const struct fts_tokenizer *tok;
 
-       array_foreach(&fts_tokenizer_classes, tp) {
-               if (strcmp((*tp)->name, name) == 0)
-                       return *tp;
+       array_foreach_elem(&fts_tokenizer_classes, tok) {
+               if (strcmp(tok->name, name) == 0)
+                       return tok;
        }
        return NULL;
 }