dovecot-2.1: mailbox list indexes: Use storage names instead of ...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Oct 2 16:47:48 EEST 2011
details: http://hg.dovecot.org/dovecot-2.1/rev/e06e178c8fd1
changeset: 13584:e06e178c8fd1
user: Timo Sirainen <tss at iki.fi>
date: Sun Oct 02 16:55:45 2011 +0300
description:
mailbox list indexes: Use storage names instead of virtual names.
diffstat:
src/lib-storage/list/index-mailbox-list-status.c | 4 ++--
src/lib-storage/list/index-mailbox-list.c | 13 ++++++++-----
src/lib-storage/list/index-mailbox-list.h | 2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
diffs (78 lines):
diff -r 93cba8e84546 -r e06e178c8fd1 src/lib-storage/list/index-mailbox-list-status.c
--- a/src/lib-storage/list/index-mailbox-list-status.c Sun Oct 02 16:51:40 2011 +0300
+++ b/src/lib-storage/list/index-mailbox-list-status.c Sun Oct 02 16:55:45 2011 +0300
@@ -33,7 +33,7 @@
if (index_mailbox_list_refresh(box->list) < 0)
return -1;
- node = index_mailbox_list_lookup(box->list, box->vname);
+ node = index_mailbox_list_lookup(box->list, box->name);
if (node == NULL) {
/* mailbox not found */
return 0;
@@ -248,7 +248,7 @@
struct mailbox_status status;
uint32_t seq, seq1, seq2;
- node = index_mailbox_list_lookup(box->list, box->vname);
+ node = index_mailbox_list_lookup(box->list, box->name);
if (node == NULL) {
index_mailbox_list_refresh_later(box->list);
return;
diff -r 93cba8e84546 -r e06e178c8fd1 src/lib-storage/list/index-mailbox-list.c
--- a/src/lib-storage/list/index-mailbox-list.c Sun Oct 02 16:51:40 2011 +0300
+++ b/src/lib-storage/list/index-mailbox-list.c Sun Oct 02 16:55:45 2011 +0300
@@ -106,7 +106,7 @@
}
struct index_mailbox_node *
-index_mailbox_list_lookup(struct mailbox_list *list, const char *vname)
+index_mailbox_list_lookup(struct mailbox_list *list, const char *name)
{
struct index_mailbox_list *ilist = INDEX_LIST_CONTEXT(list);
struct index_mailbox_node *node;
@@ -118,8 +118,8 @@
unsigned int i;
char sep[2];
- sep[0] = mail_namespace_get_sep(list->ns); sep[1] = '\0';
- path = t_strsplit(vname, sep);
+ sep[0] = mailbox_list_get_hierarchy_sep(list); sep[1] = '\0';
+ path = t_strsplit(name, sep);
node = ilist->mailbox_tree;
for (i = 0;; i++) {
node = index_mailbox_node_find_sibling(node, path[i]);
@@ -289,7 +289,7 @@
memset(&sync_ctx, 0, sizeof(sync_ctx));
sync_ctx.ilist = ilist;
- sync_ctx.sep[0] = mail_namespace_get_sep(list->ns);
+ sync_ctx.sep[0] = mailbox_list_get_hierarchy_sep(list);
if (mail_index_sync_begin(ilist->index, &sync_ctx.sync_ctx,
&sync_ctx.view, &sync_ctx.trans,
MAIL_INDEX_SYNC_FLAG_AVOID_FLAG_UPDATES) < 0)
@@ -326,8 +326,11 @@
flags |= MAILBOX_LIST_INDEX_FLAG_NOINFERIORS;
T_BEGIN {
+ const char *name =
+ mailbox_list_get_storage_name(info->ns->list,
+ info->name);
seq = index_mailbox_list_sync_name(&sync_ctx,
- info->name, flags);
+ name, flags);
} T_END;
mail_index_update_flags(sync_ctx.trans, seq,
diff -r 93cba8e84546 -r e06e178c8fd1 src/lib-storage/list/index-mailbox-list.h
--- a/src/lib-storage/list/index-mailbox-list.h Sun Oct 02 16:51:40 2011 +0300
+++ b/src/lib-storage/list/index-mailbox-list.h Sun Oct 02 16:55:45 2011 +0300
@@ -97,7 +97,7 @@
&mailbox_list_module_register);
struct index_mailbox_node *
-index_mailbox_list_lookup(struct mailbox_list *list, const char *vname);
+index_mailbox_list_lookup(struct mailbox_list *list, const char *name);
int index_mailbox_list_refresh(struct mailbox_list *list);
void index_mailbox_list_refresh_later(struct mailbox_list *list);
More information about the dovecot-cvs
mailing list