From 796363ab199a7e728ef334ba1fed69da2d97c0d7 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 27 Aug 2008 12:08:14 +0300 Subject: [PATCH] Expire plugin: Include expire/ in the dictionary path. --HG-- branch : HEAD --- src/plugins/expire/expire-env.h | 2 ++ src/plugins/expire/expire-plugin.c | 2 +- src/plugins/expire/expire-tool.c | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/expire/expire-env.h b/src/plugins/expire/expire-env.h index 021eeee9bc..3f2ad28aa8 100644 --- a/src/plugins/expire/expire-env.h +++ b/src/plugins/expire/expire-env.h @@ -1,6 +1,8 @@ #ifndef EXPIRE_ENV_H #define EXPIRE_ENV_H +#define DICT_EXPIRE_PREFIX DICT_PATH_SHARED"expire/" + struct expire_env; struct expire_env *expire_env_init(const char *expunges, const char *altmoves); diff --git a/src/plugins/expire/expire-plugin.c b/src/plugins/expire/expire-plugin.c index ac27a791e5..3610c29f90 100644 --- a/src/plugins/expire/expire-plugin.c +++ b/src/plugins/expire/expire-plugin.c @@ -122,7 +122,7 @@ expire_mailbox_transaction_commit(struct mailbox_transaction_context *t, if (xt->first_expunged || xt->saves) T_BEGIN { const char *key, *value; - key = t_strconcat(DICT_PATH_SHARED, expire.username, "/", + key = t_strconcat(DICT_EXPIRE_PREFIX, expire.username, "/", mailbox_name, NULL); if (!xt->first_expunged && xt->saves) { /* saved new mails. dict needs to be updated only if diff --git a/src/plugins/expire/expire-tool.c b/src/plugins/expire/expire-tool.c index e8d5829dc8..c8211f8ee9 100644 --- a/src/plugins/expire/expire-tool.c +++ b/src/plugins/expire/expire-tool.c @@ -208,14 +208,14 @@ static void expire_run(bool testrun) i_fatal("dict_init() failed"); trans = dict_transaction_begin(dict); - iter = dict_iterate_init(dict, DICT_PATH_SHARED, + iter = dict_iterate_init(dict, DICT_EXPIRE_PREFIX, DICT_ITERATE_FLAG_RECURSE | DICT_ITERATE_FLAG_SORT_BY_VALUE); /* We'll get the oldest values (timestamps) first */ while (dict_iterate(iter, &key, &value) > 0) { - /* key = DICT_PATH_SHARED/ */ - userp = key + strlen(DICT_PATH_SHARED); + /* key = DICT_EXPIRE_PREFIX/ */ + userp = key + strlen(DICT_EXPIRE_PREFIX); p = strchr(userp, '/'); if (p == NULL) { -- 2.47.3