dovecot-2.2: lib-storage: Moved mail_storage_settings_to_index_f...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/d7dd5cdf1ba7
changeset: 15040:d7dd5cdf1ba7
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Sep 13 10:52:52 2012 +0300
description:
lib-storage: Moved mail_storage_settings_to_index_flags to mail-storage-private.h
This is mainly to allow #including mail-storage-settings.h from C++ code
without having to #include mail-index.h from mail-storage-settings.h

diffstat:

 src/lib-storage/list/mailbox-list-index.c |   1 +
 src/lib-storage/mail-storage-private.h    |   3 +++
 src/lib-storage/mail-storage-settings.c   |  16 ----------------
 src/lib-storage/mail-storage-settings.h   |   3 ---
 src/lib-storage/mail-storage.c            |  16 ++++++++++++++++
 5 files changed, 20 insertions(+), 19 deletions(-)

diffs (84 lines):

diff -r 349d52c4ca51 -r d7dd5cdf1ba7 src/lib-storage/list/mailbox-list-index.c
--- a/src/lib-storage/list/mailbox-list-index.c	Tue Sep 11 18:56:07 2012 +0300
+++ b/src/lib-storage/list/mailbox-list-index.c	Thu Sep 13 10:52:52 2012 +0300
@@ -6,6 +6,7 @@
 #include "str.h"
 #include "mail-index-view-private.h"
 #include "mail-storage-hooks.h"
+#include "mail-storage-private.h"
 #include "mailbox-list-index.h"
 
 #define MAILBOX_LIST_INDEX_REFRESH_DELAY_MSECS 1000
diff -r 349d52c4ca51 -r d7dd5cdf1ba7 src/lib-storage/mail-storage-private.h
--- a/src/lib-storage/mail-storage-private.h	Tue Sep 11 18:56:07 2012 +0300
+++ b/src/lib-storage/mail-storage-private.h	Thu Sep 13 10:52:52 2012 +0300
@@ -565,4 +565,7 @@
 					   unsigned int secs);
 void mail_storage_free_binary_cache(struct mail_storage *storage);
 
+enum mail_index_open_flags
+mail_storage_settings_to_index_flags(const struct mail_storage_settings *set);
+
 #endif
diff -r 349d52c4ca51 -r d7dd5cdf1ba7 src/lib-storage/mail-storage-settings.c
--- a/src/lib-storage/mail-storage-settings.c	Tue Sep 11 18:56:07 2012 +0300
+++ b/src/lib-storage/mail-storage-settings.c	Thu Sep 13 10:52:52 2012 +0300
@@ -298,22 +298,6 @@
 						 storage->name);
 }
 
-enum mail_index_open_flags
-mail_storage_settings_to_index_flags(const struct mail_storage_settings *set)
-{
-	enum mail_index_open_flags index_flags = 0;
-
-#ifndef MMAP_CONFLICTS_WRITE
-	if (set->mmap_disable)
-#endif
-		index_flags |= MAIL_INDEX_OPEN_FLAG_MMAP_DISABLE;
-	if (set->dotlock_use_excl)
-		index_flags |= MAIL_INDEX_OPEN_FLAG_DOTLOCK_USE_EXCL;
-	if (set->mail_nfs_index)
-		index_flags |= MAIL_INDEX_OPEN_FLAG_NFS_FLUSH;
-	return index_flags;
-}
-
 const struct dynamic_settings_parser *
 mail_storage_get_dynamic_parsers(pool_t pool)
 {
diff -r 349d52c4ca51 -r d7dd5cdf1ba7 src/lib-storage/mail-storage-settings.h
--- a/src/lib-storage/mail-storage-settings.h	Tue Sep 11 18:56:07 2012 +0300
+++ b/src/lib-storage/mail-storage-settings.h	Thu Sep 13 10:52:52 2012 +0300
@@ -110,9 +110,6 @@
 mail_user_set_get_storage_set(struct mail_user *user);
 const void *mail_storage_get_driver_settings(struct mail_storage *storage);
 
-enum mail_index_open_flags
-mail_storage_settings_to_index_flags(const struct mail_storage_settings *set);
-
 const struct dynamic_settings_parser *
 mail_storage_get_dynamic_parsers(pool_t pool);
 
diff -r 349d52c4ca51 -r d7dd5cdf1ba7 src/lib-storage/mail-storage.c
--- a/src/lib-storage/mail-storage.c	Tue Sep 11 18:56:07 2012 +0300
+++ b/src/lib-storage/mail-storage.c	Thu Sep 13 10:52:52 2012 +0300
@@ -1896,3 +1896,19 @@
 	return storage->set->mail_max_lock_timeout == 0 ? secs :
 		I_MIN(secs, storage->set->mail_max_lock_timeout);
 }
+
+enum mail_index_open_flags
+mail_storage_settings_to_index_flags(const struct mail_storage_settings *set)
+{
+	enum mail_index_open_flags index_flags = 0;
+
+#ifndef MMAP_CONFLICTS_WRITE
+	if (set->mmap_disable)
+#endif
+		index_flags |= MAIL_INDEX_OPEN_FLAG_MMAP_DISABLE;
+	if (set->dotlock_use_excl)
+		index_flags |= MAIL_INDEX_OPEN_FLAG_DOTLOCK_USE_EXCL;
+	if (set->mail_nfs_index)
+		index_flags |= MAIL_INDEX_OPEN_FLAG_NFS_FLUSH;
+	return index_flags;
+}