[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync.c, 1.123, 1.124

[cras at dovecot.org]

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

Modified Files:
	mbox-sync.c 
Log Message:
Removed view->messages_count, view->hdr.messages_count is enough. Also fixes
assert crash in mail_index_bsearch_uid().

Renamed .._get_message_count() to get_messages_count() to be more
consistent.



Index: mbox-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- mbox-sync.c	24 Nov 2004 18:39:58 -0000	1.123
+++ mbox-sync.c	28 Nov 2004 23:19:54 -0000	1.124
@@ -219,7 +219,8 @@
 	uint32_t messages_count;
 	int ret = 0;
 
-	messages_count = mail_index_view_get_message_count(sync_ctx->sync_view);
+	messages_count =
+		mail_index_view_get_messages_count(sync_ctx->sync_view);
 	while (sync_ctx->idx_seq <= messages_count) {
 		ret = mail_index_lookup(sync_ctx->sync_view,
 					sync_ctx->idx_seq, &rec);
@@ -267,7 +268,8 @@
 	const void *data;
 	int ret;
 
-	messages_count = mail_index_view_get_message_count(sync_ctx->sync_view);
+	messages_count =
+		mail_index_view_get_messages_count(sync_ctx->sync_view);
 	while (sync_ctx->idx_seq <= messages_count) {
 		ret = mail_index_lookup(sync_ctx->sync_view,
 					sync_ctx->idx_seq, &rec);
@@ -751,7 +753,7 @@
 			return -1;
 		}
 		sync_ctx->idx_seq =
-			mail_index_view_get_message_count(sync_view) + 1;
+			mail_index_view_get_messages_count(sync_view) + 1;
 		return 1;
 	}
 
@@ -767,7 +769,8 @@
 	uoff_t offset;
 	int ret, expunged;
 
-	messages_count = mail_index_view_get_message_count(sync_ctx->sync_view);
+	messages_count =
+		mail_index_view_get_messages_count(sync_ctx->sync_view);
 
 	if (!mail_index_sync_have_more(sync_ctx->index_sync_ctx) ||
 	    (!partial && min_message_count != 0)) {