From: Timo Sirainen <tss@iki.fi>
Date: Mon, 13 Jul 2009 17:19:32 +0000 (-0400)
Subject: Previous commit accidentally removed mail_index_keywords_create().
X-Git-Tag: 2.0.alpha1~438
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a09c57f1c66b4a8880bcc12b567bb42c3549f52;p=thirdparty%2Fdovecot%2Fcore.git

Previous commit accidentally removed mail_index_keywords_create().

--HG--
branch : HEAD
---

diff --git a/src/lib-index/mail-index.c b/src/lib-index/mail-index.c
index 6f65871879..1530867a2d 100644
--- a/src/lib-index/mail-index.c
+++ b/src/lib-index/mail-index.c
@@ -258,6 +258,44 @@ const ARRAY_TYPE(keywords) *mail_index_get_keywords(struct mail_index *index)
 	return &index->keywords;
 }
 
+struct mail_keywords *
+mail_index_keywords_create(struct mail_index *index,
+			   const char *const keywords[])
+{
+	struct mail_keywords *k;
+	unsigned int src, dest, i, count;
+
+	count = str_array_length(keywords);
+	if (count == 0) {
+		k = i_new(struct mail_keywords, 1);
+		k->index = index;
+		k->refcount = 1;
+		return k;
+	}
+
+	/* @UNSAFE */
+	k = i_malloc(sizeof(struct mail_keywords) +
+		     (sizeof(k->idx) * (count-1)));
+	k->index = index;
+	k->refcount = 1;
+
+	/* look up the keywords from index. they're never removed from there
+	   so we can permanently store indexes to them. */
+	for (src = dest = 0; src < count; src++) {
+		mail_index_keyword_lookup_or_create(index, keywords[src],
+						    &k->idx[dest]);
+		/* ignore if this is a duplicate */
+		for (i = 0; i < src; i++) {
+			if (k->idx[i] == k->idx[dest])
+				break;
+		}
+		if (i == src)
+			dest++;
+	}
+	k->count = dest;
+	return k;
+}
+
 struct mail_keywords *
 mail_index_keywords_create_from_indexes(struct mail_index *index,
 					const ARRAY_TYPE(keyword_indexes)