From 22061ac1e9e881c024d76b5aeab0ae2c7bc8674d Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Tue, 18 Aug 2015 03:03:51 +0300 Subject: [PATCH] http: introduce evhttp_request_free_() helper --- http.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/http.c b/http.c index 0f076f47..55242d84 100644 --- a/http.c +++ b/http.c @@ -681,6 +681,13 @@ evhttp_connection_incoming_fail(struct evhttp_request *req, return (0); } +static void +evhttp_request_free_(struct evhttp_connection *evcon, struct evhttp_request *req) +{ + TAILQ_REMOVE(&evcon->requests, req, next); + evhttp_request_free(req); +} + /* Called when evcon has experienced a (non-recoverable? -NM) error, as * given in error. If it's an outgoing connection, reset the connection, * retry any pending requests, and inform the user. If it's incoming, @@ -729,8 +736,7 @@ evhttp_connection_fail_(struct evhttp_connection *evcon, * send over a new connection. when a user cancels a request, * all other pending requests should be processed as normal */ - TAILQ_REMOVE(&evcon->requests, req, next); - evhttp_request_free(req); + evhttp_request_free_(evcon, req); /* reset the connection */ evhttp_connection_reset_(evcon); @@ -1158,8 +1164,7 @@ evhttp_connection_free(struct evhttp_connection *evcon) * evhttp_connection_fail_. */ while ((req = TAILQ_FIRST(&evcon->requests)) != NULL) { - TAILQ_REMOVE(&evcon->requests, req, next); - evhttp_request_free(req); + evhttp_request_free_(evcon, req); } if (evcon->http_server != NULL) { -- 2.40.0