dovecot-2.2: dsync: Error handling fix.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/2c4394d0360b
changeset: 15617:2c4394d0360b
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jan 09 07:53:53 2013 +0200
description:
dsync: Error handling fix.

diffstat:

 src/doveadm/dsync/dsync-mailbox-import.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r ec9b98df8c72 -r 2c4394d0360b src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Wed Jan 09 07:02:28 2013 +0200
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Wed Jan 09 07:53:53 2013 +0200
@@ -1386,7 +1386,7 @@
 	return ret;
 }
 
-static bool
+static int
 reassign_unwanted_uids(struct dsync_mailbox_importer *importer,
 		       const struct mail_transaction_commit_changes *changes,
 		       bool *changes_during_sync_r)
@@ -1441,8 +1441,9 @@
 		mailbox_get_seq_range(importer->box, importer->local_uid_next,
 				      lowest_saved_uid-1, &seq1, &seq2);
 		if (seq1 > 0) {
-			ret = reassign_uids_in_seq_range(importer->box,
-							 seq1, seq2);
+			if (reassign_uids_in_seq_range(importer->box,
+						       seq1, seq2) < 0)
+				ret = -1;
 			*changes_during_sync_r = TRUE;
 		}
 	}
@@ -1452,8 +1453,9 @@
 		mailbox_get_seq_range(importer->box, lowest_unwanted_uid,
 				      importer->remote_uid_next-1, &seq1, &seq2);
 		if (seq1 > 0) {
-			ret = reassign_uids_in_seq_range(importer->box,
-							 seq1, seq2);
+			if (reassign_uids_in_seq_range(importer->box,
+						       seq1, seq2) < 0)
+				ret = -1;
 			*changes_during_sync_r = TRUE;
 		}
 	}