[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync-parse.c, 1.39, 1.40 mbox-sync-private.h, 1.49, 1.50 mbox-sync.c, 1.147, 1.148

[cras at dovecot.org]

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

Modified Files:
	mbox-sync-parse.c mbox-sync-private.h mbox-sync.c 
Log Message:
Since we always parse the first message now, there's no need ever to do
sync_restart.



Index: mbox-sync-parse.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-parse.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- mbox-sync-parse.c	8 Apr 2005 13:13:48 -0000	1.39
+++ mbox-sync-parse.c	8 Apr 2005 15:08:53 -0000	1.40
@@ -459,9 +459,6 @@
 
 			if (!func->func(ctx, hdr)) {
 				/* this header is broken, remove it */
-				if (ctx->sync_ctx->sync_restart)
-					break;
-
 				ctx->need_rewrite = TRUE;
 				str_truncate(ctx->header, line_start_pos);
 				if (ctx->header_first_change == (size_t)-1) {

Index: mbox-sync-private.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-private.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- mbox-sync-private.h	8 Apr 2005 13:13:48 -0000	1.49
+++ mbox-sync-private.h	8 Apr 2005 15:08:53 -0000	1.50
@@ -118,7 +118,6 @@
 	off_t expunged_space, space_diff;
 
 	unsigned int dest_first_mail:1;
-	unsigned int sync_restart:1;
 
 	/* global flags: */
 	unsigned int delay_writes:1;

Index: mbox-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- mbox-sync.c	8 Apr 2005 14:32:52 -0000	1.147
+++ mbox-sync.c	8 Apr 2005 15:08:53 -0000	1.148
@@ -118,9 +118,6 @@
 	i_assert(sync_ctx->input->v_offset != mail_ctx->mail.from_offset ||
 		 sync_ctx->input->eof);
 
-	if (sync_ctx->sync_restart)
-		return 0;
-
 	mail_ctx->mail.body_size =
 		istream_raw_mbox_get_body_size(sync_ctx->input,
 					       mail_ctx->content_length);
@@ -1059,9 +1056,6 @@
 		}
 	}
 
-	if (sync_ctx->sync_restart)
-		return 0;
-
 	if (istream_raw_mbox_is_eof(sync_ctx->input)) {
 		/* rest of the messages in index don't exist -> expunge them */
 		while (sync_ctx->idx_seq <= messages_count)
@@ -1288,7 +1282,6 @@
 	sync_ctx->space_diff = 0;
 
 	sync_ctx->dest_first_mail = TRUE;
-        sync_ctx->sync_restart = FALSE;
 }
 
 static int mbox_sync_do(struct mbox_sync_context *sync_ctx,