dovecot-2.2: dsync: State names were wrong in debug/error messages.

dovecot at dovecot.org dovecot at dovecot.org
Mon Jun 24 16:36:39 EEST 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/83bea7e1f136
changeset: 16538:83bea7e1f136
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jun 24 16:36:32 2013 +0300
description:
dsync: State names were wrong in debug/error messages.

diffstat:

 src/doveadm/dsync/dsync-brain.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 8a81c5a1b60f -r 83bea7e1f136 src/doveadm/dsync/dsync-brain.c
--- a/src/doveadm/dsync/dsync-brain.c	Tue Jun 18 18:56:15 2013 +0300
+++ b/src/doveadm/dsync/dsync-brain.c	Mon Jun 24 16:36:32 2013 +0300
@@ -11,10 +11,11 @@
 
 #include <sys/stat.h>
 
-static const char *dsync_state_names[DSYNC_STATE_DONE+1] = {
-	"recv_handshake",
-	"send_last_common",
-	"recv_last_common",
+static const char *dsync_state_names[] = {
+	"master_recv_handshake",
+	"slave_recv_handshake",
+	"master_send_last_common",
+	"slave_recv_last_common",
 	"send_mailbox_tree",
 	"send_mailbox_tree_deletes",
 	"recv_mailbox_tree",
@@ -97,6 +98,7 @@
 	i_assert(sync_type != DSYNC_BRAIN_SYNC_TYPE_UNKNOWN);
 	i_assert(sync_type != DSYNC_BRAIN_SYNC_TYPE_STATE ||
 		 (set->state != NULL && *set->state != '\0'));
+	i_assert(N_ELEMENTS(dsync_state_names) == DSYNC_STATE_DONE+1);
 
 	brain = dsync_brain_common_init(user, ibc);
 	brain->sync_type = sync_type;


More information about the dovecot-cvs mailing list