lib-language: Rename enum language_result to language_detect_result

diff --git a/src/lib-language/language.c b/src/lib-language/language.c
index 26d393021568e19a14e2901631f37fd3c820c4df..fc7d89d241b338b5350ed93bf02e177c0db4e906 100644 (file)
--- a/src/lib-language/language.c
+++ b/src/lib-language/language.c
@@ -301,7 +301,7 @@ static int language_textcat_init(struct language_list *list,
 }
 #endif
 
-static enum language_result
+static enum language_detect_result
 language_detect_textcat(struct language_list *list ATTR_UNUSED,
                        const unsigned char *text ATTR_UNUSED,
                        size_t size ATTR_UNUSED,
@@ -314,7 +314,7 @@ language_detect_textcat(struct language_list *list ATTR_UNUSED,
        bool match = FALSE;
 
        if (language_textcat_init(list, error_r) < 0)
-               return LANGUAGE_RESULT_ERROR;
+               return LANGUAGE_DETECT_RESULT_ERROR;
 
        candp = textcat_GetClassifyFullOutput(list->textcat->handle);
        if (candp == NULL)
@@ -327,27 +327,27 @@ language_detect_textcat(struct language_list *list ATTR_UNUSED,
                } T_END;
                textcat_ReleaseClassifyFullOutput(list->textcat->handle, candp);
                if (match)
-                       return LANGUAGE_RESULT_OK;
+                       return LANGUAGE_DETECT_RESULT_OK;
                else
-                       return LANGUAGE_RESULT_UNKNOWN;
+                       return LANGUAGE_DETECT_RESULT_UNKNOWN;
        } else {
                textcat_ReleaseClassifyFullOutput(list->textcat->handle, candp);
                switch (cnt) {
                case TEXTCAT_RESULT_SHORT:
                        i_assert(size < DETECT_STR_MAX_LEN);
-                       return LANGUAGE_RESULT_SHORT;
+                       return LANGUAGE_DETECT_RESULT_SHORT;
                case TEXTCAT_RESULT_UNKNOWN:
-                       return LANGUAGE_RESULT_UNKNOWN;
+                       return LANGUAGE_DETECT_RESULT_UNKNOWN;
                default:
                        i_unreached();
                }
        }
 #else
-       return LANGUAGE_RESULT_UNKNOWN;
+       return LANGUAGE_DETECT_RESULT_UNKNOWN;
 #endif
 }
 
-enum language_result
+enum language_detect_result
 language_detect(struct language_list *list,
                const unsigned char *text ATTR_UNUSED,
                size_t size ATTR_UNUSED,
@@ -361,7 +361,7 @@ language_detect(struct language_list *list,
                const struct language *const *langp =
                        array_front(&list->languages);
                *lang_r = *langp;
-               return LANGUAGE_RESULT_OK;
+               return LANGUAGE_DETECT_RESULT_OK;
        }
        return language_detect_textcat(list, text, size, lang_r, error_r);
 }

diff --git a/src/lib-language/language.h b/src/lib-language/language.h
index 91c3665cd16a550fa2e4f8e92204444fb4a32ae2..15aeeb0674c3bbcee4ec0ca1338535cbae0ce6a3 100644 (file)
--- a/src/lib-language/language.h
+++ b/src/lib-language/language.h
@@ -3,15 +3,15 @@
 
 struct language_list;
 
