changeset 4243:07c10799434e HEAD

Fixes to updating keywords
author Timo Sirainen <tss@iki.fi>
date Wed, 03 May 2006 01:05:09 +0300
parents e05768db2fd7
children b9a7a9592f43
files src/lib-index/mail-index-transaction.c
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-index/mail-index-transaction.c	Tue May 02 23:11:08 2006 +0300
+++ b/src/lib-index/mail-index-transaction.c	Wed May 03 01:05:09 2006 +0300
@@ -320,8 +320,8 @@
 					      &ext_rec_array_count);
 	for (j = 0; j < ext_rec_array_count; j++) {
 		array_t *old_array = &ext_rec_arrays[j];
-		ARRAY_SET_TYPE(old_array, void *);
-		array_t ARRAY_DEFINE(new_array, void *);
+		ARRAY_SET_TYPE(old_array, void);
+		array_t new_array;
 		unsigned int ext_count;
 		const uint32_t *ext_rec;
 		uint32_t seq;
@@ -896,7 +896,7 @@
 				enum modify_type modify_type,
 				struct mail_keywords *keywords)
 {
-	struct mail_index_transaction_keyword_update **ku, *u;
+	struct mail_index_transaction_keyword_update *u;
 	unsigned int i, ku_count;
 
 	i_assert(seq > 0 &&
@@ -939,13 +939,13 @@
 	case MODIFY_REPLACE:
 		/* Remove sequence from all add/remove arrays */
 		if (array_is_created(&t->keyword_updates)) {
-			ku = array_get_modifyable(&t->keyword_updates,
-						  &ku_count);
+			u = array_get_modifyable(&t->keyword_updates,
+						 &ku_count);
 			for (i = 0; i < ku_count; i++) {
-				seq_range_array_remove(&ku[i]->add_seq, seq);
+				seq_range_array_remove(&u[i].add_seq, seq);
 				if (seq < t->first_new_seq) {
 					seq_range_array_remove(
-						&ku[i]->remove_seq, seq);
+						&u[i].remove_seq, seq);
 				}
 			}
 		}