diff src/lib-index/mail-index.c @ 3817:dc560ef2654b HEAD

Moved expunge handlers to mail_index_registered_ext.
author Timo Sirainen <tss@iki.fi>
date Fri, 06 Jan 2006 14:57:06 +0200
parents 575c79a0aabc
children 6758c0f3c318
line wrap: on
line diff
--- a/src/lib-index/mail-index.c	Fri Jan 06 14:48:55 2006 +0200
+++ b/src/lib-index/mail-index.c	Fri Jan 06 14:57:06 2006 +0200
@@ -34,8 +34,6 @@
 	ARRAY_CREATE(&index->extensions, index->extension_pool,
 		     struct mail_index_registered_ext, 5);
 
-	ARRAY_CREATE(&index->expunge_handlers, default_pool,
-		     mail_index_expunge_handler_t *, 4);
 	ARRAY_CREATE(&index->sync_lost_handlers, default_pool,
 		     mail_index_sync_lost_handler_t *, 4);
 
@@ -61,7 +59,6 @@
 	pool_unref(index->keywords_pool);
 
 	array_free(&index->sync_lost_handlers);
-	array_free(&index->expunge_handlers);
 	array_free(&index->keywords);
 
 	i_free(index->error);
@@ -109,23 +106,23 @@
 					 uint32_t ext_id,
 					 mail_index_expunge_handler_t *cb)
 {
-        mail_index_expunge_handler_t **p;
+	struct mail_index_registered_ext *rext;
 
-	p = array_idx_modifyable(&index->expunge_handlers, ext_id);
-	i_assert(*p == NULL);
+	rext = array_idx_modifyable(&index->extensions, ext_id);
+	i_assert(rext->expunge_handler == NULL);
 
-	*p = cb;
+	rext->expunge_handler = cb;
 }
 
 void mail_index_unregister_expunge_handler(struct mail_index *index,
 					   uint32_t ext_id)
 {
-        mail_index_expunge_handler_t **p;
+	struct mail_index_registered_ext *rext;
 
-	p = array_idx_modifyable(&index->expunge_handlers, ext_id);
-	i_assert(*p != NULL);
+	rext = array_idx_modifyable(&index->extensions, ext_id);
+	i_assert(rext->expunge_handler != NULL);
 
-	*p = NULL;
+	rext->expunge_handler = NULL;
 }
 
 void mail_index_register_sync_handler(struct mail_index *index, uint32_t ext_id,