[dovecot-cvs] dovecot/src/login-common ssl-proxy-gnutls.c,1.7,1.8 ssl-proxy-openssl.c,1.17,1.18

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/login-common
In directory danu:/tmp/cvs-serv14047/login-common

Modified Files:
	ssl-proxy-gnutls.c ssl-proxy-openssl.c 
Log Message:
Changed hash_foreach() to iterator.



Index: ssl-proxy-gnutls.c
===================================================================
RCS file: /home/cvs/dovecot/src/login-common/ssl-proxy-gnutls.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ssl-proxy-gnutls.c	11 Jun 2003 23:26:13 -0000	1.7
+++ ssl-proxy-gnutls.c	3 Dec 2003 00:40:21 -0000	1.8
@@ -527,18 +527,18 @@
 	ssl_initialized = TRUE;
 }
 
-static void ssl_proxy_destroy_hash(void *key __attr_unused__, void *value,
-				   void *context __attr_unused__)
-{
-	ssl_proxy_destroy(value);
-}
-
 void ssl_proxy_deinit(void)
 {
+	struct hash_iterate_context *iter;
+	void *key, *value;
+
 	if (!ssl_initialized)
 		return;
 
-	hash_foreach(ssl_proxies, ssl_proxy_destroy_hash, NULL);
+	iter = hash_iterate_init(ssl_proxies);
+	while (hash_iterate(iter, &key, &value))
+		ssl_proxy_destroy(value);
+	hash_iterate_deinit(iter);
 	hash_destroy(ssl_proxies);
 
 	gnutls_certificate_free_cred(x509_cred);

Index: ssl-proxy-openssl.c
===================================================================
RCS file: /home/cvs/dovecot/src/login-common/ssl-proxy-openssl.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ssl-proxy-openssl.c	18 Jun 2003 01:12:32 -0000	1.17
+++ ssl-proxy-openssl.c	3 Dec 2003 00:40:21 -0000	1.18
@@ -451,18 +451,18 @@
 	ssl_initialized = TRUE;
 }
 
-static void ssl_proxy_destroy_hash(void *key __attr_unused__, void *value,
-				   void *context __attr_unused__)
-{
-	ssl_proxy_unref(value);
-}
-
 void ssl_proxy_deinit(void)
 {
+	struct hash_iterate_context *iter;
+	void *key, *value;
+
 	if (!ssl_initialized)
 		return;
 
-	hash_foreach(ssl_proxies, ssl_proxy_destroy_hash, NULL);
+	iter = hash_iterate_init(ssl_proxies);
+	while (hash_iterate(iter, &key, &value))
+		ssl_proxy_destroy(value);
+	hash_iterate_deinit(iter);
 	hash_destroy(ssl_proxies);
 
 	SSL_CTX_free(ssl_ctx);