dovecot-2.2: Renamed enum namespace_type to enum mail_namespace_...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Sep 2 19:53:03 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/368f3b2e3264
changeset: 15012:368f3b2e3264
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 02 19:22:13 2012 +0300
description:
Renamed enum namespace_type to enum mail_namespace_type
diffstat:
src/doveadm/doveadm-mail-altmove.c | 2 +-
src/doveadm/doveadm-mail-index.c | 3 +--
src/doveadm/doveadm-mail.c | 6 +++---
src/doveadm/doveadm-mailbox-list-iter.c | 16 +++++++++-------
src/imap/cmd-list.c | 3 +--
src/imap/cmd-namespace.c | 11 +++++++----
src/imap/cmd-notify.c | 2 +-
src/lib-storage/index/maildir/maildir-storage.c | 2 +-
src/lib-storage/index/shared/shared-storage.c | 2 +-
src/lib-storage/list/mailbox-list-fs-iter.c | 2 +-
src/lib-storage/list/mailbox-list-index.c | 2 +-
src/lib-storage/list/mailbox-list-subscriptions.c | 2 +-
src/lib-storage/mail-namespace.c | 12 ++++++------
src/lib-storage/mail-namespace.h | 13 ++++++++-----
src/lib-storage/mail-storage.c | 4 ++--
src/lib-storage/mailbox-list-iter.c | 6 +++---
src/lib-storage/mailbox-list.c | 7 ++++---
src/lib-storage/mailbox-list.h | 4 ++--
src/plugins/acl/acl-mailbox-list.c | 6 +++---
src/plugins/acl/acl-shared-storage.c | 2 +-
src/plugins/acl/doveadm-acl.c | 4 ++--
src/plugins/imap-acl/imap-acl-plugin.c | 8 +++++---
src/plugins/lazy-expunge/lazy-expunge-plugin.c | 2 +-
src/plugins/quota/quota-maildir.c | 3 ++-
src/plugins/virtual/virtual-config.c | 4 ++--
25 files changed, 69 insertions(+), 59 deletions(-)
diffs (truncated from 518 to 300 lines):
diff -r d3a9769dad2e -r 368f3b2e3264 src/doveadm/doveadm-mail-altmove.c
--- a/src/doveadm/doveadm-mail-altmove.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/doveadm/doveadm-mail-altmove.c Sun Sep 02 19:22:13 2012 +0300
@@ -90,7 +90,7 @@
/* make sure all private storages have been purged */
storages = array_get(&purged_storages, &count);
for (ns = user->namespaces; ns != NULL; ns = ns->next) {
- if (ns->type != NAMESPACE_PRIVATE)
+ if (ns->type != MAIL_NAMESPACE_TYPE_PRIVATE)
continue;
for (i = 0; i < count; i++) {
diff -r d3a9769dad2e -r 368f3b2e3264 src/doveadm/doveadm-mail-index.c
--- a/src/doveadm/doveadm-mail-index.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/doveadm/doveadm-mail-index.c Sun Sep 02 19:22:13 2012 +0300
@@ -165,8 +165,7 @@
MAILBOX_LIST_ITER_NO_AUTO_BOXES |
MAILBOX_LIST_ITER_RETURN_NO_FLAGS |
MAILBOX_LIST_ITER_STAR_WITHIN_NS;
- const enum namespace_type ns_mask =
- NAMESPACE_PRIVATE | NAMESPACE_SHARED | NAMESPACE_PUBLIC;
+ const enum mail_namespace_type ns_mask = MAIL_NAMESPACE_TYPE_MASK_ALL;
struct mailbox_list_iterate_context *iter;
const struct mailbox_info *info;
unsigned int i;
diff -r d3a9769dad2e -r 368f3b2e3264 src/doveadm/doveadm-mail.c
--- a/src/doveadm/doveadm-mail.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/doveadm/doveadm-mail.c Sun Sep 02 19:22:13 2012 +0300
@@ -108,7 +108,8 @@
int ret = 0;
for (ns = user->namespaces; ns != NULL; ns = ns->next) {
- if (ns->type != NAMESPACE_PRIVATE || ns->alias_for != NULL)
+ if (ns->type != MAIL_NAMESPACE_TYPE_PRIVATE ||
+ ns->alias_for != NULL)
continue;
if (mail_storage_purge(ns->storage) < 0) {
@@ -227,8 +228,7 @@
MAILBOX_LIST_ITER_RAW_LIST |
MAILBOX_LIST_ITER_RETURN_NO_FLAGS |
MAILBOX_LIST_ITER_STAR_WITHIN_NS;
- const enum namespace_type ns_mask =
- NAMESPACE_PRIVATE | NAMESPACE_SHARED | NAMESPACE_PUBLIC;
+ const enum mail_namespace_type ns_mask = MAIL_NAMESPACE_TYPE_MASK_ALL;
struct mailbox_list_iterate_context *iter;
const struct mailbox_info *info;
int ret = 0;
diff -r d3a9769dad2e -r 368f3b2e3264 src/doveadm/doveadm-mailbox-list-iter.c
--- a/src/doveadm/doveadm-mailbox-list-iter.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/doveadm/doveadm-mailbox-list-iter.c Sun Sep 02 19:22:13 2012 +0300
@@ -71,7 +71,7 @@
struct mail_user *user,
struct mail_search_args *search_args,
enum mailbox_list_iter_flags iter_flags,
- enum namespace_type ns_mask)
+ enum mail_namespace_type ns_mask)
{
static const char *all_pattern = "*";
struct doveadm_mailbox_list_iter *iter;
@@ -88,12 +88,15 @@
if (array_count(&iter->patterns) == 0) {
iter_flags |= MAILBOX_LIST_ITER_SKIP_ALIASES;
- if (have_guid)
- ns_mask |= NAMESPACE_SHARED | NAMESPACE_PUBLIC;
+ if (have_guid) {
+ ns_mask |= MAIL_NAMESPACE_TYPE_SHARED |
+ MAIL_NAMESPACE_TYPE_PUBLIC;
+ }
array_append(&iter->patterns, &all_pattern, 1);
} else if (have_wildcards) {
iter_flags |= MAILBOX_LIST_ITER_STAR_WITHIN_NS;
- ns_mask |= NAMESPACE_SHARED | NAMESPACE_PUBLIC;
+ ns_mask |= MAIL_NAMESPACE_TYPE_SHARED |
+ MAIL_NAMESPACE_TYPE_PUBLIC;
} else {
/* just return the listed mailboxes without actually
iterating through. this also allows accessing mailboxes
@@ -116,7 +119,7 @@
struct mail_search_args *search_args,
enum mailbox_list_iter_flags iter_flags)
{
- enum namespace_type ns_mask = NAMESPACE_PRIVATE;
+ enum mail_namespace_type ns_mask = MAIL_NAMESPACE_TYPE_PRIVATE;
return doveadm_mailbox_list_iter_init_nsmask(ctx, user, search_args,
iter_flags, ns_mask);
@@ -128,8 +131,7 @@
struct mail_search_args *search_args,
enum mailbox_list_iter_flags iter_flags)
{
- enum namespace_type ns_mask =
- NAMESPACE_PRIVATE | NAMESPACE_SHARED | NAMESPACE_PUBLIC;
+ enum mail_namespace_type ns_mask = MAIL_NAMESPACE_TYPE_MASK_ALL;
struct doveadm_mailbox_list_iter *iter;
iter = doveadm_mailbox_list_iter_init_nsmask(ctx, user, search_args,
diff -r d3a9769dad2e -r 368f3b2e3264 src/imap/cmd-list.c
--- a/src/imap/cmd-list.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/imap/cmd-list.c Sun Sep 02 19:22:13 2012 +0300
@@ -298,8 +298,7 @@
static void cmd_list_init(struct cmd_list_context *ctx,
const char *const *patterns)
{
- enum namespace_type type_mask =
- NAMESPACE_PRIVATE | NAMESPACE_SHARED | NAMESPACE_PUBLIC;
+ enum mail_namespace_type type_mask = MAIL_NAMESPACE_TYPE_MASK_ALL;
ctx->list_iter =
mailbox_list_iter_init_namespaces(ctx->user->namespaces,
diff -r d3a9769dad2e -r 368f3b2e3264 src/imap/cmd-namespace.c
--- a/src/imap/cmd-namespace.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/imap/cmd-namespace.c Sun Sep 02 19:22:13 2012 +0300
@@ -8,7 +8,7 @@
#include "mail-namespace.h"
static void list_namespaces(struct mail_namespace *ns,
- enum namespace_type type, string_t *str)
+ enum mail_namespace_type type, string_t *str)
{
string_t *mutf7_prefix = t_str_new(64);
char ns_sep;
@@ -55,11 +55,14 @@
str = t_str_new(256);
str_append(str, "* NAMESPACE ");
- list_namespaces(client->user->namespaces, NAMESPACE_PRIVATE, str);
+ list_namespaces(client->user->namespaces,
+ MAIL_NAMESPACE_TYPE_PRIVATE, str);
str_append_c(str, ' ');
- list_namespaces(client->user->namespaces, NAMESPACE_SHARED, str);
+ list_namespaces(client->user->namespaces,
+ MAIL_NAMESPACE_TYPE_SHARED, str);
str_append_c(str, ' ');
- list_namespaces(client->user->namespaces, NAMESPACE_PUBLIC, str);
+ list_namespaces(client->user->namespaces,
+ MAIL_NAMESPACE_TYPE_PUBLIC, str);
client_send_line(client, str_c(str));
client_send_tagline(cmd, "OK Namespace completed.");
diff -r d3a9769dad2e -r 368f3b2e3264 src/imap/cmd-notify.c
--- a/src/imap/cmd-notify.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/imap/cmd-notify.c Sun Sep 02 19:22:13 2012 +0300
@@ -198,7 +198,7 @@
struct mail_namespace *ns;
for (ns = ctx->client->user->namespaces; ns != NULL; ns = ns->next) {
- if (ns->type == NAMESPACE_PRIVATE) {
+ if (ns->type == MAIL_NAMESPACE_TYPE_PRIVATE) {
cmd_notify_add_mailbox(ctx, ns, "",
IMAP_NOTIFY_TYPE_SUBTREE, events);
}
diff -r d3a9769dad2e -r 368f3b2e3264 src/lib-storage/index/maildir/maildir-storage.c
--- a/src/lib-storage/index/maildir/maildir-storage.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/lib-storage/index/maildir/maildir-storage.c Sun Sep 02 19:22:13 2012 +0300
@@ -182,7 +182,7 @@
mail_storage_set_error(storage, MAIL_ERROR_NOTFOUND,
"Mailbox was deleted while it was being created");
} else if (errno == EACCES) {
- if (ns->type == NAMESPACE_SHARED) {
+ if (ns->type == MAIL_NAMESPACE_TYPE_SHARED) {
/* shared namespace, don't log permission errors */
mail_storage_set_error(storage, MAIL_ERROR_PERM,
MAIL_ERRSTR_NO_PERMISSION);
diff -r d3a9769dad2e -r 368f3b2e3264 src/lib-storage/index/shared/shared-storage.c
--- a/src/lib-storage/index/shared/shared-storage.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/lib-storage/index/shared/shared-storage.c Sun Sep 02 19:22:13 2012 +0300
@@ -279,7 +279,7 @@
/* create the new namespace */
new_ns = i_new(struct mail_namespace, 1);
new_ns->refcount = 1;
- new_ns->type = NAMESPACE_SHARED;
+ new_ns->type = MAIL_NAMESPACE_TYPE_SHARED;
new_ns->user = user;
new_ns->prefix = i_strdup(str_c(prefix));
new_ns->owner = owner;
diff -r d3a9769dad2e -r 368f3b2e3264 src/lib-storage/list/mailbox-list-fs-iter.c
--- a/src/lib-storage/list/mailbox-list-fs-iter.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c Sun Sep 02 19:22:13 2012 +0300
@@ -393,7 +393,7 @@
INBOX's children). */
root = "";
} else if ((ns->flags & NAMESPACE_FLAG_INBOX_ANY) != 0 &&
- ns->type == NAMESPACE_SHARED &&
+ ns->type == MAIL_NAMESPACE_TYPE_SHARED &&
!ctx->ctx.list->mail_set->mail_shared_explicit_inbox &&
(prefix_vname[0] == '\0' ||
(strncmp(ns->prefix, prefix_vname, ns->prefix_len-1) == 0 &&
diff -r d3a9769dad2e -r 368f3b2e3264 src/lib-storage/list/mailbox-list-index.c
--- a/src/lib-storage/list/mailbox-list-index.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/lib-storage/list/mailbox-list-index.c Sun Sep 02 19:22:13 2012 +0300
@@ -402,7 +402,7 @@
if (*dir == '\0') {
/* in-memory indexes */
dir = NULL;
- } else if (list->ns->type != NAMESPACE_PRIVATE) {
+ } else if (list->ns->type != MAIL_NAMESPACE_TYPE_PRIVATE) {
/* don't create index files for shared/public mailboxes.
their indexes may be shared between multiple users,
each of which may have different ACLs */
diff -r d3a9769dad2e -r 368f3b2e3264 src/lib-storage/list/mailbox-list-subscriptions.c
--- a/src/lib-storage/list/mailbox-list-subscriptions.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/lib-storage/list/mailbox-list-subscriptions.c Sun Sep 02 19:22:13 2012 +0300
@@ -56,7 +56,7 @@
/* When listing shared namespace's subscriptions, we need to
autocreate all the visible child namespaces. their subscriptions
are listed later. */
- if (ns != NULL && ns->type == NAMESPACE_SHARED &&
+ if (ns != NULL && ns->type == MAIL_NAMESPACE_TYPE_SHARED &&
(ns->flags & NAMESPACE_FLAG_AUTOCREATED) == 0) {
/* we'll need to get the namespace autocreated.
one easy way is to just ask if a mailbox name under
diff -r d3a9769dad2e -r 368f3b2e3264 src/lib-storage/mail-namespace.c
--- a/src/lib-storage/mail-namespace.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/lib-storage/mail-namespace.c Sun Sep 02 19:22:13 2012 +0300
@@ -59,11 +59,11 @@
ns->user = user;
if (strncmp(ns_set->type, "private", 7) == 0) {
ns->owner = user;
- ns->type = NAMESPACE_PRIVATE;
+ ns->type = MAIL_NAMESPACE_TYPE_PRIVATE;
} else if (strncmp(ns_set->type, "shared", 6) == 0)
- ns->type = NAMESPACE_SHARED;
+ ns->type = MAIL_NAMESPACE_TYPE_SHARED;
else if (strncmp(ns_set->type, "public", 6) == 0)
- ns->type = NAMESPACE_PUBLIC;
+ ns->type = MAIL_NAMESPACE_TYPE_PUBLIC;
else {
*error_r = t_strdup_printf("Unknown namespace type: %s",
ns_set->type);
@@ -111,7 +111,7 @@
ns->mail_set = mail_set;
ns->prefix = i_strdup(ns_set->prefix);
- if (ns->type == NAMESPACE_SHARED &&
+ if (ns->type == MAIL_NAMESPACE_TYPE_SHARED &&
(strchr(ns->prefix, '%') != NULL ||
strchr(ns->set->location, '%') != NULL)) {
/* dynamic shared namespace. the above check catches wrong
@@ -342,7 +342,7 @@
ns = i_new(struct mail_namespace, 1);
ns->refcount = 1;
- ns->type = NAMESPACE_PRIVATE;
+ ns->type = MAIL_NAMESPACE_TYPE_PRIVATE;
ns->flags = NAMESPACE_FLAG_INBOX_USER | NAMESPACE_FLAG_INBOX_ANY |
NAMESPACE_FLAG_LIST_PREFIX | NAMESPACE_FLAG_SUBSCRIPTIONS;
ns->owner = user;
@@ -593,7 +593,7 @@
struct mail_namespace *ns;
ns = mail_namespace_find_mask(namespaces, mailbox, 0, 0);
- if (ns != NULL && ns->type == NAMESPACE_SHARED &&
+ if (ns != NULL && ns->type == MAIL_NAMESPACE_TYPE_SHARED &&
(ns->flags & NAMESPACE_FLAG_AUTOCREATED) == 0) {
/* see if we need to autocreate a namespace for shared user */
if (strchr(mailbox, mail_namespace_get_sep(ns)) != NULL)
diff -r d3a9769dad2e -r 368f3b2e3264 src/lib-storage/mail-namespace.h
--- a/src/lib-storage/mail-namespace.h Sun Sep 02 18:16:06 2012 +0300
+++ b/src/lib-storage/mail-namespace.h Sun Sep 02 19:22:13 2012 +0300
@@ -5,10 +5,13 @@
struct mail_storage_callbacks;
-enum namespace_type {
- NAMESPACE_PRIVATE = 0x01,
- NAMESPACE_SHARED = 0x02,
- NAMESPACE_PUBLIC = 0x04
+enum mail_namespace_type {
+ MAIL_NAMESPACE_TYPE_PRIVATE = 0x01,
+ MAIL_NAMESPACE_TYPE_SHARED = 0x02,
+ MAIL_NAMESPACE_TYPE_PUBLIC = 0x04
+#define MAIL_NAMESPACE_TYPE_MASK_ALL \
+ (MAIL_NAMESPACE_TYPE_PRIVATE | MAIL_NAMESPACE_TYPE_SHARED | \
+ MAIL_NAMESPACE_TYPE_PUBLIC)
};
enum namespace_flags {
@@ -46,7 +49,7 @@
struct mail_namespace *next;
int refcount;
- enum namespace_type type;
+ enum mail_namespace_type type;
enum namespace_flags flags;
char *prefix;
diff -r d3a9769dad2e -r 368f3b2e3264 src/lib-storage/mail-storage.c
--- a/src/lib-storage/mail-storage.c Sun Sep 02 18:16:06 2012 +0300
+++ b/src/lib-storage/mail-storage.c Sun Sep 02 19:22:13 2012 +0300
@@ -1230,8 +1230,8 @@
return -1;
}
if (src->list != dest->list &&
- (src->list->ns->type != NAMESPACE_PRIVATE ||
- dest->list->ns->type != NAMESPACE_PRIVATE)) {
+ (src->list->ns->type != MAIL_NAMESPACE_TYPE_PRIVATE ||
+ dest->list->ns->type != MAIL_NAMESPACE_TYPE_PRIVATE)) {
mail_storage_set_error(src->storage, MAIL_ERROR_NOTPOSSIBLE,
More information about the dovecot-cvs
mailing list