From: Timo Sirainen <tss@iki.fi>
Date: Mon, 27 Sep 2010 12:45:24 +0000 (+0100)
Subject: zlib: Avoid using hardcoded storage name strings.
X-Git-Tag: 2.0.5~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b69aadbda25d9b8a81797280f26e206e8ea5875;p=thirdparty%2Fdovecot%2Fcore.git

zlib: Avoid using hardcoded storage name strings.
---

diff --git a/src/plugins/zlib/Makefile.am b/src/plugins/zlib/Makefile.am
index 1a0c6552ef..d3bd9ab0fe 100644
--- a/src/plugins/zlib/Makefile.am
+++ b/src/plugins/zlib/Makefile.am
@@ -3,7 +3,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-mail \
 	-I$(top_srcdir)/src/lib-index \
 	-I$(top_srcdir)/src/lib-storage \
-	-I$(top_srcdir)/src/lib-storage/index
+	-I$(top_srcdir)/src/lib-storage/index \
+	-I$(top_srcdir)/src/lib-storage/index/dbox-common
 
 lib20_zlib_plugin_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/plugins/zlib/zlib-plugin.c b/src/plugins/zlib/zlib-plugin.c
index ed4fc8e440..17961019a9 100644
--- a/src/plugins/zlib/zlib-plugin.c
+++ b/src/plugins/zlib/zlib-plugin.c
@@ -5,6 +5,9 @@
 #include "istream.h"
 #include "ostream.h"
 #include "mail-user.h"
+#include "dbox-single/sdbox-storage.h"
+#include "dbox-multi/mdbox-storage.h"
+#include "maildir/maildir-storage.h"
 #include "index-storage.h"
 #include "index-mail.h"
 #include "istream-zlib.h"
@@ -359,9 +362,9 @@ static void zlib_mailbox_allocated(struct mailbox *box)
 
 	MODULE_CONTEXT_SET_SELF(box, zlib_storage_module, zbox);
 
-	if (strcmp(box->storage->name, "maildir") == 0 ||
-	    strcmp(box->storage->name, "mdbox") == 0 ||
-	    strcmp(box->storage->name, "sdbox") == 0)
+	if (strcmp(box->storage->name, MAILDIR_STORAGE_NAME) == 0 ||
+	    strcmp(box->storage->name, MDBOX_STORAGE_NAME) == 0 ||
+	    strcmp(box->storage->name, SDBOX_STORAGE_NAME) == 0)
 		zlib_permail_alloc_init(box, v);
 }