[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-storage.c, 1.157, 1.158

[tss at dovecot.org]

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

Modified Files:
	maildir-storage.c 
Log Message:
Removed mail_storage_create_with_data(). mail_storage_create() with
driver=NULL behaves the same way. Removed parameters from
mail_storage.create(), they're now put into the storage structure before
calling create().



Index: maildir-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- maildir-storage.c	30 Mar 2007 12:58:52 -0000	1.157
+++ maildir-storage.c	30 Mar 2007 13:40:19 -0000	1.158
@@ -224,11 +224,10 @@
 }
 
 static int
-maildir_create(struct mail_storage *_storage,
-	       const char *data, const char *user,
-	       enum mail_storage_flags flags, enum file_lock_method lock_method)
+maildir_create(struct mail_storage *_storage, const char *data)
 {
 	struct maildir_storage *storage = (struct maildir_storage *)_storage;
+	enum mail_storage_flags flags = _storage->flags;
 	struct mailbox_list_settings list_set;
 	struct mailbox_list *list;
 	enum mailbox_open_flags open_flags;
@@ -237,8 +236,8 @@
 
 	if (maildir_get_list_settings(&list_set, data, flags, &layout) < 0)
 		return -1;
-	list_set.mail_storage_flags = &flags;
-	list_set.lock_method = &lock_method;
+	list_set.mail_storage_flags = &_storage->flags;
+	list_set.lock_method = &_storage->lock_method;
 
 	/* normally the maildir is created in verify_inbox() */
 	if ((flags & MAIL_STORAGE_FLAG_NO_AUTOCREATE) != 0) {
@@ -257,6 +256,7 @@
 		i_error("maildir %s: %s", layout, error);
 		return -1;
 	}
+	_storage->list = list;
 	storage->list_module_ctx.super = list->v;
 	if (strcmp(layout, MAILDIR_PLUSPLUS_DRIVER_NAME) == 0) {
 		list->v.iter_is_mailbox = maildirplusplus_iter_is_mailbox;
@@ -287,9 +287,6 @@
 				    "tmp/", storage->temp_prefix, NULL);
 	}
 
-	_storage->user = p_strdup(_storage->pool, user);
-	index_storage_init(_storage, list, flags, lock_method);
-
 	open_flags = 0;
 	(void)verify_inbox(_storage, &open_flags);
 	return 0;