Mercurial > dovecot > original-hg > dovecot-1.2
changeset 2410:c7c886199f28 HEAD
Small cleanups.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 31 Jul 2004 07:35:06 +0300 |
| parents | 9183098d7fdf |
| children | c8fa857c4e08 |
| files | src/lib-index/mail-index-sync-update.c src/lib-index/mail-transaction-log-view.c src/lib-index/mail-transaction-log.c src/lib-index/mail-transaction-log.h src/lib-index/mail-transaction-util.c |
| diffstat | 5 files changed, 15 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-index/mail-index-sync-update.c Sat Jul 31 07:14:01 2004 +0300 +++ b/src/lib-index/mail-index-sync-update.c Sat Jul 31 07:35:06 2004 +0300 @@ -262,7 +262,7 @@ void *data; data = PTR_OFFSET(&ctx->view->map->hdr_copy, u->offset); - memcpy(data, u->data, u->size); + memcpy(data, u + 1, u->size); return 1; } @@ -283,11 +283,11 @@ return -1; if (seq != 0) { - offset = view->index->extra_records[hdr->idx].offset; - size = view->index->extra_records[hdr->idx].size; + offset = view->index->extra_records[hdr->data_id].offset; + size = view->index->extra_records[hdr->data_id].size; rec = MAIL_INDEX_MAP_IDX(view->map, seq-1); - memcpy(PTR_OFFSET(rec, offset), u->data, size); + memcpy(PTR_OFFSET(rec, offset), u + 1, size); } return 1; }
--- a/src/lib-index/mail-transaction-log-view.c Sat Jul 31 07:14:01 2004 +0300 +++ b/src/lib-index/mail-transaction-log-view.c Sat Jul 31 07:35:06 2004 +0300 @@ -311,10 +311,10 @@ } else if (hdr->type == MAIL_TRANSACTION_EXTRA_REC_UPDATE) { const struct mail_transaction_extra_rec_header *ehdr = data; - if (ehdr->idx >= view->log->index->extra_records_count) { + if (ehdr->data_id >= view->log->index->extra_records_count) { mail_transaction_log_file_set_corrupted(file, "extra record update out of range (%u > %u)", - ehdr->idx, + ehdr->data_id, view->log->index->extra_records_count); return -1; }
--- a/src/lib-index/mail-transaction-log.c Sat Jul 31 07:14:01 2004 +0300 +++ b/src/lib-index/mail-transaction-log.c Sat Jul 31 07:35:06 2004 +0300 @@ -1218,7 +1218,7 @@ continue; /* FIXME: do data_id mapping conversion */ - extra_rec_hdr.idx = i; + extra_rec_hdr.data_id = i; ret = log_append_buffer(file, t->extra_rec_updates[i], hdr_buf, MAIL_TRANSACTION_EXTRA_REC_UPDATE, view->external);
--- a/src/lib-index/mail-transaction-log.h Sat Jul 31 07:14:01 2004 +0300 +++ b/src/lib-index/mail-transaction-log.h Sat Jul 31 07:35:06 2004 +0300 @@ -62,16 +62,16 @@ struct mail_transaction_header_update { uint16_t offset; uint16_t size; - unsigned char data[1]; /* variable size */ + /* unsigned char data[]; */ }; struct mail_transaction_extra_rec_header { - uint32_t idx; + uint32_t data_id; }; struct mail_transaction_extra_rec_update { uint32_t uid; - unsigned char data[1]; /* variable size */ + /* unsigned char data[]; */ }; struct mail_transaction_append_header {
--- a/src/lib-index/mail-transaction-util.c Sat Jul 31 07:14:01 2004 +0300 +++ b/src/lib-index/mail-transaction-util.c Sat Jul 31 07:35:06 2004 +0300 @@ -143,22 +143,21 @@ if (ret <= 0) break; - i += sizeof(uint16_t)*2 + rec->size; + i += sizeof(*rec) + rec->size; } break; } case MAIL_TRANSACTION_EXTRA_REC_UPDATE: { - const struct mail_transaction_extra_rec_header *ehdr; + const struct mail_transaction_extra_rec_header *ehdr = data; const struct mail_transaction_extra_rec_update *rec, *end; unsigned int record_size; if (map->extra_rec_update == NULL) break; - ehdr = data; - i_assert(ehdr->idx < index->extra_records_count); - record_size = sizeof(uint32_t) + - index->extra_records[ehdr->idx].size; + i_assert(ehdr->data_id < index->extra_records_count); + record_size = sizeof(*ehdr) + + index->extra_records[ehdr->data_id].size; rec = CONST_PTR_OFFSET(data, sizeof(*ehdr)); end = CONST_PTR_OFFSET(data, hdr->size);