From: Timo Sirainen <tss@iki.fi>
Date: Wed, 18 Jun 2008 02:19:56 +0000 (+0300)
Subject: Renamed seq_range_array_remove_invert_range() to seq_range_array_intersect().
X-Git-Tag: 1.2.alpha1~275
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=290e45b36a085eac8722751f8baad0f8342fed48;p=thirdparty%2Fdovecot%2Fcore.git

Renamed seq_range_array_remove_invert_range() to seq_range_array_intersect().

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/index-fetch.c b/src/lib-storage/index/index-fetch.c
index abe9b2353c..347e2dacfd 100644
--- a/src/lib-storage/index/index-fetch.c
+++ b/src/lib-storage/index/index-fetch.c
@@ -97,7 +97,7 @@ bool index_storage_get_expunged_uids(struct mailbox *box, uint64_t modseq,
 	}
 
 	/* remove UIDs not in the wanted UIDs range */
-	seq_range_array_remove_invert_range(expunged_uids, uids);
+	seq_range_array_intersect(expunged_uids, uids);
 	mail_transaction_log_view_close(&log_view);
 	return TRUE;
 }
diff --git a/src/lib/seq-range-array.c b/src/lib/seq-range-array.c
index 42a530bf1c..f952f7fc50 100644
--- a/src/lib/seq-range-array.c
+++ b/src/lib/seq-range-array.c
@@ -281,8 +281,8 @@ unsigned int seq_range_array_remove_seq_range(ARRAY_TYPE(seq_range) *dest,
 }
 
 unsigned int
-seq_range_array_remove_invert_range(ARRAY_TYPE(seq_range) *dest,
-				    const ARRAY_TYPE(seq_range) *src)
+seq_range_array_intersect(ARRAY_TYPE(seq_range) *dest,
+			  const ARRAY_TYPE(seq_range) *src)
 {
 	const struct seq_range *src_range;
 	unsigned int i, count, ret = 0;
diff --git a/src/lib/seq-range-array.h b/src/lib/seq-range-array.h
index 374eb116bf..fe5d154254 100644
--- a/src/lib/seq-range-array.h
+++ b/src/lib/seq-range-array.h
@@ -26,10 +26,11 @@ unsigned int seq_range_array_remove_range(ARRAY_TYPE(seq_range) *array,
 					  uint32_t seq1, uint32_t seq2);
 unsigned int seq_range_array_remove_seq_range(ARRAY_TYPE(seq_range) *dest,
 					      const ARRAY_TYPE(seq_range) *src);
-/* Remove sequences from dest that don't exist in src. */
+/* Remove sequences from dest that don't exist in src.
+   Returns the number of sequences actually removed. */
 unsigned int
-seq_range_array_remove_invert_range(ARRAY_TYPE(seq_range) *dest,
-				    const ARRAY_TYPE(seq_range) *src);
+seq_range_array_intersect(ARRAY_TYPE(seq_range) *dest,
+			  const ARRAY_TYPE(seq_range) *src);
 /* Returns TRUE if sequence exists in the range. */
 bool seq_range_exists(const ARRAY_TYPE(seq_range) *array, uint32_t seq);
 /* Return number of sequences in the range. */
diff --git a/src/plugins/fts-squat/squat-trie.c b/src/plugins/fts-squat/squat-trie.c
index f283fa9ee8..260661e69e 100644
--- a/src/plugins/fts-squat/squat-trie.c
+++ b/src/plugins/fts-squat/squat-trie.c
@@ -1900,8 +1900,8 @@ squat_trie_lookup_partial(struct squat_trie_lookup_context *ctx,
 		} else {
 			squat_trie_filter_type(ctx->type, &ctx->tmp_uids,
 					       &ctx->tmp_uids2);
-			seq_range_array_remove_invert_range(ctx->maybe_uids,
-							    &ctx->tmp_uids2);
+			seq_range_array_intersect(ctx->maybe_uids,
+						  &ctx->tmp_uids2);
 		}
 		i += char_lengths[i];
 		char_idx++;
diff --git a/src/plugins/fts/fts-api.c b/src/plugins/fts/fts-api.c
index 988179691f..49bd11d674 100644
--- a/src/plugins/fts/fts-api.c
+++ b/src/plugins/fts/fts-api.c
@@ -234,8 +234,7 @@ int fts_backend_filter(struct fts_backend *backend, const char *key,
 		} T_END;
 		/* keep only what exists in both lists. the rest is in
 		   maybies or not wanted */
-		seq_range_array_remove_invert_range(definite_uids,
-						    &tmp_definite);
+		seq_range_array_intersect(definite_uids, &tmp_definite);
 	}
 	array_free(&tmp_maybe);
 	array_free(&tmp_definite);