From d7b4d4577dbe5e7806837aff0e60fd7c0aca43b5 Mon Sep 17 00:00:00 2001 From: "Yvan E. Watchman" Date: Wed, 11 Jan 2023 15:08:34 +0100 Subject: [PATCH] fix cs --- src/lib-storage/list/mailbox-list-fs.c | 16 ++++----- src/lib-storage/list/mailbox-list-maildir.c | 18 +++++----- src/lib-storage/mailbox-list.c | 36 +++++++++---------- src/lib-storage/mailbox-list.h | 4 +-- .../fts-flatcurve/fts-backend-flatcurve.c | 20 +++++------ src/plugins/fts/fts-storage.c | 4 +-- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/lib-storage/list/mailbox-list-fs.c b/src/lib-storage/list/mailbox-list-fs.c index feb5595c49..b4db77c3dc 100644 --- a/src/lib-storage/list/mailbox-list-fs.c +++ b/src/lib-storage/list/mailbox-list-fs.c @@ -130,14 +130,14 @@ fs_list_get_path(struct mailbox_list *_list, const char *name, return 1; } break; - case MAILBOX_LIST_PATH_TYPE_FTS_INDEX: - if (set->fts_index_dir != NULL) { - if (*set->fts_index_dir == '\0') - return 0; - *path_r = fs_list_get_path_to(set, set->fts_index_dir, name); - return 1; - } - break; + case MAILBOX_LIST_PATH_TYPE_FTS_INDEX: + if (set->fts_index_dir != NULL) { + if (*set->fts_index_dir == '\0') + return 0; + *path_r = fs_list_get_path_to(set, set->fts_index_dir, name); + return 1; + } + break; case MAILBOX_LIST_PATH_TYPE_INDEX_PRIVATE: if (set->index_pvt_dir == NULL) return 0; diff --git a/src/lib-storage/list/mailbox-list-maildir.c b/src/lib-storage/list/mailbox-list-maildir.c index 105ebd5953..7eea592c31 100644 --- a/src/lib-storage/list/mailbox-list-maildir.c +++ b/src/lib-storage/list/mailbox-list-maildir.c @@ -152,15 +152,15 @@ maildir_list_get_path(struct mailbox_list *_list, const char *name, return 1; } break; - case MAILBOX_LIST_PATH_TYPE_FTS_INDEX: - if (_list->set.fts_index_dir != NULL) { - if (*_list->set.fts_index_dir == '\0') - return 0; - *path_r = maildir_list_get_dirname_path(_list, - _list->set.fts_index_dir, name); - return 1; - } - break; + case MAILBOX_LIST_PATH_TYPE_FTS_INDEX: + if (_list->set.fts_index_dir != NULL) { + if (*_list->set.fts_index_dir == '\0') + return 0; + *path_r = maildir_list_get_dirname_path(_list, + _list->set.fts_index_dir, name); + return 1; + } + break; case MAILBOX_LIST_PATH_TYPE_INDEX_PRIVATE: if (_list->set.index_pvt_dir == NULL) return 0; diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c index e52d9d8298..ce5bc7a345 100644 --- a/src/lib-storage/mailbox-list.c +++ b/src/lib-storage/mailbox-list.c @@ -125,7 +125,7 @@ int mailbox_list_create(const char *driver, struct mail_namespace *ns, } if ((class->props & MAILBOX_LIST_PROP_NO_MAILDIR_NAME) != 0 && - *set->maildir_name != '\0') { + *set->maildir_name != '\0') { *error_r = "maildir_name not supported by this driver"; return -1; } @@ -334,7 +334,7 @@ mailbox_list_settings_parse_full(struct mail_user *user, const char *data, dest = &set_r->inbox_path; else if (strcmp(key, "INDEX") == 0) dest = &set_r->index_dir; - else if (strcmp(key, "FTS_INDEX") == 0) + else if (strcmp(key, "FTS_INDEX") == 0) dest = &set_r->fts_index_dir; else if (strcmp(key, "INDEXPVT") == 0) dest = &set_r->index_pvt_dir; @@ -1488,22 +1488,22 @@ bool mailbox_list_set_get_root_path(const struct mailbox_list_settings *set, path = set->root_dir; } break; - case MAILBOX_LIST_PATH_TYPE_FTS_INDEX: - if (set->fts_index_dir != NULL) { - if (set->fts_index_dir[0] == '\0') { - /* in-memory indexes */ - return 0; - } - path = set->fts_index_dir; - - /* Preserve the old behavior of using the index directory if - * fts_index_dir is not set. */ - } else if (set->index_dir != NULL) { - path = set->index_dir; - } else { - path = set->root_dir; - } - break; + case MAILBOX_LIST_PATH_TYPE_FTS_INDEX: + if (set->fts_index_dir != NULL) { + if (set->fts_index_dir[0] == '\0') { + /* in-memory indexes */ + return 0; + } + path = set->fts_index_dir; + + /* Preserve the old behavior of using the index directory if + * fts_index_dir is not set. */ + } else if (set->index_dir != NULL) { + path = set->index_dir; + } else { + path = set->root_dir; + } + break; case MAILBOX_LIST_PATH_TYPE_INDEX_PRIVATE: path = set->index_pvt_dir; break; diff --git a/src/lib-storage/mailbox-list.h b/src/lib-storage/mailbox-list.h index 02a5c65406..8d027bd040 100644 --- a/src/lib-storage/mailbox-list.h +++ b/src/lib-storage/mailbox-list.h @@ -95,8 +95,8 @@ enum mailbox_list_path_type { /* Return mailbox list index directory (usually same as MAILBOX_LIST_PATH_TYPE_INDEX) */ MAILBOX_LIST_PATH_TYPE_LIST_INDEX, - /* Return mailbox fts index directory path */ - MAILBOX_LIST_PATH_TYPE_FTS_INDEX, + /* Return mailbox fts index directory path */ + MAILBOX_LIST_PATH_TYPE_FTS_INDEX, MAILBOX_LIST_PATH_TYPE_COUNT }; diff --git a/src/plugins/fts-flatcurve/fts-backend-flatcurve.c b/src/plugins/fts-flatcurve/fts-backend-flatcurve.c index 6c7ab11dd4..fbbfd572e7 100644 --- a/src/plugins/fts-flatcurve/fts-backend-flatcurve.c +++ b/src/plugins/fts-flatcurve/fts-backend-flatcurve.c @@ -126,20 +126,20 @@ fts_backend_flatcurve_set_mailbox(struct flatcurve_fts_backend *backend, } if (mailbox_open(box) < 0 - || (mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_INDEX) == 0 && - mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX) == 0) - ) { + || (mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_INDEX) == 0 && + mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX) == 0) + ) { *error_r = t_strdup_printf("Could not open mailbox: %s: %s", - box->vname, - mailbox_get_last_internal_error(box, NULL)); + box->vname, + mailbox_get_last_internal_error(box, NULL)); return -1; } - if (mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX)) { - mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX, &path); - } else { - mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_INDEX, &path); - } + if (mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX)) { + mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX, &path); + } else { + mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_INDEX, &path); + } str_append(backend->boxname, box->vname); str_printfa(backend->db_path, "%s/%s/", path, FTS_FLATCURVE_LABEL); diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c index 4042fc5923..5095123000 100644 --- a/src/plugins/fts/fts-storage.c +++ b/src/plugins/fts/fts-storage.c @@ -959,8 +959,8 @@ fts_mailbox_list_created(struct mailbox_list *list) return; } - /* TODO: Create config item for MAILBOX_LIST_PATH_TYPE... FTS_INDEX||=INDEX */ - bool has_fts_index_path = mailbox_list_get_root_path(list, MAILBOX_LIST_PATH_TYPE_FTS_INDEX, &path); + /* TODO: Create config item for MAILBOX_LIST_PATH_TYPE... FTS_INDEX||=INDEX */ + bool has_fts_index_path = mailbox_list_get_root_path(list, MAILBOX_LIST_PATH_TYPE_FTS_INDEX, &path); if (!mailbox_list_get_root_path(list, MAILBOX_LIST_PATH_TYPE_INDEX, &path) && !has_fts_index_path) { e_debug(list->ns->user->event, "fts: Indexes disabled for namespace '%s'",