From e4c8e34188e04d3a3705b75c252f16a0ae4fdbe1 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Sat, 9 Dec 2006 13:47:56 +0000 Subject: [PATCH] Isolate the unlock return vals git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@484978 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy_ftp.c | 5 +++-- modules/proxy/proxy_util.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c index 90079f433c..c26ccb5803 100644 --- a/modules/proxy/mod_proxy_ftp.c +++ b/modules/proxy/mod_proxy_ftp.c @@ -763,6 +763,7 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker, apr_status_t rv; conn_rec *origin, *data = NULL; apr_status_t err = APR_SUCCESS; + apr_status_t uerr = APR_SUCCESS; apr_bucket_brigade *bb = apr_brigade_create(p, c->bucket_alloc); char *buf, *connectname; apr_port_t connectport; @@ -916,8 +917,8 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker, address_pool); if (worker->is_address_reusable && !worker->cp->addr) { worker->cp->addr = connect_addr; - if ((err = PROXY_THREAD_UNLOCK(worker)) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, err, r->server, + if ((uerr = PROXY_THREAD_UNLOCK(worker)) != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_ERR, uerr, r->server, "proxy: FTP: unlock"); } } diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 5fbc5c3b4b..fa29e8b15b 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1966,6 +1966,7 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, { int server_port; apr_status_t err = APR_SUCCESS; + apr_status_t uerr = APR_SUCCESS; /* * Break up the URL to determine the host to connect to @@ -2049,8 +2050,8 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, conn->port, 0, worker->cp->pool); conn->addr = worker->cp->addr; - if ((err = PROXY_THREAD_UNLOCK(worker)) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, err, r->server, + if ((uerr = PROXY_THREAD_UNLOCK(worker)) != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_ERR, uerr, r->server, "proxy: unlock"); } } -- 2.40.0