Mercurial > dovecot > core-2.2
changeset 14922:edb1d5babfcd
Compiler error fix due to hash table changes.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 20 Aug 2012 08:31:00 +0300 |
| parents | d3db2ba15d00 |
| children | 96fd2c3bf932 |
| files | src/doveadm/dsync/dsync-mailbox-export.c src/doveadm/dsync/dsync-mailbox-import.c src/doveadm/dsync/dsync-transaction-log-scan.c src/doveadm/dsync/dsync-transaction-log-scan.h |
| diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/dsync/dsync-mailbox-export.c Sun Aug 19 16:17:32 2012 +0300 +++ b/src/doveadm/dsync/dsync-mailbox-export.c Mon Aug 20 08:31:00 2012 +0300 @@ -385,7 +385,7 @@ void *key, *value; struct dsync_mail_change *dup_change; - log_changes = dsync_transaction_log_scan_get_hash(log_scan); + dsync_transaction_log_scan_get_hash(log_scan, &log_changes); if (dsync_transaction_log_scan_has_all_changes(log_scan)) exporter->return_all_mails = TRUE;
--- a/src/doveadm/dsync/dsync-mailbox-import.c Sun Aug 19 16:17:32 2012 +0300 +++ b/src/doveadm/dsync/dsync-mailbox-import.c Mon Aug 20 08:31:00 2012 +0300 @@ -166,7 +166,7 @@ importer->local_initial_highestmodseq = status.highest_modseq; dsync_mailbox_import_search_init(importer); - importer->local_changes = dsync_transaction_log_scan_get_hash(log_scan); + dsync_transaction_log_scan_get_hash(log_scan, &importer->local_changes); return importer; }
--- a/src/doveadm/dsync/dsync-transaction-log-scan.c Sun Aug 19 16:17:32 2012 +0300 +++ b/src/doveadm/dsync/dsync-transaction-log-scan.c Mon Aug 20 08:31:00 2012 +0300 @@ -406,10 +406,10 @@ return 0; } -HASH_TABLE_TYPE(dsync_uid_mail_change) -dsync_transaction_log_scan_get_hash(struct dsync_transaction_log_scan *scan) +void dsync_transaction_log_scan_get_hash(struct dsync_transaction_log_scan *scan, + HASH_TABLE_TYPE(dsync_uid_mail_change) *hash_r) { - return scan->changes; + hash_r->_table = scan->changes._table; } bool
--- a/src/doveadm/dsync/dsync-transaction-log-scan.h Sun Aug 19 16:17:32 2012 +0300 +++ b/src/doveadm/dsync/dsync-transaction-log-scan.h Mon Aug 20 08:31:00 2012 +0300 @@ -11,8 +11,8 @@ uint32_t highest_wanted_uid, uint64_t modseq, struct dsync_transaction_log_scan **scan_r); -HASH_TABLE_TYPE(dsync_uid_mail_change) -dsync_transaction_log_scan_get_hash(struct dsync_transaction_log_scan *scan); +void dsync_transaction_log_scan_get_hash(struct dsync_transaction_log_scan *scan, + HASH_TABLE_TYPE(dsync_uid_mail_change) *hash_r); /* Returns TRUE if the entire transaction log was scanned */ bool dsync_transaction_log_scan_has_all_changes(struct dsync_transaction_log_scan *scan); /* If the given UID has been expunged after the initial log scan, create/update