Curl_conncache_foreach: allow callback to break loop

... and have it take a proper 'struct connectdata *' as first argument

diff --git a/lib/conncache.c b/lib/conncache.c
index 4bca7ba51a6f9437ded66a907168b834c755d8cb..a3a90f87982dae7cc922c9be7aa706aad6182209 100644 (file)
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -180,10 +180,13 @@ void Curl_conncache_remove_conn(struct conncache *connc,
 
 /* This function iterates the entire connection cache and calls the
    function func() with the connection pointer as the first argument
-   and the supplied 'param' argument as the other */
+   and the supplied 'param' argument as the other,
+
+   Return 0 from func() to continue the loop, return 1 to abort it.
+ */
 void Curl_conncache_foreach(struct conncache *connc,
                             void *param,
-                            void (*func)(void *conn, void *param))
+                            int (*func)(struct connectdata *conn, void *param))
 {
   struct curl_hash_iterator iter;
   struct curl_llist_element *curr;
@@ -208,7 +211,8 @@ void Curl_conncache_foreach(struct conncache *connc,
       conn = curr->ptr;
       curr = curr->next;
 
-      func(conn, param);
+      if(1 == func(conn, param))
+        return;
     }
 
     he = Curl_hash_next_element(&iter);

diff --git a/lib/conncache.h b/lib/conncache.h
index 7b7baae2cc184166f62e94f304844b7e9038de94..03b129d4e9a072e006a6a5f15f8e0a490e133787 100644 (file)
--- a/lib/conncache.h
+++ b/lib/conncache.h
@@ -48,7 +48,8 @@ void Curl_conncache_remove_conn(struct conncache *connc,
 
 void Curl_conncache_foreach(struct conncache *connc,
                             void *param,
-                            void (*func)(void *, void *));
+                            int (*func)(struct connectdata *conn,
+                                        void *param));
 
 struct connectdata *
 Curl_conncache_find_first_connection(struct conncache *connc);