[dovecot-cvs] dovecot/src/lib-storage/index index-mail.c, 1.62, 1.63 index-search.c, 1.95, 1.96 index-status.c, 1.33, 1.34

[cras at dovecot.org]

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

Modified Files:
	index-mail.c index-search.c index-status.c 
Log Message:
Changed mail_index_get_header() to return the header as return value because
it can't fail anymore.



Index: index-mail.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mail.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- index-mail.c	14 Oct 2004 21:54:47 -0000	1.62
+++ index-mail.c	24 Nov 2004 18:39:58 -0000	1.63
@@ -600,15 +600,13 @@
 	struct index_header_lookup_ctx *wanted_headers =
 		(struct index_header_lookup_ctx *)_wanted_headers;
 	const struct mail_index_header *hdr;
-	int ret;
 
 	mail->mail = *t->ibox->mail_interface;
 	mail->mail.box = &t->ibox->box;
 
 	/* only reason we couldn't get header is if view is invalidated */
-	ret = mail_index_get_header(t->ibox->view, &hdr);
-	if (ret == 0)
-		mail->uid_validity = hdr->uid_validity;
+	hdr = mail_index_get_header(t->ibox->view);
+	mail->uid_validity = hdr->uid_validity;
 
 	mail->pool = pool_alloconly_create("index_mail", 16384);
 	mail->ibox = t->ibox;

Index: index-search.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-search.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- index-search.c	13 Nov 2004 23:06:16 -0000	1.95
+++ index-search.c	24 Nov 2004 18:39:58 -0000	1.96
@@ -692,11 +692,7 @@
 {
         const struct mail_index_header *hdr;
 
-	if (mail_index_get_header(ctx->view, &hdr) < 0) {
-		mail_storage_set_index_error(ctx->ibox);
-		return -1;
-	}
-
+	hdr = mail_index_get_header(ctx->view);
 	if (search_parse_msgset_args(ctx->ibox, hdr, args,
 				     &ctx->seq1, &ctx->seq2) < 0)
 		return -1;

Index: index-status.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-status.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- index-status.c	12 Jul 2004 11:35:51 -0000	1.33
+++ index-status.c	24 Nov 2004 18:39:58 -0000	1.34
@@ -26,9 +26,7 @@
 	memset(status_r, 0, sizeof(struct mailbox_status));
 
 	/* we can get most of the status items without any trouble */
-	if (mail_index_get_header(ibox->view, &hdr) < 0)
-		return -1;
-
+	hdr = mail_index_get_header(ibox->view);
 	status_r->messages = hdr->messages_count;
 	status_r->recent = ibox->synced_recent_count;
 	status_r->unseen =