[dovecot-cvs] dovecot/src/lib-storage/index index-storage.c, 1.73, 1.74 index-storage.h, 1.91, 1.92

[cras at dovecot.org]

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

Modified Files:
	index-storage.c index-storage.h 
Log Message:
Moved mbox/maildir-specific variables from struct index_mailbox to
mbox_mailbox and maildir_mailbox.



Index: index-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-storage.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- index-storage.c	7 Apr 2005 21:55:06 -0000	1.73
+++ index-storage.c	8 Apr 2005 13:13:45 -0000	1.74
@@ -337,6 +337,9 @@
 		return -1;
 	}
 
+	ibox->md5hdr_ext_idx =
+		mail_index_ext_register(index, "header-md5", 0, 16, 1);
+
 	ibox->cache = mail_index_get_cache(index);
 	index_cache_register_defaults(ibox);
 	ibox->view = mail_index_view_open(index);

Index: index-storage.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-storage.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- index-storage.h	3 Apr 2005 11:36:16 -0000	1.91
+++ index-storage.h	8 Apr 2005 13:13:45 -0000	1.92
@@ -39,7 +39,6 @@
 struct index_mailbox {
 	struct mailbox box;
 	struct index_storage *storage;
-	const char *path, *control_dir;
 
 	struct mail_index *index;
 	struct mail_index_view *view;
@@ -48,6 +47,8 @@
 
 	int (*is_recent)(struct index_mailbox *ibox, uint32_t uid);
 
+	uint32_t md5hdr_ext_idx;
+
 	struct timeout *notify_to;
 	struct index_notify_file *notify_files;
         struct index_notify_io *notify_ios;
@@ -69,29 +70,6 @@
 	uint32_t synced_recent_count;
 	time_t sync_last_check;
 
-	/* mbox: */
-	int mbox_fd;
-	struct istream *mbox_stream, *mbox_file_stream;
-	int mbox_lock_type;
-	dev_t mbox_dev;
-	ino_t mbox_ino;
-	unsigned int mbox_excl_locks, mbox_shared_locks;
-	struct dotlock *mbox_dotlock;
-	unsigned int mbox_lock_id;
-	int mbox_readonly, mbox_writeonly;
-	time_t mbox_dirty_stamp;
-	off_t mbox_dirty_size;
-
-	uint32_t mbox_ext_idx, md5hdr_ext_idx;
-
-	/* maildir sync: */
-	struct maildir_uidlist *uidlist;
-	time_t last_new_mtime, last_cur_mtime, last_new_sync_time;
-	time_t dirty_cur_time;
-
-        mode_t mail_create_mode;
-	unsigned int private_flags_mask;
-
 	unsigned int readonly:1;
 	unsigned int keep_recent:1;
 	unsigned int recent_flags_synced:1;
@@ -99,12 +77,6 @@
 	unsigned int sent_readonly_flags_warning:1;
 	unsigned int notify_pending:1;
 	unsigned int mail_read_mmaped:1;
-	unsigned int syncing_commit:1;
-	unsigned int mbox_sync_dirty:1;
-	unsigned int mbox_do_dirty_syncs:1;
-	unsigned int mbox_very_dirty_syncs:1;
-	unsigned int mbox_save_md5:1;
-	unsigned int mbox_dotlocked:1;
 };
 
 struct index_transaction_context {