Mercurial > dovecot > core-2.2
changeset 12293:794f09e5571d
Removed some dead code.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sat, 16 Oct 2010 00:49:35 +0100 |
parents | 84a9dc26108f |
children | b8803a1e2dc2 |
files | src/lib-index/mail-index-sync-ext.c src/lib-mail/istream-header-filter.c src/plugins/acl/acl-backend-vfile.c |
diffstat | 3 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-index/mail-index-sync-ext.c Sat Oct 16 00:43:49 2010 +0100 +++ b/src/lib-index/mail-index-sync-ext.c Sat Oct 16 00:49:35 2010 +0100 @@ -290,7 +290,6 @@ ext->hdr_size = u->hdr_size; modified = TRUE; } - map->hdr_base = map->hdr_copy_buf->data; if (ext->record_align < u->record_align || (ext->record_align > u->record_align && !no_shrink)) { @@ -319,6 +318,8 @@ ext_hdr->record_offset = ext->record_offset; ext_hdr->record_size = ext->record_size; ext_hdr->record_align = ext->record_align; + } else { + i_assert(map->hdr_base == map->hdr_copy_buf->data); } if (new_size != old_size) {
--- a/src/lib-mail/istream-header-filter.c Sat Oct 16 00:43:49 2010 +0100 +++ b/src/lib-mail/istream-header-filter.c Sat Oct 16 00:49:35 2010 +0100 @@ -157,8 +157,9 @@ buffer_set_used_size(mstream->hdr_buf, mstream->istream.pos); if (mstream->header_read) { + i_assert(mstream->istream.skip == 0); highwater_offset = mstream->istream.istream.v_offset + - (mstream->istream.pos - mstream->istream.skip); + mstream->istream.pos; if (highwater_offset >= mstream->header_size.virtual_size) { /* we want to return mixed headers and body */ size_t body_highwater_size = highwater_offset -
--- a/src/plugins/acl/acl-backend-vfile.c Sat Oct 16 00:43:49 2010 +0100 +++ b/src/plugins/acl/acl-backend-vfile.c Sat Oct 16 00:49:35 2010 +0100 @@ -772,7 +772,6 @@ static void acl_backend_vfile_cache_rebuild(struct acl_object_vfile *aclobj) { - struct mail_namespace *ns; struct acl_object *_aclobj = &aclobj->aclobj; struct acl_rights_update ru; enum acl_modify_mode add_mode; @@ -785,8 +784,6 @@ if (!array_is_created(&aclobj->rights)) return; - ns = mailbox_list_get_namespace(_aclobj->backend->list); - /* Rights are sorted by their 1) locals first, globals next, 2) acl_id_type. We'll apply only the rights matching ourself.