43 files changed, 177 insertions, 177 deletions

diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c
index 1a466dd7..c2dcf300 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -45,12 +45,12 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   struct MHD_Response *response;
   enum MHD_Result ret;
   (void) cls; (void) url; (void) method; (void) version;             /* Unused. Silent compiler warning. */
-  (void) upload_data; (void) upload_data_size; (void) unused;        /* Unused. Silent compiler warning. */
+  (void) upload_data; (void) upload_data_size; (void) req_cls;       /* Unused. Silent compiler warning. */
 
   response = MHD_create_response_from_buffer (0, NULL,
                                               MHD_RESPMEM_PERSISTENT);
diff --git a/src/testcurl/https/test_https_get.c b/src/testcurl/https/test_https_get.c
index 503191e0..968a0b96 100644
--- a/src/testcurl/https/test_https_get.c
+++ b/src/testcurl/https/test_https_get.c
@@ -99,7 +99,7 @@ ahc_empty (void *cls,
            const char *version,
            const char *upload_data,
            size_t *upload_data_size,
-           void **unused)
+           void **req_cls)
 {
   static int ptr;
   struct MHD_Response *response;
@@ -114,12 +114,12 @@ ahc_empty (void *cls,
   if (0 != strcmp ("GET",
                    method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   response = MHD_create_response_from_buffer (0,
                                               NULL,
                                               MHD_RESPMEM_PERSISTENT);
diff --git a/src/testcurl/https/test_https_get_iovec.c b/src/testcurl/https/test_https_get_iovec.c
index 615ef340..3bdb610f 100644
--- a/src/testcurl/https/test_https_get_iovec.c
+++ b/src/testcurl/https/test_https_get_iovec.c
@@ -91,7 +91,7 @@ iovec_ahc (void *cls,
            const char *version,
            const char *upload_data,
            size_t *upload_data_size,
-           void **ptr)
+           void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -105,13 +105,13 @@ iovec_ahc (void *cls,
 
   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
 
   /* Create some test data. */
   if (NULL == (data = malloc (TESTSTR_SIZE)))
@@ -248,7 +248,7 @@ ahc_empty (void *cls,
            const char *version,
            const char *upload_data,
            size_t *upload_data_size,
-           void **unused)
+           void **req_cls)
 {
   static int ptr;
   struct MHD_Response *response;
@@ -264,12 +264,12 @@ ahc_empty (void *cls,
   if (0 != strcmp ("GET",
                    method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
 
   iov.iov_base = NULL;
   iov.iov_len = 0;
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c
index 5c04aaab..65570aab 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -46,7 +46,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -56,12 +56,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   response = MHD_create_response_from_buffer (strlen (url),
                                               (void *) url,
                                               MHD_RESPMEM_MUST_COPY);
diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c
index 3a49ce60..e428e278 100644
--- a/src/testcurl/https/test_https_session_info.c
+++ b/src/testcurl/https/test_https_session_info.c
@@ -47,7 +47,7 @@ static enum MHD_Result
 query_session_ahc (void *cls, struct MHD_Connection *connection,
                    const char *url, const char *method,
                    const char *version, const char *upload_data,
-                   size_t *upload_data_size, void **ptr)
+                   size_t *upload_data_size, void **req_cls)
 {
   struct MHD_Response *response;
   enum MHD_Result ret;
@@ -55,9 +55,9 @@ query_session_ahc (void *cls, struct MHD_Connection *connection,
   (void) cls; (void) url; (void) method; (void) version;   /* Unused. Silent compiler warning. */
   (void) upload_data; (void) upload_data_size;             /* Unused. Silent compiler warning. */
 
-  if (NULL == *ptr)
+  if (NULL == *req_cls)
   {
-    *ptr = (void *) &query_session_ahc;
+    *req_cls = (void *) &query_session_ahc;
     return MHD_YES;
   }
 
diff --git a/src/testcurl/https/tls_test_common.c b/src/testcurl/https/tls_test_common.c
index 9cce3d94..606ac7a3 100644
--- a/src/testcurl/https/tls_test_common.c
+++ b/src/testcurl/https/tls_test_common.c
@@ -207,7 +207,7 @@ http_ahc (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **ptr)
+          void **req_cls)
 {
   static int aptr;
   struct MHD_Response *response;
@@ -217,13 +217,13 @@ http_ahc (void *cls,
 
   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
-  *ptr = NULL;                  /* reset when done */
+  *req_cls = NULL;                  /* reset when done */
   response = MHD_create_response_from_buffer (strlen (test_data),
                                               (void *) test_data,
                                               MHD_RESPMEM_PERSISTENT);
@@ -242,7 +242,7 @@ http_dummy_ahc (void *cls,
                 const char *version,
                 const char *upload_data,
                 size_t *upload_data_size,
-                void **ptr)
+                void **req_cls)
 {
   (void) cls;
   (void) connection;
@@ -251,7 +251,7 @@ http_dummy_ahc (void *cls,
   (void) version;      /* Unused. Silent compiler warning. */
   (void) upload_data;
   (void) upload_data_size;
-  (void) ptr;                   /* Unused. Silent compiler warning. */
+  (void) req_cls;                   /* Unused. Silent compiler warning. */
   return 0;
 }
 
diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h
index a9af504d..b6a11172 100644
--- a/src/testcurl/https/tls_test_common.h
+++ b/src/testcurl/https/tls_test_common.h
@@ -106,13 +106,13 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx);
 enum MHD_Result
 http_ahc (void *cls, struct MHD_Connection *connection,
           const char *url, const char *method, const char *upload_data,
-          const char *version, size_t *upload_data_size, void **ptr);
+          const char *version, size_t *upload_data_size, void **req_cls);
 
 enum MHD_Result
 http_dummy_ahc (void *cls, struct MHD_Connection *connection,
                 const char *url, const char *method, const char *upload_data,
                 const char *version, size_t *upload_data_size,
-                void **ptr);
+                void **req_cls);
 
 
 /**
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c
index 9a7e3e08..3ee1c388 100644
--- a/src/testcurl/perf_get.c
+++ b/src/testcurl/perf_get.c
@@ -168,7 +168,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -178,12 +178,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
   if (ret == MHD_NO)
     abort ();
diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c
index 7427ef42..ea282874 100644
--- a/src/testcurl/perf_get_concurrent.c
+++ b/src/testcurl/perf_get_concurrent.c
@@ -159,7 +159,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -169,12 +169,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
   if (ret == MHD_NO)
     abort ();
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c
index 746ecbaf..811bfba4 100644
--- a/src/testcurl/test_add_conn.c
+++ b/src/testcurl/test_add_conn.c
@@ -148,7 +148,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -161,12 +161,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   v = MHD_lookup_connection_value (connection,
                                    MHD_GET_ARGUMENT_KIND,
                                    "a");
diff --git a/src/testcurl/test_callback.c b/src/testcurl/test_callback.c
index 8290851c..8b23ed02 100644
--- a/src/testcurl/test_callback.c
+++ b/src/testcurl/test_callback.c
@@ -69,7 +69,7 @@ callback (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **con_cls)
+          void **req_cls)
 {
   struct callback_closure *cbc = calloc (1, sizeof(struct callback_closure));
   struct MHD_Response *r;
@@ -81,7 +81,7 @@ callback (void *cls,
   (void) version;
   (void) upload_data; /* Unused. Silent compiler warning. */
   (void) upload_data_size;
-  (void) con_cls;         /* Unused. Silent compiler warning. */
+  (void) req_cls;         /* Unused. Silent compiler warning. */
 
   if (NULL == cbc)
     return MHD_NO;
diff --git a/src/testcurl/test_concurrent_stop.c b/src/testcurl/test_concurrent_stop.c
index ee41ef94..306b2b5b 100644
--- a/src/testcurl/test_concurrent_stop.c
+++ b/src/testcurl/test_concurrent_stop.c
@@ -143,7 +143,7 @@ ahc_echo (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **usr_data)
+          void **req_cls)
 {
   static int marker;
   const char *me = cls;
@@ -153,12 +153,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&marker != *usr_data)
+  if (&marker != *req_cls)
   {
-    *usr_data = ▮
+    *req_cls = ▮
     return MHD_YES;
   }
-  *usr_data = NULL;
+  *req_cls = NULL;
   ret = MHD_queue_response (connection,
                             MHD_HTTP_OK,
                             response);
diff --git a/src/testcurl/test_delete.c b/src/testcurl/test_delete.c
index 43bd2840..f0e89395 100644
--- a/src/testcurl/test_delete.c
+++ b/src/testcurl/test_delete.c
@@ -90,12 +90,12 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   int *done = cls;
   struct MHD_Response *response;
   enum MHD_Result ret;
-  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
+  (void) version; (void) req_cls;   /* Unused. Silent compiler warning. */
 
   if (0 != strcmp ("DELETE", method))
     return MHD_NO;              /* unexpected method */
diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c
index 3b2f2501..13c9c826 100644
--- a/src/testcurl/test_digestauth.c
+++ b/src/testcurl/test_digestauth.c
@@ -86,7 +86,7 @@ ahc_echo (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   struct MHD_Response *response;
   char *username;
@@ -96,7 +96,7 @@ ahc_echo (void *cls,
   int ret_i;
   (void) cls; (void) url;                         /* Unused. Silent compiler warning. */
   (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
-  (void) upload_data_size; (void) unused;         /* Unused. Silent compiler warning. */
+  (void) upload_data_size; (void) req_cls;        /* Unused. Silent compiler warning. */
 
   username = MHD_digest_auth_get_username (connection);
   if ( (username == NULL) ||
diff --git a/src/testcurl/test_digestauth_sha256.c b/src/testcurl/test_digestauth_sha256.c
index a720c69b..7f8ebcd5 100644
--- a/src/testcurl/test_digestauth_sha256.c
+++ b/src/testcurl/test_digestauth_sha256.c
@@ -87,7 +87,7 @@ ahc_echo (void *cls,
           const char *version,
           const char *upload_data,
           size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   struct MHD_Response *response;
   char *username;
@@ -97,7 +97,7 @@ ahc_echo (void *cls,
   int ret_i;
   (void) cls; (void) url;                         /* Unused. Silent compiler warning. */
   (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
-  (void) upload_data_size; (void) unused;         /* Unused. Silent compiler warning. */
+  (void) upload_data_size; (void) req_cls;        /* Unused. Silent compiler warning. */
 
   username = MHD_digest_auth_get_username (connection);
   if ( (username == NULL) ||
diff --git a/src/testcurl/test_digestauth_with_arguments.c b/src/testcurl/test_digestauth_with_arguments.c
index 523c9552..ce4b8970 100644
--- a/src/testcurl/test_digestauth_with_arguments.c
+++ b/src/testcurl/test_digestauth_with_arguments.c
@@ -80,7 +80,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   struct MHD_Response *response;
   char *username;
@@ -90,7 +90,7 @@ ahc_echo (void *cls,
   int ret_i;
   (void) cls; (void) url;                         /* Unused. Silent compiler warning. */
   (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
-  (void) upload_data_size; (void) unused;         /* Unused. Silent compiler warning. */
+  (void) upload_data_size; (void) req_cls;        /* Unused. Silent compiler warning. */
 
   username = MHD_digest_auth_get_username (connection);
   if ( (username == NULL) ||
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c
index 58febf7a..a60c0797 100644
--- a/src/testcurl/test_get.c
+++ b/src/testcurl/test_get.c
@@ -107,7 +107,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -120,12 +120,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   v = MHD_lookup_connection_value (connection,
                                    MHD_GET_ARGUMENT_KIND,
                                    "a");
@@ -745,7 +745,7 @@ ahc_empty (void *cls,
            const char *version,
            const char *upload_data,
            size_t *upload_data_size,
-           void **unused)
+           void **req_cls)
 {
   static int ptr;
   struct MHD_Response *response;
@@ -759,12 +759,12 @@ ahc_empty (void *cls,
 
   if (0 != strcmp ("GET", method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   response = MHD_create_response_from_buffer (0,
                                               NULL,
                                               MHD_RESPMEM_PERSISTENT);
diff --git a/src/testcurl/test_get_chunked.c b/src/testcurl/test_get_chunked.c
index 5a19a24e..876016cc 100644
--- a/src/testcurl/test_get_chunked.c
+++ b/src/testcurl/test_get_chunked.c
@@ -180,7 +180,7 @@ ahc_echo (void *cls,
           const char *url,
           const char *method,
           const char *version,
-          const char *upload_data, size_t *upload_data_size, void **ptr)
+          const char *upload_data, size_t *upload_data_size, void **req_cls)
 {
   static int aptr;
   const char *me = cls;
@@ -194,10 +194,10 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&aptr != *ptr)
+  if (&aptr != *req_cls)
   {
     /* do never respond on first call */
-    *ptr = &aptr;
+    *req_cls = &aptr;
     return MHD_YES;
   }
   if (! resp_string)
diff --git a/src/testcurl/test_get_close_keep_alive.c b/src/testcurl/test_get_close_keep_alive.c
index 2fca0ce3..1cb46e68 100644
--- a/src/testcurl/test_get_close_keep_alive.c
+++ b/src/testcurl/test_get_close_keep_alive.c
@@ -312,7 +312,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -324,12 +324,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   if (slow_reply)
     usleep (200000);
 
diff --git a/src/testcurl/test_get_empty.c b/src/testcurl/test_get_empty.c
index 5ed71ab9..fdbb2d42 100644
--- a/src/testcurl/test_get_empty.c
+++ b/src/testcurl/test_get_empty.c
@@ -107,7 +107,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -119,12 +119,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   response = MHD_create_response_from_buffer (0,
                                               NULL,
                                               MHD_RESPMEM_PERSISTENT);
@@ -703,7 +703,7 @@ ahc_empty (void *cls,
            const char *method,
            const char *version,
            const char *upload_data, size_t *upload_data_size,
-           void **unused)
+           void **req_cls)
 {
   static int ptr;
   struct MHD_Response *response;
@@ -717,12 +717,12 @@ ahc_empty (void *cls,
 
   if (0 != strcmp ("GET", method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   response = MHD_create_response_from_buffer (0,
                                               NULL,
                                               MHD_RESPMEM_PERSISTENT);
diff --git a/src/testcurl/test_get_iovec.c b/src/testcurl/test_get_iovec.c
index ae30f6d6..bcb610dc 100644
--- a/src/testcurl/test_get_iovec.c
+++ b/src/testcurl/test_get_iovec.c
@@ -132,7 +132,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -146,12 +146,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
 
   /* Create some test data. */
   if (NULL == (data = malloc (TESTSTR_SIZE)))
@@ -188,7 +188,7 @@ ncont_echo (void *cls,
             const char *method,
             const char *version,
             const char *upload_data, size_t *upload_data_size,
-            void **unused)
+            void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -202,12 +202,12 @@ ncont_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
 
   if (NULL == (iov = malloc (sizeof(struct MHD_IoVec) * TESTSTR_IOVCNT)))
     return MHD_NO;
diff --git a/src/testcurl/test_get_response_cleanup.c b/src/testcurl/test_get_response_cleanup.c
index efec5144..ededc88b 100644
--- a/src/testcurl/test_get_response_cleanup.c
+++ b/src/testcurl/test_get_response_cleanup.c
@@ -122,7 +122,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -134,12 +134,12 @@ ahc_echo (void *cls,
   // fprintf (stderr, "In CB: %s!\n", method);
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
                                                 32 * 1024,
                                                 &push_callback,
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c
index 84929d81..4ca57e23 100644
--- a/src/testcurl/test_get_sendfile.c
+++ b/src/testcurl/test_get_sendfile.c
@@ -84,7 +84,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -96,12 +96,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   fd = open (sourcefile, O_RDONLY);
   if (fd == -1)
   {
diff --git a/src/testcurl/test_get_wait.c b/src/testcurl/test_get_wait.c
index 40fcaf6d..708c82bd 100644
--- a/src/testcurl/test_get_wait.c
+++ b/src/testcurl/test_get_wait.c
@@ -86,7 +86,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -96,12 +96,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
   if (ret == MHD_NO)
     abort ();
diff --git a/src/testcurl/test_iplimit.c b/src/testcurl/test_iplimit.c
index 09fe7773..509e3955 100644
--- a/src/testcurl/test_iplimit.c
+++ b/src/testcurl/test_iplimit.c
@@ -82,7 +82,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -92,12 +92,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   response = MHD_create_response_from_buffer (strlen (url),
                                               (void *) url,
                                               MHD_RESPMEM_MUST_COPY);
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c
index b00d0e1a..161e0f0b 100644
--- a/src/testcurl/test_large_put.c
+++ b/src/testcurl/test_large_put.c
@@ -233,7 +233,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **pparam)
+          void **req_cls)
 {
   int *done = cls;
   struct MHD_Response *response;
@@ -259,13 +259,13 @@ ahc_echo (void *cls,
   if ((*done) == 0)
   {
     size_t *pproc;
-    if (NULL == *pparam)
+    if (NULL == *req_cls)
     {
       processed = 0;
       /* Safe as long as only one parallel request served. */
-      *pparam = &processed;
+      *req_cls = &processed;
     }
-    pproc = (size_t *) *pparam;
+    pproc = (size_t *) *req_cls;
 
     if (0 == *upload_data_size)
       return MHD_YES;   /* No data to process. */
diff --git a/src/testcurl/test_long_header.c b/src/testcurl/test_long_header.c
index b76ea90d..329c3955 100644
--- a/src/testcurl/test_long_header.c
+++ b/src/testcurl/test_long_header.c
@@ -78,13 +78,13 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   const char *me = cls;
   struct MHD_Response *response;
   enum MHD_Result ret;
   (void) version; (void) upload_data;      /* Unused. Silent compiler warning. */
-  (void) upload_data_size; (void) unused;  /* Unused. Silent compiler warning. */
+  (void) upload_data_size; (void) req_cls; /* Unused. Silent compiler warning. */
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
diff --git a/src/testcurl/test_parse_cookies.c b/src/testcurl/test_parse_cookies.c
index 07c67567..0fc5ffc1 100644
--- a/src/testcurl/test_parse_cookies.c
+++ b/src/testcurl/test_parse_cookies.c
@@ -68,7 +68,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -79,12 +79,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
 
   hdr = MHD_lookup_connection_value (connection, MHD_COOKIE_KIND, "name1");
   if ((hdr == NULL) || (0 != strcmp (hdr, "var1")))
diff --git a/src/testcurl/test_patch.c b/src/testcurl/test_patch.c
index f443ad08..100242a5 100644
--- a/src/testcurl/test_patch.c
+++ b/src/testcurl/test_patch.c
@@ -90,12 +90,12 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   int *done = cls;
   struct MHD_Response *response;
   enum MHD_Result ret;
-  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
+  (void) version; (void) req_cls;   /* Unused. Silent compiler warning. */
 
   if (0 != strcmp ("PATCH", method))
     return MHD_NO;              /* unexpected method */
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c
index 1bf9be70..90b8f48a 100644
--- a/src/testcurl/test_post.c
+++ b/src/testcurl/test_post.c
@@ -69,15 +69,15 @@ struct CBC
 static void
 completed_cb (void *cls,
               struct MHD_Connection *connection,
-              void **con_cls,
+              void **req_cls,
               enum MHD_RequestTerminationCode toe)
 {
-  struct MHD_PostProcessor *pp = *con_cls;
+  struct MHD_PostProcessor *pp = *req_cls;
   (void) cls; (void) connection; (void) toe; /* Unused. Silent compiler warning. */
 
   if (NULL != pp)
     MHD_destroy_post_processor (pp);
-  *con_cls = NULL;
+  *req_cls = NULL;
 }
 
 
@@ -129,7 +129,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int eok;
   struct MHD_Response *response;
@@ -142,12 +142,12 @@ ahc_echo (void *cls,
     printf ("METHOD: %s\n", method);
     return MHD_NO;              /* unexpected method */
   }
-  pp = *unused;
+  pp = *req_cls;
   if (pp == NULL)
   {
     eok = 0;
     pp = MHD_create_post_processor (connection, 1024, &post_iterator, &eok);
-    *unused = pp;
+    *req_cls = pp;
   }
   MHD_post_process (pp, upload_data, *upload_data_size);
   if ((eok == 3) && (0 == *upload_data_size))
@@ -158,7 +158,7 @@ ahc_echo (void *cls,
     ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
     MHD_destroy_response (response);
     MHD_destroy_post_processor (pp);
-    *unused = NULL;
+    *req_cls = NULL;
     return ret;
   }
   *upload_data_size = 0;
@@ -592,7 +592,7 @@ ahc_cancel (void *cls,
             const char *method,
             const char *version,
             const char *upload_data, size_t *upload_data_size,
-            void **unused)
+            void **req_cls)
 {
   struct MHD_Response *response;
   enum MHD_Result ret;
@@ -606,9 +606,9 @@ ahc_cancel (void *cls,
     return MHD_NO;
   }
 
-  if (*unused == NULL)
+  if (*req_cls == NULL)
   {
-    *unused = "wibble";
+    *req_cls = "wibble";
     /* We don't want the body. Send a 500. */
     response = MHD_create_response_from_buffer (0, NULL,
                                                 MHD_RESPMEM_PERSISTENT);
diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c
index ec929904..c36fba7f 100644
--- a/src/testcurl/test_post_loop.c
+++ b/src/testcurl/test_post_loop.c
@@ -86,7 +86,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **mptr)
+          void **req_cls)
 {
   static int marker;
   struct MHD_Response *response;
@@ -99,21 +99,21 @@ ahc_echo (void *cls,
     printf ("METHOD: %s\n", method);
     return MHD_NO;              /* unexpected method */
   }
-  if ((*mptr != NULL) && (0 == *upload_data_size))
+  if ((*req_cls != NULL) && (0 == *upload_data_size))
   {
-    if (*mptr != &marker)
+    if (*req_cls != &marker)
       abort ();
     response = MHD_create_response_from_buffer (2, "OK",
                                                 MHD_RESPMEM_PERSISTENT);
     ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
     MHD_destroy_response (response);
-    *mptr = NULL;
+    *req_cls = NULL;
     return ret;
   }
   if (strlen (POST_DATA) != *upload_data_size)
     return MHD_YES;
   *upload_data_size = 0;
-  *mptr = ▮
+  *req_cls = ▮
   return MHD_YES;
 }
 
diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c
index 1f60fb06..87febcbc 100644
--- a/src/testcurl/test_postform.c
+++ b/src/testcurl/test_postform.c
@@ -65,15 +65,15 @@ struct CBC
 static void
 completed_cb (void *cls,
               struct MHD_Connection *connection,
-              void **con_cls,
+              void **req_cls,
               enum MHD_RequestTerminationCode toe)
 {
-  struct MHD_PostProcessor *pp = *con_cls;
+  struct MHD_PostProcessor *pp = *req_cls;
   (void) cls; (void) connection; (void) toe;            /* Unused. Silent compiler warning. */
 
   if (NULL != pp)
     MHD_destroy_post_processor (pp);
-  *con_cls = NULL;
+  *req_cls = NULL;
 }
 
 
@@ -128,7 +128,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int eok;
   struct MHD_Response *response;
@@ -141,14 +141,14 @@ ahc_echo (void *cls,
     printf ("METHOD: %s\n", method);
     return MHD_NO;              /* unexpected method */
   }
-  pp = *unused;
+  pp = *req_cls;
   if (pp == NULL)
   {
     eok = 0;
     pp = MHD_create_post_processor (connection, 1024, &post_iterator, &eok);
     if (pp == NULL)
       abort ();
-    *unused = pp;
+    *req_cls = pp;
   }
   MHD_post_process (pp, upload_data, *upload_data_size);
   if ((eok == 3) && (0 == *upload_data_size))
@@ -159,7 +159,7 @@ ahc_echo (void *cls,
     ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
     MHD_destroy_response (response);
     MHD_destroy_post_processor (pp);
-    *unused = NULL;
+    *req_cls = NULL;
     return ret;
   }
   *upload_data_size = 0;
diff --git a/src/testcurl/test_process_arguments.c b/src/testcurl/test_process_arguments.c
index aaf9681e..24d5e72f 100644
--- a/src/testcurl/test_process_arguments.c
+++ b/src/testcurl/test_process_arguments.c
@@ -69,7 +69,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -80,12 +80,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   hdr = MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, "k");
   if ((hdr == NULL) || (0 != strcmp (hdr, "v x")))
     abort ();
diff --git a/src/testcurl/test_process_headers.c b/src/testcurl/test_process_headers.c
index 9a84b3ef..98b08fbc 100644
--- a/src/testcurl/test_process_headers.c
+++ b/src/testcurl/test_process_headers.c
@@ -89,7 +89,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -100,12 +100,12 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   ret = 0;
   MHD_get_connection_values (connection, MHD_HEADER_KIND, &kv_cb, &ret);
   if (ret != 1)
diff --git a/src/testcurl/test_put.c b/src/testcurl/test_put.c
index f572a9a8..761e1c5f 100644
--- a/src/testcurl/test_put.c
+++ b/src/testcurl/test_put.c
@@ -90,12 +90,12 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   int *done = cls;
   struct MHD_Response *response;
   enum MHD_Result ret;
-  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
+  (void) version; (void) req_cls;   /* Unused. Silent compiler warning. */
 
   if (0 != strcmp ("PUT", method))
     return MHD_NO;              /* unexpected method */
diff --git a/src/testcurl/test_put_chunked.c b/src/testcurl/test_put_chunked.c
index 897f52b1..5820f2e0 100644
--- a/src/testcurl/test_put_chunked.c
+++ b/src/testcurl/test_put_chunked.c
@@ -90,13 +90,13 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   int *done = cls;
   struct MHD_Response *response;
   enum MHD_Result ret;
   int have;
-  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
+  (void) version; (void) req_cls;   /* Unused. Silent compiler warning. */
 
   if (0 != strcmp ("PUT", method))
     return MHD_NO;              /* unexpected method */
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c
index 8b350237..1e0eb0c4 100644
--- a/src/testcurl/test_quiesce.c
+++ b/src/testcurl/test_quiesce.c
@@ -193,7 +193,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -205,12 +205,12 @@ ahc_echo (void *cls,
     fprintf (stderr, "Unexpected HTTP method '%s'. ", method);
     externalErrorExit ();
   }
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *unused = NULL;
+  *req_cls = NULL;
   response = MHD_create_response_from_buffer (strlen (url),
                                               (void *) url,
                                               MHD_RESPMEM_MUST_COPY);
@@ -229,10 +229,10 @@ ahc_echo (void *cls,
 
 static void
 request_completed (void *cls, struct MHD_Connection *connection,
-                   void **con_cls, enum MHD_RequestTerminationCode code)
+                   void **req_cls, enum MHD_RequestTerminationCode code)
 {
   int *done = (int *) cls;
-  (void) connection; (void) con_cls; (void) code;    /* Unused. Silent compiler warning. */
+  (void) connection; (void) req_cls; (void) code;    /* Unused. Silent compiler warning. */
   if (MHD_REQUEST_TERMINATED_COMPLETED_OK != code)
   {
     fprintf (stderr, "Unexpected termination code: %d. ", (int) code);
diff --git a/src/testcurl/test_quiesce_stream.c b/src/testcurl/test_quiesce_stream.c
index 6d0ea599..dbfd982b 100644
--- a/src/testcurl/test_quiesce_stream.c
+++ b/src/testcurl/test_quiesce_stream.c
@@ -142,7 +142,7 @@ http_AccessHandlerCallback (void *cls,
                             const char *version,
                             const char *upload_data,
                             size_t *upload_data_size,
-                            void **con_cls)
+                            void **req_cls)
 {
   enum MHD_Result ret;
   struct MHD_Response *response;
@@ -151,7 +151,7 @@ http_AccessHandlerCallback (void *cls,
   (void) upload_data_size;                       /* Unused. Silent compiler warning. */
 
   /* Never respond on first call */
-  if (NULL == *con_cls)
+  if (NULL == *req_cls)
   {
     struct ContentReaderUserdata *userdata;
     fprintf (stderr,
@@ -164,7 +164,7 @@ http_AccessHandlerCallback (void *cls,
       return MHD_NO;
     userdata->bytes_written = 0;
     userdata->connection = connection;
-    *con_cls = userdata;
+    *req_cls = userdata;
     return MHD_YES;
   }
 
@@ -173,7 +173,7 @@ http_AccessHandlerCallback (void *cls,
     = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
                                          32 * 1024,
                                          &http_ContentReaderCallback,
-                                         *con_cls,
+                                         *req_cls,
                                          &free_crc_data);
   ret = MHD_queue_response (connection,
                             MHD_HTTP_OK,
diff --git a/src/testcurl/test_termination.c b/src/testcurl/test_termination.c
index 3e1c1f91..72b77219 100644
--- a/src/testcurl/test_termination.c
+++ b/src/testcurl/test_termination.c
@@ -56,7 +56,7 @@ connection_handler (void *cls,
                     const char *method,
                     const char *version,
                     const char *upload_data, size_t *upload_data_size,
-                    void **ptr)
+                    void **req_cls)
 {
   static int i;
   struct MHD_Response *response;
@@ -65,9 +65,9 @@ connection_handler (void *cls,
   (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
   (void) upload_data_size;                       /* Unused. Silent compiler warning. */
 
-  if (*ptr == NULL)
+  if (*req_cls == NULL)
   {
-    *ptr = &i;
+    *req_cls = &i;
     return MHD_YES;
   }
 
diff --git a/src/testcurl/test_timeout.c b/src/testcurl/test_timeout.c
index 2a39fa13..5c184a20 100644
--- a/src/testcurl/test_timeout.c
+++ b/src/testcurl/test_timeout.c
@@ -96,11 +96,11 @@ struct CBC
 static void
 termination_cb (void *cls,
                 struct MHD_Connection *connection,
-                void **con_cls,
+                void **req_cls,
                 enum MHD_RequestTerminationCode toe)
 {
   int *test = cls;
-  (void) connection; (void) con_cls;       /* Unused. Silent compiler warning. */
+  (void) connection; (void) req_cls;       /* Unused. Silent compiler warning. */
 
   switch (toe)
   {
@@ -190,12 +190,12 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   int *done = cls;
   struct MHD_Response *response;
   enum MHD_Result ret;
-  (void) version; (void) unused;   /* Unused. Silent compiler warning. */
+  (void) version; (void) req_cls;   /* Unused. Silent compiler warning. */
 
   if (0 != strcmp ("PUT", method))
     return MHD_NO;              /* unexpected method */
diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c
index 6f78d7ba..134fd8af 100644
--- a/src/testcurl/test_toolarge.c
+++ b/src/testcurl/test_toolarge.c
@@ -448,7 +448,7 @@ ahcCheck (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **con_cls)
+          void **req_cls)
 {
   static int ptr;
   struct MHD_Response *response;
@@ -477,12 +477,12 @@ ahcCheck (void *cls,
   if (0 != strcmp (param->rq_method, method))
     mhdErrorExitDesc ("Unexpected request method");
 
-  if (&ptr != *con_cls)
+  if (&ptr != *req_cls)
   {
-    *con_cls = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *con_cls = NULL;
+  *req_cls = NULL;
 
   if (1 > MHD_get_connection_values_n (connection, MHD_HEADER_KIND,
                                        &headerCheckerInterator,
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c
index 50af68a1..afb29bbd 100644
--- a/src/testcurl/test_tricky.c
+++ b/src/testcurl/test_tricky.c
@@ -385,7 +385,7 @@ ahcCheck (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **con_cls)
+          void **req_cls)
 {
   static int ptr;
   struct MHD_Response *response;
@@ -413,12 +413,12 @@ ahcCheck (void *cls,
   if (0 != strcmp (param->rq_method, method))
     mhdErrorExitDesc ("Unexpected request method");
 
-  if (&ptr != *con_cls)
+  if (&ptr != *req_cls)
   {
-    *con_cls = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
-  *con_cls = NULL;
+  *req_cls = NULL;
 
   if (1 > MHD_get_connection_values_n (connection, MHD_HEADER_KIND,
                                        &headerCheckerInterator,
diff --git a/src/testcurl/test_urlparse.c b/src/testcurl/test_urlparse.c
index bc0411a9..0145b5f1 100644
--- a/src/testcurl/test_urlparse.c
+++ b/src/testcurl/test_urlparse.c
@@ -98,7 +98,7 @@ ahc_echo (void *cls,
           const char *method,
           const char *version,
           const char *upload_data, size_t *upload_data_size,
-          void **unused)
+          void **req_cls)
 {
   static int ptr;
   const char *me = cls;
@@ -108,16 +108,16 @@ ahc_echo (void *cls,
 
   if (0 != strcmp (me, method))
     return MHD_NO;              /* unexpected method */
-  if (&ptr != *unused)
+  if (&ptr != *req_cls)
   {
-    *unused = &ptr;
+    *req_cls = &ptr;
     return MHD_YES;
   }
   MHD_get_connection_values (connection,
                              MHD_GET_ARGUMENT_KIND,
                              &test_values,
                              NULL);
-  *unused = NULL;
+  *req_cls = NULL;
   response = MHD_create_response_from_buffer (strlen (url),
                                               (void *) url,
                                               MHD_RESPMEM_MUST_COPY);