dovecot-2.2-pigeonhole: Adjusted to some more changes in Dovecot...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/6ccbfb64bea5
changeset: 1656:6ccbfb64bea5
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Mon Aug 20 09:13:32 2012 +0200
description:
Adjusted to some more changes in Dovecot API.

diffstat:

 src/lib-sieve/plugins/include/ext-include-binary.c     |  4 ++--
 src/lib-sieve/plugins/variables/ext-variables-common.c |  2 +-
 src/lib-sieve/sieve-extensions.c                       |  2 +-
 src/testsuite/testsuite-settings.c                     |  2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r 02f24456eabf -r 6ccbfb64bea5 src/lib-sieve/plugins/include/ext-include-binary.c
--- a/src/lib-sieve/plugins/include/ext-include-binary.c	Mon Aug 20 08:43:55 2012 +0200
+++ b/src/lib-sieve/plugins/include/ext-include-binary.c	Mon Aug 20 09:13:32 2012 +0200
@@ -363,7 +363,7 @@
 
 	/* Release references to all included script objects */
 	hctx = hash_table_iterate_init(binctx->included_scripts);
-	while ( hash_table_iterate_t(hctx, binctx->included_scripts, &script, &incscript) )
+	while ( hash_table_iterate(hctx, binctx->included_scripts, &script, &incscript) )
 		sieve_script_unref(&incscript->script);
 	hash_table_iterate_deinit(&hctx);
 
@@ -391,7 +391,7 @@
 		return FALSE;
 
 	hctx = hash_table_iterate_init(binctx->included_scripts);
-	while ( hash_table_iterate_t(hctx, binctx->included_scripts, &script, &incscript) ) {
+	while ( hash_table_iterate(hctx, binctx->included_scripts, &script, &incscript) ) {
 		unsigned int block_id = sieve_binary_block_get_id(incscript->block);
 
 		sieve_binary_dump_sectionf(denv, "Included %s script '%s' (block: %d)",
diff -r 02f24456eabf -r 6ccbfb64bea5 src/lib-sieve/plugins/variables/ext-variables-common.c
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c	Mon Aug 20 08:43:55 2012 +0200
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c	Mon Aug 20 09:13:32 2012 +0200
@@ -186,7 +186,7 @@
 {
 	const char *key;
 
-	return hash_table_iterate_t
+	return hash_table_iterate
 		(iter->hctx, iter->scope->variables, &key, var_r);
 }
 
diff -r 02f24456eabf -r 6ccbfb64bea5 src/lib-sieve/sieve-extensions.c
--- a/src/lib-sieve/sieve-extensions.c	Mon Aug 20 08:43:55 2012 +0200
+++ b/src/lib-sieve/sieve-extensions.c	Mon Aug 20 09:13:32 2012 +0200
@@ -753,7 +753,7 @@
 	struct sieve_capability_registration *reg;
 
 	hictx = hash_table_iterate_init(ext_reg->capabilities_index);
-	while ( hash_table_iterate_t(hictx, ext_reg->capabilities_index, &name, &reg) ) {
+	while ( hash_table_iterate(hictx, ext_reg->capabilities_index, &name, &reg) ) {
 		if ( reg->ext == ext )
 			hash_table_remove(ext_reg->capabilities_index, name);
 	}
diff -r 02f24456eabf -r 6ccbfb64bea5 src/testsuite/testsuite-settings.c
--- a/src/testsuite/testsuite-settings.c	Mon Aug 20 08:43:55 2012 +0200
+++ b/src/testsuite/testsuite-settings.c	Mon Aug 20 09:13:32 2012 +0200
@@ -35,7 +35,7 @@
 	const char *key;
 	struct testsuite_setting *setting;
 
-	while ( hash_table_iterate_t(itx, settings, &key, &setting) ) {
+	while ( hash_table_iterate(itx, settings, &key, &setting) ) {
 		i_free(setting->identifier);
 		i_free(setting->value);
 		i_free(setting);