Skip to content

Commit d7b4d45

Browse files
YWatchmanYWatchman
committed
fix cs
1 parent 63b1bd0 commit d7b4d45

File tree

6 files changed

+49
-49
lines changed

6 files changed

+49
-49
lines changed

‎src/lib-storage/list/mailbox-list-fs.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ fs_list_get_path(struct mailbox_list *_list, const char *name,
130130
return 1;
131131
}
132132
break;
133-
case MAILBOX_LIST_PATH_TYPE_FTS_INDEX:
134-
if (set->fts_index_dir != NULL) {
135-
if (*set->fts_index_dir == '\0')
136-
return 0;
137-
*path_r = fs_list_get_path_to(set, set->fts_index_dir, name);
138-
return 1;
139-
}
140-
break;
133+
case MAILBOX_LIST_PATH_TYPE_FTS_INDEX:
134+
if (set->fts_index_dir != NULL) {
135+
if (*set->fts_index_dir == '\0')
136+
return 0;
137+
*path_r = fs_list_get_path_to(set, set->fts_index_dir, name);
138+
return 1;
139+
}
140+
break;
141141
case MAILBOX_LIST_PATH_TYPE_INDEX_PRIVATE:
142142
if (set->index_pvt_dir == NULL)
143143
return 0;

‎src/lib-storage/list/mailbox-list-maildir.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ maildir_list_get_path(struct mailbox_list *_list, const char *name,
152152
return 1;
153153
}
154154
break;
155-
case MAILBOX_LIST_PATH_TYPE_FTS_INDEX:
156-
if (_list->set.fts_index_dir != NULL) {
157-
if (*_list->set.fts_index_dir == '\0')
158-
return 0;
159-
*path_r = maildir_list_get_dirname_path(_list,
160-
_list->set.fts_index_dir, name);
161-
return 1;
162-
}
163-
break;
155+
case MAILBOX_LIST_PATH_TYPE_FTS_INDEX:
156+
if (_list->set.fts_index_dir != NULL) {
157+
if (*_list->set.fts_index_dir == '\0')
158+
return 0;
159+
*path_r = maildir_list_get_dirname_path(_list,
160+
_list->set.fts_index_dir, name);
161+
return 1;
162+
}
163+
break;
164164
case MAILBOX_LIST_PATH_TYPE_INDEX_PRIVATE:
165165
if (_list->set.index_pvt_dir == NULL)
166166
return 0;

‎src/lib-storage/mailbox-list.c

+18-18
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ int mailbox_list_create(const char *driver, struct mail_namespace *ns,
125125
}
126126

