dovecot-2.2: Compiler error fix due to hash table changes.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/edb1d5babfcd
changeset: 14922:edb1d5babfcd
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Aug 20 08:31:00 2012 +0300
description:
Compiler error fix due to hash table changes.

diffstat:

 src/doveadm/dsync/dsync-mailbox-export.c       |  2 +-
 src/doveadm/dsync/dsync-mailbox-import.c       |  2 +-
 src/doveadm/dsync/dsync-transaction-log-scan.c |  6 +++---
 src/doveadm/dsync/dsync-transaction-log-scan.h |  4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r d3db2ba15d00 -r edb1d5babfcd src/doveadm/dsync/dsync-mailbox-export.c
--- 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;
 
diff -r d3db2ba15d00 -r edb1d5babfcd src/doveadm/dsync/dsync-mailbox-import.c
--- 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;
 }
 
diff -r d3db2ba15d00 -r edb1d5babfcd src/doveadm/dsync/dsync-transaction-log-scan.c
--- 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
diff -r d3db2ba15d00 -r edb1d5babfcd src/doveadm/dsync/dsync-transaction-log-scan.h
--- 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