lib-index: mail_index_register_expunge_handler() - Remove call_always handling

It's not needed anymore.

diff --git a/src/lib-index/mail-cache.c b/src/lib-index/mail-cache.c
index 88518fe9db4088be9fdf8fab0d5f1dd5e9ddaf4d..e9a9f25f7bc264bf36d9aa6db3bff60ad030e939 100644 (file)
--- a/src/lib-index/mail-cache.c
+++ b/src/lib-index/mail-cache.c
@@ -595,7 +595,7 @@ mail_cache_open_or_create_path(struct mail_index *index, const char *path)
        cache->ext_id =
                mail_index_ext_register(index, "cache", 0,
                                        sizeof(uint32_t), sizeof(uint32_t));
-       mail_index_register_expunge_handler(index, cache->ext_id, FALSE,
+       mail_index_register_expunge_handler(index, cache->ext_id,
                                            mail_cache_expunge_handler, cache);
        return cache;
 }

diff --git a/src/lib-index/mail-index-private.h b/src/lib-index/mail-index-private.h
index 2afad9d13f88eb9d5feeace5c4523d81506e7fbc..bd1ed658cab3ba9a2f21b034705d00331a8e8168 100644 (file)
--- a/src/lib-index/mail-index-private.h
+++ b/src/lib-index/mail-index-private.h
@@ -99,7 +99,6 @@ struct mail_index_registered_ext {
        mail_index_expunge_handler_t *expunge_handler;
 
        void *expunge_context;
-       bool expunge_handler_call_always:1;
 };
 
 struct mail_index_record_map {
@@ -259,9 +258,9 @@ struct mail_index {
 extern struct mail_index_module_register mail_index_module_register;
 extern struct event_category event_category_mail_index;
 
-/* Add/replace sync handler for specified extra record. */
+/* Add/replace expunge handler for specified extension. */
 void mail_index_register_expunge_handler(struct mail_index *index,
-                                        uint32_t ext_id, bool call_always,
+                                        uint32_t ext_id,
                                         mail_index_expunge_handler_t *callback,
                                         void *context);
 void mail_index_unregister_expunge_handler(struct mail_index *index,

diff --git a/src/lib-index/mail-index-sync-ext.c b/src/lib-index/mail-index-sync-ext.c
index ee6bfec23c84f872116f47328bee428a280a59c0..e6168cfec104d7b165996db026699e394f97ef9e 100644 (file)
--- a/src/lib-index/mail-index-sync-ext.c
+++ b/src/lib-index/mail-index-sync-ext.c
@@ -39,8 +39,7 @@ void mail_index_sync_init_expunge_handlers(struct mail_index_sync_map_ctx *ctx)
                map_ext_id = idx_ext_id >= id_map_count ? (uint32_t)-1 :
                        id_map[idx_ext_id];
                if (rext[idx_ext_id].expunge_handler == NULL ||
-                   (map_ext_id == (uint32_t)-1 &&
-                    !rext[idx_ext_id].expunge_handler_call_always))
+                   (map_ext_id == (uint32_t)-1))
                        continue;
 
                eh.handler = rext[idx_ext_id].expunge_handler;

diff --git a/src/lib-index/mail-index.c b/src/lib-index/mail-index.c
index 00e53b0cc6968c6417bb740d2f23caa8f45f1d7d..0a2f246337873ed38ccc63b39c58a298983fba79 100644 (file)
--- a/src/lib-index/mail-index.c
+++ b/src/lib-index/mail-index.c
@@ -307,7 +307,7 @@ bool mail_index_ext_lookup(struct mail_index *index, const char *name,
 }
 
 void mail_index_register_expunge_handler(struct mail_index *index,
-                                        uint32_t ext_id, bool call_always,
+                                        uint32_t ext_id,
                                         mail_index_expunge_handler_t *cb,
                                         void *context)
 {
@@ -318,7 +318,6 @@ void mail_index_register_expunge_handler(struct mail_index *index,
 
        rext->expunge_handler = cb;
        rext->expunge_context = context;
-       rext->expunge_handler_call_always = call_always;
 }
 
 void mail_index_unregister_expunge_handler(struct mail_index *index,