[dovecot-cvs] dovecot/src/plugins/convert convert-storage.c, 1.15, 1.16

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/plugins/convert
In directory talvi:/tmp/cvs-serv19658/plugins/convert

Modified Files:
	convert-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: convert-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/plugins/convert/convert-storage.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- convert-storage.c	15 Mar 2007 11:48:05 -0000	1.15
+++ convert-storage.c	30 Mar 2007 13:40:25 -0000	1.16
@@ -255,8 +255,8 @@
 
 	mail_storage_parse_env(&flags, &lock_method);
 	flags |= MAIL_STORAGE_FLAG_NO_AUTOCREATE | MAIL_STORAGE_FLAG_HAS_INBOX;
-	source_storage = mail_storage_create_with_data(source_data, user,
-						       flags, lock_method);
+	source_storage = mail_storage_create(NULL, source_data, user,
+					     flags, lock_method);
 	if (source_storage == NULL) {
 		/* No need for conversion. */
 		return 0;
@@ -276,16 +276,16 @@
 	/* just in case if another process just had converted the mailbox,
 	   reopen the source storage */
 	mail_storage_destroy(&source_storage);
-	source_storage = mail_storage_create_with_data(source_data, user,
-						       flags, lock_method);
+	source_storage = mail_storage_create(NULL, source_data, user,
+					     flags, lock_method);
 	if (source_storage == NULL) {
 		/* No need for conversion anymore. */
 		file_dotlock_delete(&dotlock);
 		return 0;
 	}
 
-	dest_storage = mail_storage_create_with_data(dest_data, user,
-						     flags, lock_method);
+	dest_storage = mail_storage_create(NULL, dest_data, user,
+					   flags, lock_method);
 	if (dest_storage == NULL) {
 		i_error("Mailbox conversion: Failed to create destination "
 			"storage with data: %s", dest_data);