dovecot-2.2: dsync: Renamed "guid_requests" to "mail_requests"
dovecot at dovecot.org
dovecot at dovecot.org
Sun Feb 10 23:12:04 EET 2013
details: http://hg.dovecot.org/dovecot-2.2/rev/b4e2b3b54f0a
changeset: 15744:b4e2b3b54f0a
user: Timo Sirainen <tss at iki.fi>
date: Sun Feb 10 23:11:52 2013 +0200
description:
dsync: Renamed "guid_requests" to "mail_requests"
The mails aren't necessarily requested by their GUID.
diffstat:
src/doveadm/dsync/doveadm-dsync.c | 2 +-
src/doveadm/dsync/dsync-brain-mailbox.c | 8 ++++----
src/doveadm/dsync/dsync-brain-mails.c | 10 +++++-----
src/doveadm/dsync/dsync-brain-private.h | 2 +-
src/doveadm/dsync/dsync-brain.c | 4 ++--
src/doveadm/dsync/dsync-brain.h | 2 +-
src/doveadm/dsync/dsync-ibc-stream.c | 10 +++++-----
7 files changed, 19 insertions(+), 19 deletions(-)
diffs (168 lines):
diff -r 9a9d408336ea -r b4e2b3b54f0a src/doveadm/dsync/doveadm-dsync.c
--- a/src/doveadm/dsync/doveadm-dsync.c Sun Feb 10 23:09:55 2013 +0200
+++ b/src/doveadm/dsync/doveadm-dsync.c Sun Feb 10 23:11:52 2013 +0200
@@ -420,7 +420,7 @@
}
brain_flags = DSYNC_BRAIN_FLAG_MAILS_HAVE_GUIDS |
- DSYNC_BRAIN_FLAG_SEND_GUID_REQUESTS;
+ DSYNC_BRAIN_FLAG_SEND_MAIL_REQUESTS;
if (ctx->sync_all_namespaces)
brain_flags |= DSYNC_BRAIN_FLAG_SYNC_ALL_NAMESPACES;
diff -r 9a9d408336ea -r b4e2b3b54f0a src/doveadm/dsync/dsync-brain-mailbox.c
--- a/src/doveadm/dsync/dsync-brain-mailbox.c Sun Feb 10 23:09:55 2013 +0200
+++ b/src/doveadm/dsync/dsync-brain-mailbox.c Sun Feb 10 23:11:52 2013 +0200
@@ -85,12 +85,12 @@
if (brain->backup_send) {
/* we have an exporter, but no importer. */
brain->box_send_state = DSYNC_BOX_STATE_CHANGES;
- brain->box_recv_state = brain->guid_requests ?
+ brain->box_recv_state = brain->mail_requests ?
DSYNC_BOX_STATE_MAIL_REQUESTS :
DSYNC_BOX_STATE_RECV_LAST_COMMON;
} else if (brain->backup_recv) {
/* we have an importer, but no exporter */
- brain->box_send_state = brain->guid_requests ?
+ brain->box_send_state = brain->mail_requests ?
DSYNC_BOX_STATE_MAIL_REQUESTS :
DSYNC_BOX_STATE_DONE;
brain->box_recv_state = DSYNC_BOX_STATE_CHANGES;
@@ -161,7 +161,7 @@
return -1;
}
- if (!brain->guid_requests)
+ if (!brain->mail_requests)
exporter_flags |= DSYNC_MAILBOX_EXPORTER_FLAG_AUTO_EXPORT_MAILS;
if (brain->mails_have_guids)
exporter_flags |= DSYNC_MAILBOX_EXPORTER_FLAG_MAILS_HAVE_GUIDS;
@@ -201,7 +201,7 @@
last_common_pvt_modseq = 0;
}
- if (brain->guid_requests)
+ if (brain->mail_requests)
import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_WANT_MAIL_REQUESTS;
if (brain->master_brain)
import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_MASTER_BRAIN;
diff -r 9a9d408336ea -r b4e2b3b54f0a src/doveadm/dsync/dsync-brain-mails.c
--- a/src/doveadm/dsync/dsync-brain-mails.c Sun Feb 10 23:09:55 2013 +0200
+++ b/src/doveadm/dsync/dsync-brain-mails.c Sun Feb 10 23:11:52 2013 +0200
@@ -69,7 +69,7 @@
return FALSE;
if (ret == DSYNC_IBC_RECV_RET_FINISHED) {
dsync_mailbox_import_changes_finish(brain->box_importer);
- if (brain->guid_requests && brain->box_exporter != NULL)
+ if (brain->mail_requests && brain->box_exporter != NULL)
brain->box_recv_state = DSYNC_BOX_STATE_MAIL_REQUESTS;
else
brain->box_recv_state = DSYNC_BOX_STATE_MAILS;
@@ -88,7 +88,7 @@
return;
}
dsync_ibc_send_end_of_list(brain->ibc);
- if (brain->guid_requests && brain->box_importer != NULL)
+ if (brain->mail_requests && brain->box_importer != NULL)
brain->box_send_state = DSYNC_BOX_STATE_MAIL_REQUESTS;
else
brain->box_send_state = DSYNC_BOX_STATE_MAILS;
@@ -99,7 +99,7 @@
const struct dsync_mail_request *request;
enum dsync_ibc_recv_ret ret;
- i_assert(brain->guid_requests);
+ i_assert(brain->mail_requests);
i_assert(brain->box_exporter != NULL);
if ((ret = dsync_ibc_recv_mail_request(brain->ibc, &request)) == 0)
@@ -118,7 +118,7 @@
{
const struct dsync_mail_request *request;
- i_assert(brain->guid_requests);
+ i_assert(brain->mail_requests);
while ((request = dsync_mailbox_import_next_request(brain->box_importer)) != NULL) {
if (dsync_ibc_send_mail_request(brain->ibc, request) == 0)
@@ -218,7 +218,7 @@
if (dsync_ibc_send_mail(brain->ibc, mail) == 0)
return TRUE;
}
- if (brain->guid_requests &&
+ if (brain->mail_requests &&
brain->box_recv_state < DSYNC_BOX_STATE_MAILS) {
/* wait for mail requests to finish */
return changed;
diff -r 9a9d408336ea -r b4e2b3b54f0a src/doveadm/dsync/dsync-brain-private.h
--- a/src/doveadm/dsync/dsync-brain-private.h Sun Feb 10 23:09:55 2013 +0200
+++ b/src/doveadm/dsync/dsync-brain-private.h Sun Feb 10 23:11:52 2013 +0200
@@ -77,7 +77,7 @@
ARRAY_TYPE(dsync_mailbox_state) remote_mailbox_states;
unsigned int master_brain:1;
- unsigned int guid_requests:1;
+ unsigned int mail_requests:1;
unsigned int mails_have_guids:1;
unsigned int backup_send:1;
unsigned int backup_recv:1;
diff -r 9a9d408336ea -r b4e2b3b54f0a src/doveadm/dsync/dsync-brain.c
--- a/src/doveadm/dsync/dsync-brain.c Sun Feb 10 23:09:55 2013 +0200
+++ b/src/doveadm/dsync/dsync-brain.c Sun Feb 10 23:11:52 2013 +0200
@@ -70,8 +70,8 @@
static void
dsync_brain_set_flags(struct dsync_brain *brain, enum dsync_brain_flags flags)
{
- brain->guid_requests =
- (flags & DSYNC_BRAIN_FLAG_SEND_GUID_REQUESTS) != 0;
+ brain->mail_requests =
+ (flags & DSYNC_BRAIN_FLAG_SEND_MAIL_REQUESTS) != 0;
brain->mails_have_guids =
(flags & DSYNC_BRAIN_FLAG_MAILS_HAVE_GUIDS) != 0;
brain->backup_send = (flags & DSYNC_BRAIN_FLAG_BACKUP_SEND) != 0;
diff -r 9a9d408336ea -r b4e2b3b54f0a src/doveadm/dsync/dsync-brain.h
--- a/src/doveadm/dsync/dsync-brain.h Sun Feb 10 23:09:55 2013 +0200
+++ b/src/doveadm/dsync/dsync-brain.h Sun Feb 10 23:11:52 2013 +0200
@@ -7,7 +7,7 @@
enum dsync_brain_flags {
DSYNC_BRAIN_FLAG_MAILS_HAVE_GUIDS = 0x01,
- DSYNC_BRAIN_FLAG_SEND_GUID_REQUESTS = 0x02,
+ DSYNC_BRAIN_FLAG_SEND_MAIL_REQUESTS = 0x02,
DSYNC_BRAIN_FLAG_BACKUP_SEND = 0x04,
DSYNC_BRAIN_FLAG_BACKUP_RECV = 0x08,
DSYNC_BRAIN_FLAG_DEBUG = 0x10,
diff -r 9a9d408336ea -r b4e2b3b54f0a src/doveadm/dsync/dsync-ibc-stream.c
--- a/src/doveadm/dsync/dsync-ibc-stream.c Sun Feb 10 23:09:55 2013 +0200
+++ b/src/doveadm/dsync/dsync-ibc-stream.c Sun Feb 10 23:11:52 2013 +0200
@@ -61,7 +61,7 @@
{ .name = "handshake",
.chr = 'H',
.optional_keys = "sync_ns_prefix sync_box sync_type debug sync_all_namespaces "
- "mails_have_guids send_guid_requests backup_send backup_recv"
+ "mails_have_guids send_mail_requests backup_send backup_recv"
},
{ .name = "mailbox_state",
.chr = 'S',
@@ -535,8 +535,8 @@
dsync_serializer_encode_add(encoder, "sync_type", sync_type);
if ((set->brain_flags & DSYNC_BRAIN_FLAG_MAILS_HAVE_GUIDS) != 0)
dsync_serializer_encode_add(encoder, "mails_have_guids", "");
- if ((set->brain_flags & DSYNC_BRAIN_FLAG_SEND_GUID_REQUESTS) != 0)
- dsync_serializer_encode_add(encoder, "send_guid_requests", "");
+ if ((set->brain_flags & DSYNC_BRAIN_FLAG_SEND_MAIL_REQUESTS) != 0)
+ dsync_serializer_encode_add(encoder, "send_mail_requests", "");
if ((set->brain_flags & DSYNC_BRAIN_FLAG_BACKUP_SEND) != 0)
dsync_serializer_encode_add(encoder, "backup_send", "");
if ((set->brain_flags & DSYNC_BRAIN_FLAG_BACKUP_RECV) != 0)
@@ -597,8 +597,8 @@
}
if (dsync_deserializer_decode_try(decoder, "mails_have_guids", &value))
set->brain_flags |= DSYNC_BRAIN_FLAG_MAILS_HAVE_GUIDS;
- if (dsync_deserializer_decode_try(decoder, "send_guid_requests", &value))
- set->brain_flags |= DSYNC_BRAIN_FLAG_SEND_GUID_REQUESTS;
+ if (dsync_deserializer_decode_try(decoder, "send_mail_requests", &value))
+ set->brain_flags |= DSYNC_BRAIN_FLAG_SEND_MAIL_REQUESTS;
if (dsync_deserializer_decode_try(decoder, "backup_send", &value))
set->brain_flags |= DSYNC_BRAIN_FLAG_BACKUP_SEND;
if (dsync_deserializer_decode_try(decoder, "backup_recv", &value))
More information about the dovecot-cvs
mailing list