dovecot-2.2: Renamed struct mailbox_info.name to vname.
dovecot at dovecot.org
dovecot at dovecot.org
Sat Aug 11 08:10:43 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/e852d1fbf40a
changeset: 14865:e852d1fbf40a
user: Timo Sirainen <tss at iki.fi>
date: Sat Aug 11 08:10:32 2012 +0300
description:
Renamed struct mailbox_info.name to vname.
diffstat:
TODO | 5 +--
src/doveadm/doveadm-mail-altmove.c | 2 +-
src/doveadm/doveadm-mail-expunge.c | 2 +-
src/doveadm/doveadm-mail-import.c | 2 +-
src/doveadm/doveadm-mail-index.c | 8 ++--
src/doveadm/doveadm-mail-iter.c | 4 +-
src/doveadm/doveadm-mail-mailbox-status.c | 2 +-
src/doveadm/doveadm-mail-mailbox.c | 6 +-
src/doveadm/doveadm-mail-move.c | 2 +-
src/doveadm/doveadm-mail.c | 6 +-
src/doveadm/doveadm-mailbox-list-iter.c | 6 +-
src/doveadm/dsync/dsync-mailbox-tree-fill.c | 8 ++--
src/imap/cmd-list.c | 4 +-
src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c | 2 +-
src/lib-storage/index/imapc/imapc-list.c | 10 ++--
src/lib-storage/list/mailbox-list-fs-iter.c | 14 ++++----
src/lib-storage/list/mailbox-list-index-iter.c | 10 ++--
src/lib-storage/list/mailbox-list-index-sync.c | 2 +-
src/lib-storage/list/mailbox-list-maildir-iter.c | 4 +-
src/lib-storage/list/mailbox-list-maildir.c | 6 +-
src/lib-storage/list/mailbox-list-none.c | 2 +-
src/lib-storage/list/mailbox-list-subscriptions.c | 2 +-
src/lib-storage/mailbox-guid-cache.c | 6 +-
src/lib-storage/mailbox-list-iter.c | 28 ++++++++--------
src/lib-storage/mailbox-list.h | 2 +-
src/plugins/acl/acl-backend-vfile-acllist.c | 2 +-
src/plugins/acl/acl-mailbox-list.c | 24 ++++++------
src/plugins/fts-lucene/lucene-wrapper.cc | 2 +-
src/plugins/fts-solr/fts-backend-solr.c | 2 +-
src/plugins/quota/quota-count.c | 2 +-
src/plugins/quota/quota-maildir.c | 4 +-
src/plugins/virtual/virtual-config.c | 8 ++--
32 files changed, 93 insertions(+), 96 deletions(-)
diffs (truncated from 796 to 300 lines):
diff -r ec5346eb7d60 -r e852d1fbf40a TODO
--- a/TODO Sat Aug 11 08:03:05 2012 +0300
+++ b/TODO Sat Aug 11 08:10:32 2012 +0300
@@ -1,4 +1,4 @@
- - Unfinished extensions: MOVE, NOTIFY, BINARY
+ - Unfinished extensions: MOVE, NOTIFY
- indexer-worker and maybe others (doveadm?) could support dropping privileges
permanently when service_count=1. Note that LMTP can't with multiple RCPT
TOs.
@@ -11,10 +11,7 @@
- FIFOs maybe should be counted as connections, but unlisten should
unlink+reopen it in master?
- mailbox list indexes + imaptest test=tests fails
- - mailbox_enable() -> mail_user_enable()?
- - mailbox_info.name -> vname
- change proxy TTL so it stops at 1?
- - istream-concat
- lmtp client/proxy: Handle multiline replies better
- recreate mailbox -> existing sessions log "indexid changed" error
- add message/mime limits
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mail-altmove.c
--- a/src/doveadm/doveadm-mail-altmove.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mail-altmove.c Sat Aug 11 08:10:32 2012 +0300
@@ -32,7 +32,7 @@
while (doveadm_mail_iter_next(iter, &mail)) {
if (doveadm_debug) {
i_debug("altmove: box=%s uid=%u",
- info->name, mail->uid);
+ info->vname, mail->uid);
}
mail_update_flags(mail, modify_type,
(enum mail_flags)MAIL_INDEX_MAIL_FLAG_BACKEND);
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mail-expunge.c
--- a/src/doveadm/doveadm-mail-expunge.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mail-expunge.c Sat Aug 11 08:10:32 2012 +0300
@@ -34,7 +34,7 @@
while (doveadm_mail_iter_next(iter, &mail)) {
if (doveadm_debug) {
i_debug("expunge: box=%s uid=%u",
- info->name, mail->uid);
+ info->vname, mail->uid);
}
mail_expunge(mail);
}
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mail-import.c
--- a/src/doveadm/doveadm-mail-import.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mail-import.c Sat Aug 11 08:10:32 2012 +0300
@@ -125,7 +125,7 @@
if (doveadm_mail_iter_next(iter, &mail)) {
/* at least one mail matches in this mailbox */
- if (dest_mailbox_open_or_create(ctx, dest_user, info->name,
+ if (dest_mailbox_open_or_create(ctx, dest_user, info->vname,
&box) < 0)
ret = -1;
else {
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mail-index.c
--- a/src/doveadm/doveadm-mail-index.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mail-index.c Sat Aug 11 08:10:32 2012 +0300
@@ -87,14 +87,14 @@
struct mailbox_status status;
int ret = 0;
- box = mailbox_alloc(info->ns->list, info->name,
+ box = mailbox_alloc(info->ns->list, info->vname,
MAILBOX_FLAG_IGNORE_ACLS);
if (ctx->max_recent_msgs != 0) {
/* index only if there aren't too many recent messages.
don't bother syncing the mailbox, that alone can take a
while with large maildirs. */
if (mailbox_open(box) < 0) {
- i_error("Opening mailbox %s failed: %s", info->name,
+ i_error("Opening mailbox %s failed: %s", info->vname,
mail_storage_get_last_error(mailbox_get_storage(box), NULL));
doveadm_mail_failed_mailbox(&ctx->ctx, box);
mailbox_free(&box);
@@ -109,7 +109,7 @@
}
if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
- i_error("Syncing mailbox %s failed: %s", info->name,
+ i_error("Syncing mailbox %s failed: %s", info->vname,
mail_storage_get_last_error(mailbox_get_storage(box), NULL));
doveadm_mail_failed_mailbox(&ctx->ctx, box);
ret = -1;
@@ -185,7 +185,7 @@
if ((info->flags & (MAILBOX_NOSELECT |
MAILBOX_NONEXISTENT)) == 0) T_BEGIN {
if (ctx->queue)
- cmd_index_queue(ctx, user, info->name);
+ cmd_index_queue(ctx, user, info->vname);
else {
if (cmd_index_box(ctx, info) < 0)
ret = -1;
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mail-iter.c
--- a/src/doveadm/doveadm-mail-iter.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mail-iter.c Sat Aug 11 08:10:32 2012 +0300
@@ -29,12 +29,12 @@
iter = i_new(struct doveadm_mail_iter, 1);
iter->ctx = ctx;
- iter->box = mailbox_alloc(info->ns->list, info->name,
+ iter->box = mailbox_alloc(info->ns->list, info->vname,
MAILBOX_FLAG_IGNORE_ACLS);
iter->search_args = search_args;
if (mailbox_sync(iter->box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
- i_error("Syncing mailbox %s failed: %s", info->name,
+ i_error("Syncing mailbox %s failed: %s", info->vname,
mailbox_get_last_error(iter->box, NULL));
doveadm_mail_failed_mailbox(ctx, iter->box);
mailbox_free(&iter->box);
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mail-mailbox-status.c
--- a/src/doveadm/doveadm-mail-mailbox-status.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mail-mailbox-status.c Sat Aug 11 08:10:32 2012 +0300
@@ -125,7 +125,7 @@
struct mailbox_status status;
struct mailbox_metadata metadata;
- box = doveadm_mailbox_find(ctx->ctx.cur_mail_user, info->name);
+ box = doveadm_mailbox_find(ctx->ctx.cur_mail_user, info->vname);
if (mailbox_get_status(box, ctx->status_items, &status) < 0 ||
mailbox_get_metadata(box, ctx->metadata_items, &metadata) < 0) {
doveadm_mail_failed_mailbox(&ctx->ctx, box);
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mail-mailbox.c
--- a/src/doveadm/doveadm-mail-mailbox.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mail-mailbox.c Sat Aug 11 08:10:32 2012 +0300
@@ -121,10 +121,10 @@
iter_flags);
while ((info = doveadm_mailbox_list_iter_next(iter)) != NULL) {
if (!ctx->mutf7)
- doveadm_print(info->name);
+ doveadm_print(info->vname);
else {
str_truncate(str, 0);
- if (imap_utf8_to_utf7(info->name, str) < 0)
+ if (imap_utf8_to_utf7(info->vname, str) < 0)
i_unreached();
doveadm_print(str_c(str));
}
@@ -285,7 +285,7 @@
iter = mailbox_list_iter_init(ns->list, pattern,
MAILBOX_LIST_ITER_RETURN_NO_FLAGS);
while ((info = mailbox_list_iter_next(iter)) != NULL) {
- child_name = t_strdup(info->name);
+ child_name = t_strdup(info->vname);
array_append(mailboxes, &child_name, 1);
}
return mailbox_list_iter_deinit(&iter);
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mail-move.c
--- a/src/doveadm/doveadm-mail-move.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mail-move.c Sat Aug 11 08:10:32 2012 +0300
@@ -44,7 +44,7 @@
mail_expunge(mail);
else {
i_error("Copying message UID %u from '%s' failed: %s",
- mail->uid, info->name,
+ mail->uid, info->vname,
mailbox_get_last_error(destbox, NULL));
doveadm_mail_failed_mailbox(&ctx->ctx, destbox);
ret = -1;
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mail.c
--- a/src/doveadm/doveadm-mail.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mail.c Sat Aug 11 08:10:32 2012 +0300
@@ -202,17 +202,17 @@
struct mailbox *box;
int ret = 0;
- box = mailbox_alloc(info->ns->list, info->name,
+ box = mailbox_alloc(info->ns->list, info->vname,
MAILBOX_FLAG_IGNORE_ACLS);
if (mailbox_open(box) < 0) {
- i_error("Opening mailbox %s failed: %s", info->name,
+ i_error("Opening mailbox %s failed: %s", info->vname,
mailbox_get_last_error(box, NULL));
doveadm_mail_failed_mailbox(ctx, box);
ret = -1;
} else if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FORCE_RESYNC |
MAILBOX_SYNC_FLAG_FIX_INCONSISTENT) < 0) {
i_error("Forcing a resync on mailbox %s failed: %s",
- info->name, mailbox_get_last_error(box, NULL));
+ info->vname, mailbox_get_last_error(box, NULL));
doveadm_mail_failed_mailbox(ctx, box);
ret = -1;
}
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/doveadm-mailbox-list-iter.c
--- a/src/doveadm/doveadm-mailbox-list-iter.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/doveadm-mailbox-list-iter.c Sat Aug 11 08:10:32 2012 +0300
@@ -168,9 +168,9 @@
if (iter->pattern_idx == count)
return NULL;
- iter->info.name = patterns[iter->pattern_idx++];
+ iter->info.vname = patterns[iter->pattern_idx++];
iter->info.ns = mail_namespace_find(iter->user->namespaces,
- iter->info.name);
+ iter->info.vname);
if (iter->info.ns != NULL)
return &iter->info;
/* FIXME: maybe fail?.. or just wait for v2.2 to get rid of
@@ -187,7 +187,7 @@
}
if (mail_search_args_match_mailbox(iter->search_args,
- info->name, sep))
+ info->vname, sep))
break;
}
return info;
diff -r ec5346eb7d60 -r e852d1fbf40a src/doveadm/dsync/dsync-mailbox-tree-fill.c
--- a/src/doveadm/dsync/dsync-mailbox-tree-fill.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-tree-fill.c Sat Aug 11 08:10:32 2012 +0300
@@ -18,12 +18,12 @@
{
struct dsync_mailbox_node *node;
- node = dsync_mailbox_tree_get(tree, info->name);
+ node = dsync_mailbox_tree_get(tree, info->vname);
if (node->ns != info->ns) {
i_assert(node->ns != NULL);
i_error("Mailbox '%s' exists in two namespaces: '%s' and '%s'",
- info->name, node->ns->prefix, info->ns->prefix);
+ info->vname, node->ns->prefix, info->ns->prefix);
return -1;
}
*node_r = node;
@@ -51,7 +51,7 @@
return 0;
/* get GUID and UIDVALIDITY for selectable mailbox */
- box = mailbox_alloc(info->ns->list, info->name, 0);
+ box = mailbox_alloc(info->ns->list, info->vname, 0);
if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID, &metadata) < 0 ||
mailbox_get_status(box, STATUS_UIDVALIDITY, &status) < 0) {
errstr = mailbox_get_last_error(box, &error);
@@ -64,7 +64,7 @@
break;
default:
i_error("Failed to access mailbox %s: %s",
- info->name, errstr);
+ info->vname, errstr);
mailbox_free(&box);
return -1;
}
diff -r ec5346eb7d60 -r e852d1fbf40a src/imap/cmd-list.c
--- a/src/imap/cmd-list.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/imap/cmd-list.c Sat Aug 11 08:10:32 2012 +0300
@@ -200,7 +200,7 @@
list_iter = mailbox_list_iter_init(ns->list, "INBOX", 0);
info = mailbox_list_iter_next(list_iter);
if (info != NULL) {
- i_assert(strcasecmp(info->name, "INBOX") == 0);
+ i_assert(strcasecmp(info->vname, "INBOX") == 0);
flags = info->flags;
}
(void)mailbox_list_iter_deinit(&list_iter);
@@ -424,7 +424,7 @@
str = t_str_new(256);
mutf7_name = t_str_new(128);
while ((info = mailbox_list_iter_next(ctx->list_iter)) != NULL) {
- name = info->name;
+ name = info->vname;
flags = info->flags;
if (strcasecmp(name, "INBOX") == 0) {
diff -r ec5346eb7d60 -r e852d1fbf40a src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c Sat Aug 11 08:10:32 2012 +0300
@@ -543,7 +543,7 @@
if ((info->flags & (MAILBOX_NONEXISTENT |
MAILBOX_NOSELECT)) == 0) {
T_BEGIN {
- ret = rebuild_mailbox(ctx, ns, info->name);
+ ret = rebuild_mailbox(ctx, ns, info->vname);
} T_END;
if (ret < 0) {
ret = -1;
diff -r ec5346eb7d60 -r e852d1fbf40a src/lib-storage/index/imapc/imapc-list.c
--- a/src/lib-storage/index/imapc/imapc-list.c Sat Aug 11 08:03:05 2012 +0300
+++ b/src/lib-storage/index/imapc/imapc-list.c Sat Aug 11 08:10:32 2012 +0300
@@ -332,9 +332,9 @@
MAILBOX_LIST_ITER_NO_AUTO_BOXES |
MAILBOX_LIST_ITER_RETURN_NO_FLAGS);
while ((info = mailbox_list_iter_next(iter)) != NULL) {
- if (mailbox_tree_lookup(list->mailboxes, info->name) == NULL) {
+ if (mailbox_tree_lookup(list->mailboxes, info->vname) == NULL) {
fs_name = mailbox_list_get_storage_name(fs_list,
- info->name);
+ info->vname);
(void)fs_list->v.delete_mailbox(fs_list, fs_name);
}
}
@@ -467,7 +467,7 @@
struct imapc_mailbox_list_iterate_context *ctx =
(struct imapc_mailbox_list_iterate_context *)_ctx;
struct mailbox_node *node;
- const char *name;
+ const char *vname;
More information about the dovecot-cvs
mailing list