[dovecot-cvs] dovecot/src/lib-index mail-transaction-util.c, 1.3, 1.4

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-index
In directory talvi:/tmp/cvs-serv20948

Modified Files:
	mail-transaction-util.c 
Log Message:
fixes



Index: mail-transaction-util.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-transaction-util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mail-transaction-util.c	28 Apr 2004 23:15:44 -0000	1.3
+++ mail-transaction-util.c	16 May 2004 01:29:49 -0000	1.4
@@ -142,6 +142,9 @@
 
 	cur_seq = prev_seq = 1; expunges_before = 0;
 	for (i = 0; src != src_end; src++) {
+		/* src[] must be sorted. */
+		i_assert(src+1 == src_end || src->seq1 < src[1].seq1);
+
 		for (; i < dest_count; i++) {
 			count = dest[i].seq1 - prev_seq;
 			if (cur_seq + count > src->seq1)
@@ -165,7 +168,7 @@
 			count = dest[i].seq2 - dest[i].seq1 + 1;
 			expunges_before += count;
 			new_exp.seq2 += count;
-			new_exp.seq2 = dest[i].uid2;
+			new_exp.uid2 = dest[i].uid2;
 			i++;
 		}
 
@@ -192,7 +195,7 @@
 
 			dest = buffer_get_modifyable_data(expunges_buf, NULL);
 			dest_count -= i - first;
-			i = first + 1;
+			i = first;
 		}
 	}
 }