-enum language_result {
+enum language_detect_result {
        /* Provided sample is too short. */
-       LANGUAGE_RESULT_SHORT,
+       LANGUAGE_DETECT_RESULT_SHORT,
        /* Language is unknown or not in the provided list . */
-       LANGUAGE_RESULT_UNKNOWN,
+       LANGUAGE_DETECT_RESULT_UNKNOWN,
 
-       LANGUAGE_RESULT_OK,
+       LANGUAGE_DETECT_RESULT_OK,
        /* textcat library initialization failed. */
-       LANGUAGE_RESULT_ERROR
+       LANGUAGE_DETECT_RESULT_ERROR
 };
 
 struct language {
@@ -62,7 +62,7 @@ language_list_get_first(struct language_list *list);
 /* If text was detected to be one of the languages in the list,
    returns LANGUAGE_RESULT_OK and (a pointer to) the language (in
    the list). error_r is set for LANGUAGE_RESULT_ERROR. */
-enum language_result
+enum language_detect_result
 language_detect(struct language_list *list,
                const unsigned char *text, size_t size,
                const struct language **lang_r,

diff --git a/src/lib-language/test-language.c b/src/lib-language/test-language.c
index 85032f534915c2cdee1aad726db3443bed8e33c9..bff6cdfc29ecaab6225e9024240a36a8871bd349 100644 (file)
--- a/src/lib-language/test-language.c
+++ b/src/lib-language/test-language.c
@@ -29,7 +29,7 @@ static void test_language_detect_finnish(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, finnish, sizeof(finnish)-1, &lang_r, &error)
-                   == LANGUAGE_RESULT_OK);
+                   == LANGUAGE_DETECT_RESULT_OK);
        test_assert(strcmp(lang_r->name, "fi") == 0);
        language_list_deinit(&lp);
        test_end();
@@ -56,7 +56,7 @@ static void test_language_detect_english(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, english, sizeof(english)-1, &lang_r, &error)
-                   == LANGUAGE_RESULT_OK);
+                   == LANGUAGE_DETECT_RESULT_OK);
        test_assert(strcmp(lang_r->name, "en") == 0);
        language_list_deinit(&lp);
        test_end();
@@ -91,7 +91,7 @@ static void test_language_detect_french(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, french, sizeof(french)-1, &lang_r, &error)
-                   == LANGUAGE_RESULT_OK);
+                   == LANGUAGE_DETECT_RESULT_OK);
        test_assert(strcmp(lang_r->name, "fr") == 0);
        language_list_deinit(&lp);
        test_end();
@@ -128,7 +128,7 @@ static void test_language_detect_german(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, german, sizeof(german)-1, &lang_r, &error)
-                   == LANGUAGE_RESULT_OK);
+                   == LANGUAGE_DETECT_RESULT_OK);
        test_assert(strcmp(lang_r->name, "de") == 0);
        language_list_deinit(&lp);
        test_end();
@@ -154,7 +154,7 @@ static void test_language_detect_swedish(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, swedish, sizeof(swedish)-1, &lang_r, &error)
-                   == LANGUAGE_RESULT_OK);
+                   == LANGUAGE_DETECT_RESULT_OK);
        test_assert(strcmp(lang_r->name, "sv") == 0);
        language_list_deinit(&lp);
        test_end();
@@ -178,7 +178,7 @@ static void test_language_detect_bokmal(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, bokmal, sizeof(bokmal)-1, &lang_r, &error)
-                   == LANGUAGE_RESULT_OK);
+                   == LANGUAGE_DETECT_RESULT_OK);
        test_assert(strcmp(lang_r->name, "no") == 0);
        language_list_deinit(&lp);
        test_end();
@@ -202,7 +202,7 @@ static void test_language_detect_nynorsk(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, nynorsk, sizeof(nynorsk)-1, &lang_r, &error)
-                   == LANGUAGE_RESULT_OK);
+                   == LANGUAGE_DETECT_RESULT_OK);
        test_assert(strcmp(lang_r->name, "no") == 0);
        language_list_deinit(&lp);
        test_end();
@@ -227,7 +227,7 @@ static void test_language_detect_finnish_as_english(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, finnish, sizeof(finnish)-1, &lang_r, &error)
-                   == LANGUAGE_RESULT_OK);
+                   == LANGUAGE_DETECT_RESULT_OK);
        test_assert(strcmp(lang_r->name, "en") == 0);
        language_list_deinit(&lp);
        test_end();
@@ -254,7 +254,7 @@ static void test_language_detect_na(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, english, sizeof(english)-1, &lang_r, &error)
-                   == LANGUAGE_RESULT_UNKNOWN);
+                   == LANGUAGE_DETECT_RESULT_UNKNOWN);
        language_list_deinit(&lp);
        test_end();
 }
