[dovecot-cvs] dovecot/src/lib-storage/index index-mail.c,1.82,1.83

[cras at dovecot.org]

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

Modified Files:
	index-mail.c 
Log Message:
If mail_cache_field_exists() returns -1, we can't assume the field can be
used..



Index: index-mail.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mail.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- index-mail.c	3 Jul 2005 15:14:40 -0000	1.82
+++ index-mail.c	3 Jul 2005 20:48:44 -0000	1.83
@@ -779,7 +779,7 @@
 		unsigned int cache_field =
 			cache_fields[MAIL_FETCH_MESSAGE_PARTS].idx;
 
-		if (mail_cache_field_exists(cache_view, seq, cache_field) == 0)
+		if (mail_cache_field_exists(cache_view, seq, cache_field) <= 0)
 			data->access_part |= PARSE_HDR | PARSE_BODY;
 	}
 
@@ -787,7 +787,7 @@
 		unsigned int cache_field =
 			cache_fields[MAIL_FETCH_VIRTUAL_SIZE].idx;
 
-		if (mail_cache_field_exists(cache_view, seq, cache_field) == 0)
+		if (mail_cache_field_exists(cache_view, seq, cache_field) <= 0)
 			data->access_part |= READ_HDR | READ_BODY;
 	}
 
@@ -804,9 +804,9 @@
 
 		if ((cache_field1 == (unsigned int)-1 ||
 		     mail_cache_field_exists(cache_view, seq,
-					     cache_field1) == 0) &&
+					     cache_field1) <= 0) &&
 		    mail_cache_field_exists(cache_view, seq,
-					    cache_field2) == 0)
+					    cache_field2) <= 0)
 			data->access_part |= PARSE_HDR;
 	}
 
@@ -819,9 +819,9 @@
 			cache_fields[MAIL_CACHE_IMAP_BODYSTRUCTURE].idx;
 
 		if (mail_cache_field_exists(cache_view,
-					    seq, cache_field1) == 0 &&
+					    seq, cache_field1) <= 0 &&
 		    mail_cache_field_exists(cache_view,
-					    seq, cache_field2) == 0)
+					    seq, cache_field2) <= 0)
 			data->access_part |= PARSE_HDR | PARSE_BODY;
 		else {
 			data->save_bodystructure_header = TRUE;
@@ -834,7 +834,7 @@
 		unsigned int cache_field =
 			cache_fields[MAIL_CACHE_IMAP_BODYSTRUCTURE].idx;
 
-		if (mail_cache_field_exists(cache_view, seq, cache_field) == 0)
+		if (mail_cache_field_exists(cache_view, seq, cache_field) <= 0)
 			data->access_part |= PARSE_HDR | PARSE_BODY;
 		else {
 			data->save_bodystructure_header = TRUE;
@@ -847,7 +847,7 @@
 			cache_fields[MAIL_CACHE_SENT_DATE].idx;
 
 		if (mail_cache_field_exists(cache_view, seq,
-					    cache_field) == 0) {
+					    cache_field) <= 0) {
 			data->access_part |= PARSE_HDR;
 			data->save_sent_date = TRUE;
 		}