From ab9ed6d9743adefdd3ed2c2373cdd1b03b790b50 Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Wed, 13 May 2009 06:55:57 +0000 Subject: [PATCH] server_rec *r... Oops should be server_rec *s. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774239 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/balancers/mod_lbmethod_bybusyness.c | 4 ++-- modules/proxy/balancers/mod_lbmethod_byrequests.c | 4 ++-- modules/proxy/balancers/mod_lbmethod_bytraffic.c | 4 ++-- modules/proxy/balancers/mod_lbmethod_heartbeat.c | 4 ++-- modules/proxy/examples/mod_lbmethod_rr.c | 4 ++-- modules/proxy/mod_proxy.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/proxy/balancers/mod_lbmethod_bybusyness.c b/modules/proxy/balancers/mod_lbmethod_bybusyness.c index 7df73abb9c..73b878e5e5 100644 --- a/modules/proxy/balancers/mod_lbmethod_bybusyness.c +++ b/modules/proxy/balancers/mod_lbmethod_bybusyness.c @@ -105,11 +105,11 @@ static proxy_worker *find_best_bybusyness(proxy_balancer *balancer, } -static apr_status_t reset(proxy_balancer *balancer, server_rec *r) { +static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } -static apr_status_t age(proxy_balancer *balancer, server_rec *r) { +static apr_status_t age(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } diff --git a/modules/proxy/balancers/mod_lbmethod_byrequests.c b/modules/proxy/balancers/mod_lbmethod_byrequests.c index 7bcbd838c3..6700e9b8c0 100644 --- a/modules/proxy/balancers/mod_lbmethod_byrequests.c +++ b/modules/proxy/balancers/mod_lbmethod_byrequests.c @@ -132,11 +132,11 @@ static proxy_worker *find_best_byrequests(proxy_balancer *balancer, return mycandidate; } -static apr_status_t reset(proxy_balancer *balancer, server_rec *r) { +static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } -static apr_status_t age(proxy_balancer *balancer, server_rec *r) { +static apr_status_t age(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } diff --git a/modules/proxy/balancers/mod_lbmethod_bytraffic.c b/modules/proxy/balancers/mod_lbmethod_bytraffic.c index 7876702c06..32e91fe94f 100644 --- a/modules/proxy/balancers/mod_lbmethod_bytraffic.c +++ b/modules/proxy/balancers/mod_lbmethod_bytraffic.c @@ -105,11 +105,11 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer, return mycandidate; } -static apr_status_t reset(proxy_balancer *balancer, server_rec *r) { +static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } -static apr_status_t age(proxy_balancer *balancer, server_rec *r) { +static apr_status_t age(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c index 9c57bd024e..1182f5edaf 100644 --- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c +++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c @@ -299,11 +299,11 @@ static proxy_worker *find_best_hb(proxy_balancer *balancer, return mycandidate; } -static apr_status_t reset(proxy_balancer *balancer, server_rec *r) { +static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } -static apr_status_t age(proxy_balancer *balancer, server_rec *r) { +static apr_status_t age(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } diff --git a/modules/proxy/examples/mod_lbmethod_rr.c b/modules/proxy/examples/mod_lbmethod_rr.c index b991790c9a..10406fda71 100644 --- a/modules/proxy/examples/mod_lbmethod_rr.c +++ b/modules/proxy/examples/mod_lbmethod_rr.c @@ -95,11 +95,11 @@ static proxy_worker *find_best_roundrobin(proxy_balancer *balancer, return mycandidate; } -static apr_status_t reset(proxy_balancer *balancer, server_rec *r) { +static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } -static apr_status_t age(proxy_balancer *balancer, server_rec *r) { +static apr_status_t age(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 78d653e107..15390337f2 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -391,8 +391,8 @@ struct proxy_balancer_method { proxy_worker *(*finder)(proxy_balancer *balancer, request_rec *r); void *context; /* general purpose storage */ - apr_status_t (*reset)(proxy_balancer *balancer, server_rec *r); - apr_status_t (*age)(proxy_balancer *balancer, server_rec *r); + apr_status_t (*reset)(proxy_balancer *balancer, server_rec *s); + apr_status_t (*age)(proxy_balancer *balancer, server_rec *s); }; #if APR_HAS_THREADS -- 2.50.1