dovecot-2.2: lib-storage: Cleanup, use the new mailbox_*() inste...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/981e0bc71742
changeset: 15119:981e0bc71742
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Sep 26 17:17:08 2012 +0300
description:
lib-storage: Cleanup, use the new mailbox_*() instead of mailbox_list_*() when possible.

diffstat:

 src/lib-storage/index/index-storage.c |   2 +-
 src/lib-storage/mail-storage.c        |  11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r 02d00843dd79 -r 981e0bc71742 src/lib-storage/index/index-storage.c
--- a/src/lib-storage/index/index-storage.c	Wed Sep 26 17:11:22 2012 +0300
+++ b/src/lib-storage/index/index-storage.c	Wed Sep 26 17:17:08 2012 +0300
@@ -471,7 +471,7 @@
 
 	type = directory ? MAILBOX_LIST_PATH_TYPE_DIR :
 		MAILBOX_LIST_PATH_TYPE_MAILBOX;
-	path = mailbox_list_get_path(box->list, box->name, type);
+	path = mailbox_get_path_to(box, type);
 	if (path == NULL) {
 		/* layout=none */
 		mail_storage_set_error(box->storage, MAIL_ERROR_NOTPOSSIBLE,
diff -r 02d00843dd79 -r 981e0bc71742 src/lib-storage/mail-storage.c
--- a/src/lib-storage/mail-storage.c	Wed Sep 26 17:11:22 2012 +0300
+++ b/src/lib-storage/mail-storage.c	Wed Sep 26 17:17:08 2012 +0300
@@ -1976,11 +1976,10 @@
 int mailbox_mkdir(struct mailbox *box, const char *path,
 		  enum mailbox_list_path_type type)
 {
-	struct mailbox_permissions perm;
+	const struct mailbox_permissions *perm = mailbox_get_permissions(box);
 	const char *root_dir;
 
-	mailbox_list_get_permissions(box->list, box->name, &perm);
-	if (!perm.gid_origin_is_mailbox_path) {
+	if (!perm->gid_origin_is_mailbox_path) {
 		/* mailbox root directory doesn't exist, create it */
 		root_dir = mailbox_list_get_root_path(box->list, type);
 		if (mailbox_list_mkdir_root(box->list, root_dir, type) < 0) {
@@ -1989,9 +1988,9 @@
 		}
 	}
 
-	if (mkdir_parents_chgrp(path, perm.dir_create_mode,
-				perm.file_create_gid,
-				perm.file_create_gid_origin) == 0)
+	if (mkdir_parents_chgrp(path, perm->dir_create_mode,
+				perm->file_create_gid,
+				perm->file_create_gid_origin) == 0)
 		return 1;
 	else if (errno == EEXIST)
 		return 0;