[dovecot-cvs] dovecot/src/lib-index mail-cache.c,1.5,1.6 mail-cache.h,1.2,1.3

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-index
In directory danu:/tmp/cvs-serv126/lib-index

Modified Files:
	mail-cache.c mail-cache.h 
Log Message:
Removed some header/body size fields. We use only message_part now
everywhere since it's small enough. virtual_full_size was left because we
may know that by just reading maildir filename.



Index: mail-cache.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-cache.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mail-cache.c	18 Aug 2003 03:24:37 -0000	1.5
+++ mail-cache.c	21 Aug 2003 01:59:50 -0000	1.6
@@ -109,11 +109,8 @@
 	sizeof(struct mail_sent_date),
 	sizeof(time_t),
 	sizeof(uoff_t),
-	sizeof(uoff_t),
-	sizeof(uoff_t),
-	sizeof(uoff_t),
 
-	0, 0, 0,
+	0, 0, 0, 0, 0, 0,
 
 	/* variable sized */
 	(unsigned int)-1, (unsigned int)-1, (unsigned int)-1, (unsigned int)-1,

Index: mail-cache.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-cache.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mail-cache.h	18 Aug 2003 03:22:12 -0000	1.2
+++ mail-cache.h	21 Aug 2003 01:59:50 -0000	1.3
@@ -16,10 +16,7 @@
 	MAIL_CACHE_MD5			= 0x00000004,
 	MAIL_CACHE_SENT_DATE		= 0x00000008,
 	MAIL_CACHE_RECEIVED_DATE	= 0x00000010,
-	MAIL_CACHE_HEADER_SIZE		= 0x00000020,
-	MAIL_CACHE_BODY_SIZE		= 0x00000040,
-	MAIL_CACHE_VIRTUAL_HEADER_SIZE	= 0x00000080,
-	MAIL_CACHE_VIRTUAL_FULL_SIZE	= 0x00000100,
+	MAIL_CACHE_VIRTUAL_FULL_SIZE	= 0x00000020,
 
 	/* variable sized field */
 	MAIL_CACHE_HEADERS1		= 0x40000000,
@@ -29,16 +26,14 @@
 	MAIL_CACHE_LOCATION		= 0x04000000,
 	MAIL_CACHE_BODY			= 0x02000000,
 	MAIL_CACHE_BODYSTRUCTURE	= 0x01000000,
-	MAIL_CACHE_MESSAGEPART		= 0x00800000,
+	MAIL_CACHE_ENVELOPE		= 0x00800000,
+	MAIL_CACHE_MESSAGEPART		= 0x00400000,
 
 	MAIL_CACHE_FIXED_MASK		= MAIL_CACHE_INDEX_FLAGS |
 					  MAIL_CACHE_LOCATION_OFFSET |
 					  MAIL_CACHE_MD5 |
 					  MAIL_CACHE_SENT_DATE |
 					  MAIL_CACHE_RECEIVED_DATE |
-					  MAIL_CACHE_HEADER_SIZE |
-					  MAIL_CACHE_BODY_SIZE |
-					  MAIL_CACHE_VIRTUAL_HEADER_SIZE |
 					  MAIL_CACHE_VIRTUAL_FULL_SIZE,
 	MAIL_CACHE_HEADERS_MASK		= MAIL_CACHE_HEADERS1 |
 					  MAIL_CACHE_HEADERS2 |
@@ -47,7 +42,8 @@
 	MAIL_CACHE_STRING_MASK		= MAIL_CACHE_HEADERS_MASK |
 					  MAIL_CACHE_LOCATION |
 					  MAIL_CACHE_BODY |
-					  MAIL_CACHE_BODYSTRUCTURE,
+					  MAIL_CACHE_BODYSTRUCTURE |
+					  MAIL_CACHE_ENVELOPE,
 	MAIL_CACHE_BODYSTRUCTURE_MASK	= MAIL_CACHE_BODY |
 					  MAIL_CACHE_BODYSTRUCTURE |
                                           MAIL_CACHE_MESSAGEPART