[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync-private.h, 1.36, 1.37 mbox-sync.c, 1.110, 1.111

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv24070/lib-storage/index/mbox

Modified Files:
	mbox-sync-private.h mbox-sync.c 
Log Message:
restart partial syncs correctly. and cleanups.



Index: mbox-sync-private.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-private.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- mbox-sync-private.h	14 Oct 2004 17:56:39 -0000	1.36
+++ mbox-sync-private.h	25 Oct 2004 21:13:20 -0000	1.37
@@ -108,7 +108,7 @@
 	struct mail_index_sync_rec sync_rec;
 
 	uint32_t prev_msg_uid, next_uid;
-	uint32_t seq, idx_seq, need_space_seq, need_space_idx_seq;
+	uint32_t seq, idx_seq, need_space_seq;
 	off_t expunged_space, space_diff;
 
 	unsigned int dest_first_mail:1;

Index: mbox-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- mbox-sync.c	24 Oct 2004 00:22:11 -0000	1.110
+++ mbox-sync.c	25 Oct 2004 21:13:20 -0000	1.111
@@ -1087,10 +1087,17 @@
 	sync_ctx->base_uid_validity = 0;
 	sync_ctx->base_uid_last = 0;
 
-	sync_ctx->next_uid = sync_ctx->hdr->next_uid;
+	buffer_set_used_size(sync_ctx->mails, 0);
+	buffer_set_used_size(sync_ctx->syncs, 0);
+	memset(&sync_ctx->sync_rec, 0, sizeof(sync_ctx->sync_rec));
+
 	sync_ctx->prev_msg_uid = 0;
+	sync_ctx->next_uid = sync_ctx->hdr->next_uid;
 	sync_ctx->seq = 0;
-        sync_ctx->idx_seq = 1;
+	sync_ctx->idx_seq = 1;
+	sync_ctx->need_space_seq = 0;
+	sync_ctx->expunged_space = 0;
+	sync_ctx->space_diff = 0;
 
 	sync_ctx->dest_first_mail = TRUE;
         sync_ctx->seen_first_mail = FALSE;