Mercurial > dovecot > core-2.2
changeset 2400:8ab6097598a6 HEAD
Changed some asserts to failure return calls since they actually can happen
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 31 Jul 2004 02:24:48 +0300 |
| parents | b1b05f3b6805 |
| children | c617b748be41 |
| files | src/lib-index/mail-index-sync-update.c |
| diffstat | 1 files changed, 11 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-index/mail-index-sync-update.c Fri Jul 30 12:30:51 2004 +0300 +++ b/src/lib-index/mail-index-sync-update.c Sat Jul 31 02:24:48 2004 +0300 @@ -80,12 +80,12 @@ struct mail_index_header *hdr = &map->hdr_copy; struct mail_index_record *rec; uint32_t count, seq, seq1, seq2; - int ret; i_assert(MAIL_INDEX_MAP_IS_IN_MEMORY(map)); - ret = mail_index_lookup_uid_range(view, e->uid1, e->uid2, &seq1, &seq2); - i_assert(ret == 0); + if (mail_index_lookup_uid_range(view, e->uid1, e->uid2, + &seq1, &seq2) < 0) + return -1; if (seq1 == 0) return 1; @@ -167,10 +167,11 @@ uint8_t flag_mask, old_flags; keywords_mask_t keyword_mask; uint32_t i, idx, seq1, seq2; - int update_keywords, ret; + int update_keywords; - ret = mail_index_lookup_uid_range(view, u->uid1, u->uid2, &seq1, &seq2); - i_assert(ret == 0); + if (mail_index_lookup_uid_range(view, u->uid1, u->uid2, + &seq1, &seq2) < 0) + return -1; if (seq1 == 0) return 1; @@ -228,11 +229,9 @@ struct mail_index_view *view = ctx->view; struct mail_index_record *rec; uint32_t seq; - int ret; - ret = mail_index_lookup_uid_range(view, u->uid, u->uid, - &seq, &seq); - i_assert(ret == 0); + if (mail_index_lookup_uid_range(view, u->uid, u->uid, &seq, &seq) < 0) + return -1; if (seq == 0) { /* already expunged */ @@ -277,13 +276,11 @@ struct mail_index_record *rec; uint32_t seq; uint16_t offset, size; - int ret; /* FIXME: do data_id mapping conversion */ - ret = mail_index_lookup_uid_range(view, u->uid, u->uid, - &seq, &seq); - i_assert(ret == 0); + if (mail_index_lookup_uid_range(view, u->uid, u->uid, &seq, &seq) < 0) + return -1; if (seq != 0) { offset = view->index->extra_records[hdr->idx].offset;