127127
if ((class->props & MAILBOX_LIST_PROP_NO_MAILDIR_NAME) != 0 &&
128-
*set->maildir_name != '\0') {
128+
*set->maildir_name != '\0') {
129129
*error_r = "maildir_name not supported by this driver";
130130
return -1;
131131
}
@@ -334,7 +334,7 @@ mailbox_list_settings_parse_full(struct mail_user *user, const char *data,
334334
dest = &set_r->inbox_path;
335335
else if (strcmp(key, "INDEX") == 0)
336336
dest = &set_r->index_dir;
337-
else if (strcmp(key, "FTS_INDEX") == 0)
337+
else if (strcmp(key, "FTS_INDEX") == 0)
338338
dest = &set_r->fts_index_dir;
339339
else if (strcmp(key, "INDEXPVT") == 0)
340340
dest = &set_r->index_pvt_dir;
@@ -1488,22 +1488,22 @@ bool mailbox_list_set_get_root_path(const struct mailbox_list_settings *set,
14881488
path = set->root_dir;
14891489
}
14901490
break;
1491-
case MAILBOX_LIST_PATH_TYPE_FTS_INDEX:
1492-
if (set->fts_index_dir != NULL) {
1493-
if (set->fts_index_dir[0] == '\0') {
1494-
/* in-memory indexes */
1495-
return 0;
1496-
}
1497-
path = set->fts_index_dir;
1498-
1499-
/* Preserve the old behavior of using the index directory if
1500-
* fts_index_dir is not set. */
1501-
} else if (set->index_dir != NULL) {
1502-
path = set->index_dir;
1503-
} else {
1504-
path = set->root_dir;
1505-
}
1506-
break;
1491+
case MAILBOX_LIST_PATH_TYPE_FTS_INDEX:
1492+
if (set->fts_index_dir != NULL) {
1493+
if (set->fts_index_dir[0] == '\0') {
1494+
/* in-memory indexes */
1495+
return 0;
1496+
}
1497+
path = set->fts_index_dir;
1498+
1499+
/* Preserve the old behavior of using the index directory if
1500+
* fts_index_dir is not set. */
1501+
} else if (set->index_dir != NULL) {
1502+
path = set->index_dir;
1503+
} else {
1504+
path = set->root_dir;
1505+
}
1506+
break;
15071507
case MAILBOX_LIST_PATH_TYPE_INDEX_PRIVATE:
15081508
path = set->index_pvt_dir;
15091509
break;

‎src/lib-storage/mailbox-list.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ enum mailbox_list_path_type {
9595
/* Return mailbox list index directory (usually same as
9696
MAILBOX_LIST_PATH_TYPE_INDEX) */
9797
MAILBOX_LIST_PATH_TYPE_LIST_INDEX,
98-
/* Return mailbox fts index directory path */
99-
MAILBOX_LIST_PATH_TYPE_FTS_INDEX,
98+
/* Return mailbox fts index directory path */
99+
MAILBOX_LIST_PATH_TYPE_FTS_INDEX,
100100

101101
MAILBOX_LIST_PATH_TYPE_COUNT
102102
};

‎src/plugins/fts-flatcurve/fts-backend-flatcurve.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,20 @@ fts_backend_flatcurve_set_mailbox(struct flatcurve_fts_backend *backend,
126126
}
127127

128128
if (mailbox_open(box) < 0
129-
|| (mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_INDEX) == 0 &&
130-
mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX) == 0)
131-
) {
129+
|| (mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_INDEX) == 0 &&
130+
mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX) == 0)
131+
) {
132132
*error_r = t_strdup_printf("Could not open mailbox: %s: %s",
133-
box->vname,
134-
mailbox_get_last_internal_error(box, NULL));
133+
box->vname,
134+
mailbox_get_last_internal_error(box, NULL));
135135
return -1;
136136
}
137137

138-
if (mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX)) {
139-
mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX, &path);
140-
} else {
141-
mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_INDEX, &path);
142-
}
138+
if (mailbox_path_exists(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX)) {
139+
mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_FTS_INDEX, &path);
140+
} else {
141+
mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_INDEX, &path);
142+
}
143143

144144
str_append(backend->boxname, box->vname);
145145
str_printfa(backend->db_path, "%s/%s/", path, FTS_FLATCURVE_LABEL);

‎src/plugins/fts/fts-storage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -959,8 +959,8 @@ fts_mailbox_list_created(struct mailbox_list *list)
959959
return;
960960
}
961961

962-
/* TODO: Create config item for MAILBOX_LIST_PATH_TYPE... FTS_INDEX||=INDEX */
963-
bool has_fts_index_path = mailbox_list_get_root_path(list, MAILBOX_LIST_PATH_TYPE_FTS_INDEX, &path);
962+
/* TODO: Create config item for MAILBOX_LIST_PATH_TYPE... FTS_INDEX||=INDEX */
963+
bool has_fts_index_path = mailbox_list_get_root_path(list, MAILBOX_LIST_PATH_TYPE_FTS_INDEX, &path);
964964
if (!mailbox_list_get_root_path(list, MAILBOX_LIST_PATH_TYPE_INDEX, &path) && !has_fts_index_path) {
965965
e_debug(list->ns->user->event,
966966
"fts: Indexes disabled for namespace '%s'",

0 commit comments

Comments
 (0)