[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-storage.c, 1.179, 1.180

[tss at dovecot.org]

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

Modified Files:
	mbox-storage.c 
Log Message:
cleaned up mailbox closing code



Index: mbox-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-storage.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- mbox-storage.c	30 Mar 2007 18:41:07 -0000	1.179
+++ mbox-storage.c	30 Mar 2007 18:45:22 -0000	1.180
@@ -754,7 +754,7 @@
 	return -1;
 }
 
-static int mbox_storage_close(struct mailbox *box)
+static int mbox_storage_mailbox_close(struct mailbox *box)
 {
 	struct mbox_mailbox *mbox = (struct mbox_mailbox *)box;
 	const struct mail_index_header *hdr;
@@ -780,8 +780,7 @@
 	if (mbox->mbox_file_stream != NULL)
 		i_stream_destroy(&mbox->mbox_file_stream);
 
-	index_storage_mailbox_free(box);
-	return ret;
+	return index_storage_mailbox_close(box);
 }
 
 static void mbox_notify_changes(struct mailbox *box)
@@ -995,7 +994,7 @@
 	{
 		index_storage_is_readonly,
 		index_storage_allow_new_keywords,
-		mbox_storage_close,
+		mbox_storage_mailbox_close,
 		index_storage_get_status,
 		mbox_storage_sync_init,
 		index_mailbox_sync_next,