[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-sync.c, 1.44, 1.45 maildir-uidlist.c, 1.32, 1.33

[cras at dovecot.org]

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

Modified Files:
	maildir-sync.c maildir-uidlist.c 
Log Message:
Changed mail_index_get_header() to return the header as return value because
it can't fail anymore.



Index: maildir-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-sync.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- maildir-sync.c	11 Nov 2004 22:01:45 -0000	1.44
+++ maildir-sync.c	24 Nov 2004 18:39:58 -0000	1.45
@@ -545,11 +545,7 @@
 		}
 
 		view = mail_index_view_open(ibox->index);
-		if (mail_index_get_header(view, &hdr) < 0) {
-			mail_index_view_close(view);
-			mail_storage_set_index_error(ibox);
-			return -1;
-		}
+		hdr = mail_index_get_header(view);
 		ibox->last_cur_mtime = hdr->sync_stamp;
 		mail_index_view_close(view);
 	}
@@ -616,13 +612,7 @@
 	uint32_t uid_validity, next_uid;
 	int ret;
 
-	if (mail_index_get_header(view, &hdr) < 0) {
-		/* view is invalidated */
-		mail_storage_set_index_error(ibox);
-                maildir_sync_index_abort(sync_ctx);
-		return -1;
-	}
-
+	hdr = mail_index_get_header(view);
 	uid_validity = maildir_uidlist_get_uid_validity(ibox->uidlist);
 	if (uid_validity != hdr->uid_validity &&
 	    uid_validity != 0 && hdr->uid_validity != 0) {

Index: maildir-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- maildir-uidlist.c	8 Oct 2004 17:51:49 -0000	1.32
+++ maildir-uidlist.c	24 Nov 2004 18:39:58 -0000	1.33
@@ -400,8 +400,7 @@
 		/* we haven't synced yet, trust index */
 		const struct mail_index_header *hdr;
 
-		if (mail_index_get_header(uidlist->ibox->view, &hdr) < 0)
-			return 0;
+		hdr = mail_index_get_header(uidlist->ibox->view);
 		return hdr->recent_messages_count;
 	}