[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-mail.c, 1.7,
1.8 mbox-sync.c, 1.40, 1.41
cras at procontrol.fi
cras at procontrol.fi
Sun Jun 20 07:18:14 EEST 2004
Update of /home/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv2089/lib-storage/index/mbox
Modified Files:
mbox-mail.c mbox-sync.c
Log Message:
Expunge fixes
Index: mbox-mail.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/mbox/mbox-mail.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mbox-mail.c 20 Jun 2004 03:25:34 -0000 1.7
+++ mbox-mail.c 20 Jun 2004 04:18:12 -0000 1.8
@@ -17,6 +17,7 @@
struct index_mailbox *ibox = mail->ibox;
const void *data;
uint64_t offset;
+ int ret;
if (ibox->mbox_lock_type == F_UNLCK) {
if (mbox_sync(ibox, FALSE, FALSE, TRUE) < 0)
@@ -29,9 +30,11 @@
if (mbox_file_open_stream(ibox) < 0)
return -1;
- if (mail_index_lookup_extra(ibox->view, mail->mail.seq,
- ibox->mbox_extra_idx, &data) < 0) {
- mail_storage_set_index_error(ibox);
+ ret = mail_index_lookup_extra(ibox->view, mail->mail.seq,
+ ibox->mbox_extra_idx, &data);
+ if (ret <= 0) {
+ if (ret < 0)
+ mail_storage_set_index_error(ibox);
return -1;
}
Index: mbox-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- mbox-sync.c 20 Jun 2004 03:25:34 -0000 1.40
+++ mbox-sync.c 20 Jun 2004 04:18:12 -0000 1.41
@@ -377,10 +377,9 @@
if (offset == mail->from_offset)
return 0;
- } else {
- offset = mail->from_offset;
}
+ offset = mail->from_offset;
mail_index_update_extra_rec(sync_ctx->t, sync_ctx->idx_seq,
sync_ctx->ibox->mbox_extra_idx, &offset);
return 0;
More information about the dovecot-cvs
mailing list