dovecot: Renamed mail_index_lookup_uid_range() to mail_index_loo...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Nov 3 22:33:24 EET 2007
details: http://hg.dovecot.org/dovecot/rev/90bcf480312d
changeset: 6677:90bcf480312d
user: Timo Sirainen <tss at iki.fi>
date: Sat Nov 03 21:56:05 2007 +0200
description:
Renamed mail_index_lookup_uid_range() to mail_index_lookup_seq_range(), made
it return a bool and added mail_index_lookup_seq(). Cleaned up the code to
use these functions.
diffstat:
21 files changed, 66 insertions(+), 84 deletions(-)
src/lib-index/mail-cache-compress.c | 8 ++++----
src/lib-index/mail-index-sync-ext.c | 3 +--
src/lib-index/mail-index-sync-keywords.c | 8 +++-----
src/lib-index/mail-index-sync-update.c | 8 +++-----
src/lib-index/mail-index-transaction-view.c | 6 +++---
src/lib-index/mail-index-view-private.h | 2 +-
src/lib-index/mail-index-view-sync.c | 10 ++++------
src/lib-index/mail-index-view.c | 20 +++++++++++++-------
src/lib-index/mail-index.h | 10 ++++++----
src/lib-index/mailbox-list-index-sync.c | 18 +++++-------------
src/lib-storage/index/cydir/cydir-sync.c | 12 +++++-------
src/lib-storage/index/dbox/dbox-sync-file.c | 3 +--
src/lib-storage/index/dbox/dbox-sync.c | 12 +++++-------
src/lib-storage/index/index-fetch.c | 2 +-
src/lib-storage/index/index-mail.c | 3 +--
src/lib-storage/index/index-search.c | 2 +-
src/lib-storage/index/index-sync-changes.c | 2 +-
src/lib-storage/index/index-sync.c | 7 +++----
src/lib-storage/index/mbox/mbox-sync.c | 5 ++---
src/lib-storage/list/index-mailbox-list-sync.c | 6 ++----
src/lib-storage/list/index-mailbox-list.c | 3 +--
diffs (truncated from 467 to 300 lines):
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mail-cache-compress.c
--- a/src/lib-index/mail-cache-compress.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mail-cache-compress.c Sat Nov 03 21:56:05 2007 +0200
@@ -175,10 +175,10 @@ mail_cache_copy(struct mail_cache *cache
first_new_seq = 1;
message_count = mail_index_view_get_messages_count(view);
} else {
- mail_index_lookup_uid_range(view, idx_hdr->day_first_uid[7],
- (uint32_t)-1, &first_new_seq,
- &message_count);
- if (first_new_seq == 0)
+ if (!mail_index_lookup_seq_range(view,
+ idx_hdr->day_first_uid[7],
+ (uint32_t)-1, &first_new_seq,
+ &message_count))
first_new_seq = message_count+1;
}
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mail-index-sync-ext.c
--- a/src/lib-index/mail-index-sync-ext.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mail-index-sync-ext.c Sat Nov 03 21:56:05 2007 +0200
@@ -561,8 +561,7 @@ mail_index_sync_ext_rec_update(struct ma
i_assert(ctx->cur_ext_map_idx != (uint32_t)-1);
i_assert(!ctx->cur_ext_ignore);
- mail_index_lookup_uid_range(view, u->uid, u->uid, &seq, &seq);
- if (seq == 0)
+ if (!mail_index_lookup_seq(view, u->uid, &seq))
return 1;
ext = array_idx(&view->map->extensions, ctx->cur_ext_map_idx);
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mail-index-sync-keywords.c
--- a/src/lib-index/mail-index-sync-keywords.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mail-index-sync-keywords.c Sat Nov 03 21:56:05 2007 +0200
@@ -205,8 +205,7 @@ keywords_update_records(struct mail_inde
i_assert(keyword_idx != (unsigned int)-1);
- mail_index_lookup_uid_range(view, uid1, uid2, &seq1, &seq2);
- if (seq1 == 0)
+ if (!mail_index_lookup_seq_range(view, uid1, uid2, &seq1, &seq2))
return 1;
mail_index_sync_write_seq_update(ctx, seq1, seq2);
@@ -325,9 +324,8 @@ mail_index_sync_keywords_reset(struct ma
ext = array_idx(&map->extensions, ext_map_idx);
end = CONST_PTR_OFFSET(r, hdr->size);
for (; r != end; r++) {
- mail_index_lookup_uid_range(ctx->view, r->uid1, r->uid2,
- &seq1, &seq2);
- if (seq1 == 0)
+ if (!mail_index_lookup_seq_range(ctx->view, r->uid1, r->uid2,
+ &seq1, &seq2))
continue;
mail_index_sync_write_seq_update(ctx, seq1, seq2);
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mail-index-sync-update.c
--- a/src/lib-index/mail-index-sync-update.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mail-index-sync-update.c Sat Nov 03 21:56:05 2007 +0200
@@ -230,9 +230,8 @@ sync_expunge(const struct mail_transacti
unsigned int i;
for (i = 0; i < count; i++, e++) {
- mail_index_lookup_uid_range(ctx->view, e->uid1, e->uid2,
- &seq1, &seq2);
- if (seq1 == 0) {
+ if (!mail_index_lookup_seq_range(ctx->view, e->uid1, e->uid2,
+ &seq1, &seq2)) {
/* everything expunged already */
continue;
}
@@ -343,8 +342,7 @@ static int sync_flag_update(const struct
uint8_t flag_mask, old_flags;
uint32_t idx, seq1, seq2;
- mail_index_lookup_uid_range(view, u->uid1, u->uid2, &seq1, &seq2);
- if (seq1 == 0)
+ if (!mail_index_lookup_seq_range(view, u->uid1, u->uid2, &seq1, &seq2))
return 1;
mail_index_sync_write_seq_update(ctx, seq1, seq2);
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mail-index-transaction-view.c
--- a/src/lib-index/mail-index-transaction-view.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mail-index-transaction-view.c Sat Nov 03 21:56:05 2007 +0200
@@ -97,7 +97,7 @@ tview_lookup_uid(struct mail_index_view
tview->super->lookup_uid(view, seq, uid_r);
}
-static void tview_lookup_uid_range(struct mail_index_view *view,
+static void tview_lookup_seq_range(struct mail_index_view *view,
uint32_t first_uid, uint32_t last_uid,
uint32_t *first_seq_r, uint32_t *last_seq_r)
{
@@ -106,7 +106,7 @@ static void tview_lookup_uid_range(struc
const struct mail_index_record *rec;
uint32_t seq;
- tview->super->lookup_uid_range(view, first_uid, last_uid,
+ tview->super->lookup_seq_range(view, first_uid, last_uid,
first_seq_r, last_seq_r);
if (tview->t->last_new_seq == 0) {
/* no new messages, the results are final. */
@@ -250,7 +250,7 @@ static struct mail_index_view_vfuncs tra
tview_get_header,
tview_lookup_full,
tview_lookup_uid,
- tview_lookup_uid_range,
+ tview_lookup_seq_range,
tview_lookup_first,
tview_lookup_ext_full,
tview_get_header_ext,
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mail-index-view-private.h
--- a/src/lib-index/mail-index-view-private.h Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mail-index-view-private.h Sat Nov 03 21:56:05 2007 +0200
@@ -20,7 +20,7 @@ struct mail_index_view_vfuncs {
struct mail_index_map **map_r, bool *expunged_r);
void (*lookup_uid)(struct mail_index_view *view, uint32_t seq,
uint32_t *uid_r);
- void (*lookup_uid_range)(struct mail_index_view *view,
+ void (*lookup_seq_range)(struct mail_index_view *view,
uint32_t first_uid, uint32_t last_uid,
uint32_t *first_seq_r, uint32_t *last_seq_r);
void (*lookup_first)(struct mail_index_view *view,
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mail-index-view-sync.c
--- a/src/lib-index/mail-index-view-sync.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mail-index-view-sync.c Sat Nov 03 21:56:05 2007 +0200
@@ -193,9 +193,8 @@ view_sync_get_expunges(struct mail_index
src = dest = array_get_modifiable(expunges_r, &count);
src_end = src + count;
for (; src != src_end; src++) {
- mail_index_lookup_uid_range(view, src->seq1, src->seq2,
- &dest->seq1, &dest->seq2);
- if (dest->seq1 == 0)
+ if (!mail_index_lookup_seq_range(view, src->seq1, src->seq2,
+ &dest->seq1, &dest->seq2))
count--;
else {
i_assert(dest->seq1 > prev_seq);
@@ -218,9 +217,8 @@ static bool have_existing_expunges(struc
range_end = CONST_PTR_OFFSET(range, size);
for (; range < range_end; range++) {
- mail_index_lookup_uid_range(view, range->seq1, range->seq2,
- &seq1, &seq2);
- if (seq1 != 0)
+ if (mail_index_lookup_seq_range(view, range->seq1, range->seq2,
+ &seq1, &seq2))
return TRUE;
}
return FALSE;
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mail-index-view.c
--- a/src/lib-index/mail-index-view.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mail-index-view.c Sat Nov 03 21:56:05 2007 +0200
@@ -261,7 +261,7 @@ static uint32_t mail_index_bsearch_uid(s
return idx+1;
}
-static void view_lookup_uid_range(struct mail_index_view *view,
+static void view_lookup_seq_range(struct mail_index_view *view,
uint32_t first_uid, uint32_t last_uid,
uint32_t *first_seq_r, uint32_t *last_seq_r)
{
@@ -321,9 +321,7 @@ static void view_lookup_first(struct mai
if (low_uid == 1)
seq = 1;
else {
- mail_index_lookup_uid_range(view, low_uid, low_uid,
- &seq, &seq);
- if (seq == 0)
+ if (!mail_index_lookup_seq(view, low_uid, &seq))
return;
}
@@ -506,12 +504,20 @@ void mail_index_lookup_uid(struct mail_i
view->v.lookup_uid(view, seq, uid_r);
}
-void mail_index_lookup_uid_range(struct mail_index_view *view,
+bool mail_index_lookup_seq_range(struct mail_index_view *view,
uint32_t first_uid, uint32_t last_uid,
uint32_t *first_seq_r, uint32_t *last_seq_r)
{
- view->v.lookup_uid_range(view, first_uid, last_uid,
+ view->v.lookup_seq_range(view, first_uid, last_uid,
first_seq_r, last_seq_r);
+ return *first_seq_r != 0;
+}
+
+bool mail_index_lookup_seq(struct mail_index_view *view,
+ uint32_t uid, uint32_t *seq_r)
+{
+ view->v.lookup_seq_range(view, uid, uid, seq_r, seq_r);
+ return *seq_r != 0;
}
void mail_index_lookup_first(struct mail_index_view *view,
@@ -598,7 +604,7 @@ static struct mail_index_view_vfuncs vie
view_get_header,
view_lookup_full,
view_lookup_uid,
- view_lookup_uid_range,
+ view_lookup_seq_range,
view_lookup_first,
view_lookup_ext_full,
view_get_header_ext,
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mail-index.h
--- a/src/lib-index/mail-index.h Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mail-index.h Sat Nov 03 21:56:05 2007 +0200
@@ -317,12 +317,14 @@ void mail_index_lookup_keywords(struct m
mail_index_lookup()->uid. */
void mail_index_lookup_uid(struct mail_index_view *view, uint32_t seq,
uint32_t *uid_r);
-/* Convert UID range to sequence range. If no UIDs are found, sequences are
- set to 0. Note that any of the returned sequences may have been expunged
- already. */
-void mail_index_lookup_uid_range(struct mail_index_view *view,
+/* Convert UID range to sequence range. If no UIDs are found, returns FALSE and
+ sequences are set to 0. Note that any of the returned sequences may have
+ been expunged already. */
+bool mail_index_lookup_seq_range(struct mail_index_view *view,
uint32_t first_uid, uint32_t last_uid,
uint32_t *first_seq_r, uint32_t *last_seq_r);
+bool mail_index_lookup_seq(struct mail_index_view *view,
+ uint32_t uid, uint32_t *seq_r);
/* Find first mail with (mail->flags & flags_mask) == flags. Useful mostly for
taking advantage of lowwater-fields in headers. */
void mail_index_lookup_first(struct mail_index_view *view,
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-index/mailbox-list-index-sync.c
--- a/src/lib-index/mailbox-list-index-sync.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-index/mailbox-list-index-sync.c Sat Nov 03 21:56:05 2007 +0200
@@ -204,9 +204,7 @@ mailbox_list_index_sync_get_seq(struct m
return mailbox_list_index_set_corrupted(ctx->index,
"Record with UID=0");
}
- mail_index_lookup_uid_range(ctx->mail_view, rec->uid, rec->uid,
- &rec->seq, &rec->seq);
- if (rec->seq == 0) {
+ if (!mail_index_lookup_seq(ctx->mail_view, rec->uid, &rec->seq)) {
mail_hdr = mail_index_get_header(ctx->mail_view);
if (rec->uid < mail_hdr->next_uid) {
i_warning("%s: Desync: Record uid=%u "
@@ -594,11 +592,8 @@ mailbox_list_index_sync_recreate_dir(str
/* expunge from mail index */
uint32_t seq;
- mail_index_lookup_uid_range(ctx->mail_view,
- sync_recs[src].uid,
- sync_recs[src].uid,
- &seq, &seq);
- if (seq != 0)
+ if (mail_index_lookup_seq(ctx->mail_view,
+ sync_recs[src].uid, &seq))
mail_index_expunge(ctx->trans, seq);
// FIXME: expunge also NONEXISTENT parents
@@ -724,11 +719,8 @@ mailbox_list_index_sync_update_dir(struc
recs[j].deleted = TRUE;
/* expunge from mail index */
- mail_index_lookup_uid_range(ctx->mail_view,
- sync_recs[i].uid,
- sync_recs[i].uid,
- &seq, &seq);
- if (seq != 0)
+ if (mail_index_lookup_seq(ctx->mail_view,
+ sync_recs[i].uid, &seq))
mail_index_expunge(ctx->trans, seq);
/* If we compress the file, the record must be removed
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-storage/index/cydir/cydir-sync.c
--- a/src/lib-storage/index/cydir/cydir-sync.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-storage/index/cydir/cydir-sync.c Sat Nov 03 21:56:05 2007 +0200
@@ -73,18 +73,16 @@ static void cydir_sync_index(struct cydi
cydir_sync_set_uidvalidity(ctx);
/* mark the newly seen messages as recent */
- mail_index_lookup_uid_range(ctx->sync_view, hdr->first_recent_uid,
- hdr->next_uid, &seq1, &seq2);
- if (seq1 != 0) {
+ if (mail_index_lookup_seq_range(ctx->sync_view, hdr->first_recent_uid,
+ hdr->next_uid, &seq1, &seq2)) {
index_mailbox_set_recent_seq(&ctx->mbox->ibox, ctx->sync_view,
seq1, seq2);
}
while (mail_index_sync_next(ctx->index_sync_ctx, &sync_rec)) {
- mail_index_lookup_uid_range(ctx->sync_view,
- sync_rec.uid1, sync_rec.uid2,
- &seq1, &seq2);
- if (seq1 == 0) {
+ if (!mail_index_lookup_seq_range(ctx->sync_view,
+ sync_rec.uid1, sync_rec.uid2,
+ &seq1, &seq2)) {
/* already expunged, nothing to do. */
continue;
}
diff -r 6a54a5339a64 -r 90bcf480312d src/lib-storage/index/dbox/dbox-sync-file.c
--- a/src/lib-storage/index/dbox/dbox-sync-file.c Sat Nov 03 21:39:33 2007 +0200
+++ b/src/lib-storage/index/dbox/dbox-sync-file.c Sat Nov 03 21:56:05 2007 +0200
@@ -118,8 +118,7 @@ dbox_sync_file_expunge(struct dbox_sync_
More information about the dovecot-cvs
mailing list