[dovecot-cvs] dovecot/src/lib-index mail-cache-lookup.c, 1.33.2.1, 1.33.2.2 mail-cache-private.h, 1.29.2.2, 1.29.2.3

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-index
In directory talvi:/tmp/cvs-serv17613

Modified Files:
      Tag: branch_1_0
	mail-cache-lookup.c mail-cache-private.h 
Log Message:
Removed file offset caching from mail_cache_foreach(). It didn't work
correctly when cache file was just compressed, and caused "cache file
corrupted" errors.



Index: mail-cache-lookup.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-index/mail-cache-lookup.c,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- mail-cache-lookup.c	13 Oct 2006 15:19:52 -0000	1.33.2.1
+++ mail-cache-lookup.c	14 Jan 2007 03:17:05 -0000	1.33.2.2
@@ -191,16 +191,9 @@
         if (MAIL_CACHE_IS_UNUSABLE(view->cache))
 		return 0;
 
-	if (view->cached_offset_seq == seq)
-		offset = view->cached_offset;
-	else {
-		if ((ret = mail_cache_lookup_offset(view->cache, view->view,
-						    seq, &offset)) <= 0)
-			return ret;
-
-		view->cached_offset_seq = seq;
-		view->cached_offset = offset;
-	}
+	if ((ret = mail_cache_lookup_offset(view->cache, view->view,
+					    seq, &offset)) <= 0)
+		return ret;
 
 	ret = 1;
 	array_clear(&view->tmp_offsets);

Index: mail-cache-private.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-index/mail-cache-private.h,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -d -r1.29.2.2 -r1.29.2.3
--- mail-cache-private.h	13 Oct 2006 15:32:31 -0000	1.29.2.2
+++ mail-cache-private.h	14 Jan 2007 03:17:05 -0000	1.29.2.3
@@ -168,7 +168,6 @@
 	buffer_t *cached_exists_buf;
 	uint8_t cached_exists_value;
 	uint32_t cached_exists_seq;
-	uint32_t cached_offset, cached_offset_seq;
 };
 
 typedef int mail_cache_foreach_callback_t(struct mail_cache_view *view,