@@ -274,7 +274,7 @@ static void test_language_detect_unknown(void)
        test_assert(language_list_init(settings, &lp, &error) == 0);
        test_assert(language_list_add_names(lp, names, &unknown) == TRUE);
        test_assert(language_detect(lp, klingon, sizeof(klingon), &lang_r, &error)
-                   == LANGUAGE_RESULT_UNKNOWN);
+                   == LANGUAGE_DETECT_RESULT_UNKNOWN);
        language_list_deinit(&lp);
        test_end();
 }

diff --git a/src/plugins/fts/doveadm-fts.c b/src/plugins/fts/doveadm-fts.c
index 2951f8309c15190e83e45fba06f142c0ddffd888..14c9358c31daa8f50b0125b5393a47e40d83da43 100644 (file)
--- a/src/plugins/fts/doveadm-fts.c
+++ b/src/plugins/fts/doveadm-fts.c
@@ -201,7 +201,7 @@ cmd_fts_tokenize_run(struct doveadm_mail_cmd_context *_ctx,
        if (ctx->language == NULL) {
                struct language_list *lang_list =
                        fts_user_get_language_list(user);
-               enum language_result result;
+               enum language_detect_result result;
                const char *error;
 
                result = language_detect(lang_list,
@@ -210,19 +210,19 @@ cmd_fts_tokenize_run(struct doveadm_mail_cmd_context *_ctx,
                if (lang == NULL)
                        lang = language_list_get_first(lang_list);
                switch (result) {
-               case LANGUAGE_RESULT_SHORT:
+               case LANGUAGE_DETECT_RESULT_SHORT:
                        e_warning(user->event,
                                  "Text too short, can't detect its language - assuming %s",
                                  lang->name);
                        break;
-               case LANGUAGE_RESULT_UNKNOWN:
+               case LANGUAGE_DETECT_RESULT_UNKNOWN:
                        e_warning(user->event,
                                  "Can't detect its language - assuming %s",
                                  lang->name);
                        break;
-               case LANGUAGE_RESULT_OK:
+               case LANGUAGE_DETECT_RESULT_OK:
                        break;
-               case LANGUAGE_RESULT_ERROR:
+               case LANGUAGE_DETECT_RESULT_ERROR:
                        e_error(user->event,
                                "Language detection library initialization failed: %s",
                                error);

diff --git a/src/plugins/fts/fts-build-mail.c b/src/plugins/fts/fts-build-mail.c
index 75ecae989172fdf3099bb98be1d6582cb26f0691..e69b287825a7c2d018e7d0a528fa472d4c19aaf8 100644 (file)
--- a/src/plugins/fts/fts-build-mail.c
+++ b/src/plugins/fts/fts-build-mail.c
@@ -304,7 +304,7 @@ fts_detect_language(struct fts_mail_build_context *ctx,
        const char *error;
 
        switch (language_detect(lang_list, data, size, &lang, &error)) {
-       case LANGUAGE_RESULT_SHORT:
+       case LANGUAGE_DETECT_RESULT_SHORT:
                /* save the input so far and try again later */
                buffer_append(ctx->pending_input, data, size);
                if (last) {
@@ -313,14 +313,14 @@ fts_detect_language(struct fts_mail_build_context *ctx,
                        return 1;
                }
                return 0;
-       case LANGUAGE_RESULT_UNKNOWN:
+       case LANGUAGE_DETECT_RESULT_UNKNOWN:
                /* use the default language */
                *lang_r = language_list_get_first(lang_list);
                return 1;
-       case LANGUAGE_RESULT_OK:
+       case LANGUAGE_DETECT_RESULT_OK:
                *lang_r = lang;
                return 1;
-       case LANGUAGE_RESULT_ERROR:
+       case LANGUAGE_DETECT_RESULT_ERROR:
                /* internal language detection library failure
                   (e.g. invalid config). don't index anything. */
                mail_set_critical(ctx->mail,