Mercurial > dovecot > core-2.2

changeset 12185:a3c8026d0305

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zlib: Avoid using hardcoded storage name strings.
author Timo Sirainen <tss@iki.fi>
date Mon, 27 Sep 2010 13:45:24 +0100
parents c359ee549df7
children 4959db811d29
files src/plugins/zlib/Makefile.am src/plugins/zlib/zlib-plugin.c
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/zlib/Makefile.am	Mon Sep 27 13:44:49 2010 +0100
+++ b/src/plugins/zlib/Makefile.am	Mon Sep 27 13:45:24 2010 +0100
@@ -3,7 +3,8 @@
 	-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
 
--- a/src/plugins/zlib/zlib-plugin.c	Mon Sep 27 13:44:49 2010 +0100
+++ b/src/plugins/zlib/zlib-plugin.c	Mon Sep 27 13:45:24 2010 +0100
@@ -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 @@
 
 	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);
 }