From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
Date: Fri, 25 May 2018 23:13:30 +0000 (-0400)
Subject: global: start relying on http_client_request_abort(NULL) being a no-op
X-Git-Tag: 2.3.9~1779
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b709d5f82dfd577194fad96d4b2d77c3da338c;p=thirdparty%2Fdovecot%2Fcore.git

global: start relying on http_client_request_abort(NULL) being a no-op

Cleanup performed with the following semantic patch:

	@@
	expression E;
	@@

	- if (E != NULL) {
	- 	http_client_request_abort(&E);
	- }
	+ http_client_request_abort(&E);
---

diff --git a/src/auth/auth-policy.c b/src/auth/auth-policy.c
index 31a49c8e9e..9eecdc814a 100755
--- a/src/auth/auth-policy.c
+++ b/src/auth/auth-policy.c
@@ -236,8 +236,7 @@ void auth_policy_finish(struct policy_lookup_ctx *context)
 		const char *error ATTR_UNUSED;
 		(void)json_parser_deinit(&context->parser, &error);
 	}
-	if (context->http_request != NULL)
-		http_client_request_abort(&context->http_request);
+	http_client_request_abort(&context->http_request);
 	if (context->request != NULL)
 		auth_request_unref(&context->request);
 }
diff --git a/src/lib-http/http-client-connection.c b/src/lib-http/http-client-connection.c
index a694bbc40a..74f2d84614 100644
--- a/src/lib-http/http-client-connection.c
+++ b/src/lib-http/http-client-connection.c
@@ -1726,8 +1726,7 @@ http_client_connection_disconnect(struct http_client_connection *conn)
 	conn->closing = TRUE;
 	conn->connected = FALSE;
 
-	if (conn->connect_request != NULL)
-		http_client_request_abort(&conn->connect_request);
+	http_client_request_abort(&conn->connect_request);
 
 	if (conn->incoming_payload != NULL) {
 		/* the stream is still accessed by lib-http caller. */
diff --git a/src/lib-oauth2/oauth2.c b/src/lib-oauth2/oauth2.c
index 877054ccbe..b63686de23 100644
--- a/src/lib-oauth2/oauth2.c
+++ b/src/lib-oauth2/oauth2.c
@@ -71,8 +71,7 @@ oauth2_request_abort(struct oauth2_request **_req)
 	struct oauth2_request *req = *_req;
 	*_req = NULL;
 
-	if (req->req != NULL)
-		http_client_request_abort(&req->req);
+	http_client_request_abort(&req->req);
 	oauth2_request_free_internal(req);
 }
 
diff --git a/src/plugins/fts-solr/solr-connection.c b/src/plugins/fts-solr/solr-connection.c
index b7aa1c7bf6..3d1546e48a 100644
--- a/src/plugins/fts-solr/solr-connection.c
+++ b/src/plugins/fts-solr/solr-connection.c
@@ -556,8 +556,7 @@ int solr_connection_post_end(struct solr_connection_post **_post)
 			ret = -1;
 		}
 	} else {
-		if (post->http_req != NULL)
-			http_client_request_abort(&post->http_req);
+		http_client_request_abort(&post->http_req);
 	}
 	i_free(post);
 
diff --git a/src/plugins/fts/fts-parser-tika.c b/src/plugins/fts/fts-parser-tika.c
index feed96b5f3..ba38f8cbee 100644
--- a/src/plugins/fts/fts-parser-tika.c
+++ b/src/plugins/fts/fts-parser-tika.c
@@ -250,8 +250,7 @@ static int fts_parser_tika_deinit(struct fts_parser *_parser, const char **retri
 	   timeout to ioloop unnecessarily */
 	i_stream_unref(&parser->payload);
 	io_remove(&parser->io);
-	if (parser->http_req != NULL)
-		http_client_request_abort(&parser->http_req);
+	http_client_request_abort(&parser->http_req);
 	if (parser->ioloop != NULL) {
 		io_loop_set_current(parser->ioloop);
 		io_loop_destroy(&parser->ioloop);