dovecot-1.2: Renamed seq_range_array_remove_invert_range() to se...
dovecot at dovecot.org
dovecot at dovecot.org
Wed Jun 18 05:57:59 EEST 2008
details: http://hg.dovecot.org/dovecot-1.2/rev/d12fc53f71be
changeset: 7886:d12fc53f71be
user: Timo Sirainen <tss at iki.fi>
date: Wed Jun 18 05:19:56 2008 +0300
description:
Renamed seq_range_array_remove_invert_range() to seq_range_array_intersect().
diffstat:
5 files changed, 10 insertions(+), 10 deletions(-)
src/lib-storage/index/index-fetch.c | 2 +-
src/lib/seq-range-array.c | 4 ++--
src/lib/seq-range-array.h | 7 ++++---
src/plugins/fts-squat/squat-trie.c | 4 ++--
src/plugins/fts/fts-api.c | 3 +--
diffs (71 lines):
diff -r ad087a4c480f -r d12fc53f71be src/lib-storage/index/index-fetch.c
--- a/src/lib-storage/index/index-fetch.c Wed Jun 18 04:06:19 2008 +0300
+++ b/src/lib-storage/index/index-fetch.c Wed Jun 18 05:19:56 2008 +0300
@@ -97,7 +97,7 @@ bool index_storage_get_expunged_uids(str
}
/* 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 -r ad087a4c480f -r d12fc53f71be src/lib/seq-range-array.c
--- a/src/lib/seq-range-array.c Wed Jun 18 04:06:19 2008 +0300
+++ b/src/lib/seq-range-array.c Wed Jun 18 05:19:56 2008 +0300
@@ -281,8 +281,8 @@ unsigned int seq_range_array_remove_seq_
}
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 -r ad087a4c480f -r d12fc53f71be src/lib/seq-range-array.h
--- a/src/lib/seq-range-array.h Wed Jun 18 04:06:19 2008 +0300
+++ b/src/lib/seq-range-array.h Wed Jun 18 05:19:56 2008 +0300
@@ -26,10 +26,11 @@ unsigned int seq_range_array_remove_rang
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 -r ad087a4c480f -r d12fc53f71be src/plugins/fts-squat/squat-trie.c
--- a/src/plugins/fts-squat/squat-trie.c Wed Jun 18 04:06:19 2008 +0300
+++ b/src/plugins/fts-squat/squat-trie.c Wed Jun 18 05:19:56 2008 +0300
@@ -1900,8 +1900,8 @@ squat_trie_lookup_partial(struct squat_t
} 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 -r ad087a4c480f -r d12fc53f71be src/plugins/fts/fts-api.c
--- a/src/plugins/fts/fts-api.c Wed Jun 18 04:06:19 2008 +0300
+++ b/src/plugins/fts/fts-api.c Wed Jun 18 05:19:56 2008 +0300
@@ -234,8 +234,7 @@ int fts_backend_filter(struct fts_backen
} 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);
More information about the dovecot-cvs
mailing list