From 5a6d4adbdc10734f9e7abe90690609ffaa30199b Mon Sep 17 00:00:00 2001
From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 24 Jan 2017 09:56:29 +0200
Subject: [PATCH] global: Update http_server_request_set_destroy_callback usage

---
 src/doveadm/client-connection-http.c   |  3 +--
 src/lib-http/test-http-payload.c       |  7 ++-----
 src/lib-http/test-http-server-errors.c | 11 +++--------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/doveadm/client-connection-http.c b/src/doveadm/client-connection-http.c
index 3e573efb65..a2536d8d38 100644
--- a/src/doveadm/client-connection-http.c
+++ b/src/doveadm/client-connection-http.c
@@ -123,9 +123,8 @@ doveadm_http_server_connection_destroy(void *context, const char *reason ATTR_UN
 }
 
 static void
-doveadm_http_server_request_destroy(void *context)
+doveadm_http_server_request_destroy(struct client_connection_http *conn)
 {
-        struct client_connection_http *conn = context;
 	struct http_server_response *resp = 
 		http_server_request_get_response(conn->http_server_request);
 
diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index 508bb243ea..01a8193f77 100644
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -409,7 +409,7 @@ client_handle_echo_request(struct client_request *creq,
 /* request */
 
 static void
-http_server_request_destroyed(void *context);
+http_server_request_destroyed(struct client_request *creq);
 
 static struct client_request *
 client_request_init(struct client *client,
@@ -446,11 +446,8 @@ static void client_request_deinit(struct client_request **_creq)
 }
 
 static void
-http_server_request_destroyed(void *context)
+http_server_request_destroyed(struct client_request *creq)
 {
-	struct client_request *creq =
-		(struct client_request *)context;
-
 	client_request_deinit(&creq);
 }
 
diff --git a/src/lib-http/test-http-server-errors.c b/src/lib-http/test-http-server-errors.c
index 88881e4a1f..5c595c0f98 100644
--- a/src/lib-http/test-http-server-errors.c
+++ b/src/lib-http/test-http-server-errors.c
@@ -116,9 +116,8 @@ struct _slow_request {
 };
 
 static void
-test_server_slow_request_destroyed(void *context)
+test_server_slow_request_destroyed(struct _slow_request *ctx)
 {
-	struct _slow_request *ctx = (struct _slow_request *)context;
 	test_assert(ctx->serviced);
 	if (ctx->to_delay != NULL)
 		timeout_remove(&ctx->to_delay);
@@ -220,10 +219,8 @@ struct _hanging_request_payload {
 };
 
 static void
-test_server_hanging_request_payload_destroyed(void *context)
+test_server_hanging_request_payload_destroyed(struct _hanging_request_payload *ctx)
 {
-	struct _hanging_request_payload *ctx =
-		(struct _hanging_request_payload *)context;
 	test_assert(!ctx->serviced);
 	if (ctx->io != NULL)
 		io_remove(&ctx->io);
@@ -356,10 +353,8 @@ struct _hanging_response_payload {
 };
 
 static void
-test_server_hanging_response_payload_destroyed(void *context)
+test_server_hanging_response_payload_destroyed(struct _hanging_response_payload *ctx)
 {
-	struct _hanging_response_payload *ctx =
-		(struct _hanging_response_payload *)context;
 	test_assert(!ctx->serviced);
 	if (ctx->io != NULL)
 		io_remove(&ctx->io);