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 31a49c8e9e1db68c096dec90aa7357718c455162..9eecdc814a5dc05608eb05009e18c561f96bb7de 100755 (executable)
--- 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 a694bbc40ae9868f2dd4f98b1e0f76c61da77d6e..74f2d84614534df39f480bbaec09dbb920fa65b9 100644 (file)
--- 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 877054ccbe0123f8c65789a4ef7636bb1264122c..b63686de2396324f303a67e893f5e7e99abaa51e 100644 (file)
--- 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 b7aa1c7bf63b0726d455e1bd6c7cc4627be9e1b2..3d1546e48ad4f085b6054a354116a18a29812609 100644 (file)
--- 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 feed96b5f390484de992068b241150e48a069232..ba38f8cbeec435af8974bd4b64aa20cce3a2bdd6 100644 (file)
--- 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);