dovecot-2.2: lib-storage: Move "shared" storage name to mail-sto...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/9bb653472f16
changeset: 17582:9bb653472f16
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Jul 03 19:03:59 2014 +0300
description:
lib-storage: Move "shared" storage name to mail-storage-private.h where it can be used.

diffstat:

 src/lib-storage/index/shared/shared-storage.c |  2 +-
 src/lib-storage/index/shared/shared-storage.h |  2 --
 src/lib-storage/mail-namespace.c              |  2 +-
 src/lib-storage/mail-storage-private.h        |  2 ++
 4 files changed, 4 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r ee568c83319d -r 9bb653472f16 src/lib-storage/index/shared/shared-storage.c
--- a/src/lib-storage/index/shared/shared-storage.c	Thu Jul 03 19:00:46 2014 +0300
+++ b/src/lib-storage/index/shared/shared-storage.c	Thu Jul 03 19:03:59 2014 +0300
@@ -356,7 +356,7 @@
 }
 
 struct mail_storage shared_storage = {
-	.name = SHARED_STORAGE_NAME,
+	.name = MAIL_SHARED_STORAGE_NAME,
 	.class_flags = 0, /* unknown at this point */
 
 	.v = {
diff -r ee568c83319d -r 9bb653472f16 src/lib-storage/index/shared/shared-storage.h
--- a/src/lib-storage/index/shared/shared-storage.h	Thu Jul 03 19:00:46 2014 +0300
+++ b/src/lib-storage/index/shared/shared-storage.h	Thu Jul 03 19:03:59 2014 +0300
@@ -1,8 +1,6 @@
 #ifndef SHARED_STORAGE_H
 #define SHARED_STORAGE_H
 
-#define SHARED_STORAGE_NAME "shared"
-
 struct shared_storage {
 	struct mail_storage storage;
 	union mailbox_list_module_context list_module_ctx;
diff -r ee568c83319d -r 9bb653472f16 src/lib-storage/mail-namespace.c
--- a/src/lib-storage/mail-namespace.c	Thu Jul 03 19:00:46 2014 +0300
+++ b/src/lib-storage/mail-namespace.c	Thu Jul 03 19:03:59 2014 +0300
@@ -162,7 +162,7 @@
 		   mixed %% usage, but still allows for specifying a shared
 		   namespace to an explicit location without any %% */
 		ns->flags |= NAMESPACE_FLAG_NOQUOTA | NAMESPACE_FLAG_NOACL;
-		driver = "shared";
+		driver = MAIL_SHARED_STORAGE_NAME;
 	} else {
 		driver = NULL;
 	}
diff -r ee568c83319d -r 9bb653472f16 src/lib-storage/mail-storage-private.h
--- a/src/lib-storage/mail-storage-private.h	Thu Jul 03 19:00:46 2014 +0300
+++ b/src/lib-storage/mail-storage-private.h	Thu Jul 03 19:03:59 2014 +0300
@@ -17,6 +17,8 @@
 /* Block size when read()ing message (header and) body. */
 #define MAIL_READ_FULL_BLOCK_SIZE IO_BLOCK_SIZE
 
+#define MAIL_SHARED_STORAGE_NAME "shared"
+
 struct mail_storage_module_register {
 	unsigned int id;
 };