zlib: Avoid using hardcoded storage name strings.

diff --git a/src/plugins/zlib/Makefile.am b/src/plugins/zlib/Makefile.am
index 1a0c6552ef9a650ebd4bfe10f146cb8904bac2e7..d3bd9ab0fe0a47bedf6550b7207dfef2392654df 100644 (file)
--- 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 ed4fc8e440569230cca9870973df9346f98a6ac6..17961019a9be9e0b4ad2ed8c90f00fe29daf6cbc 100644 (file)
--- 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);
 }