diff options
author | Christophe Jaillet <jailletc36@apache.org> | 2014-12-02 08:17:12 +0100 |
---|---|---|
committer | Christophe Jaillet <jailletc36@apache.org> | 2014-12-02 08:17:12 +0100 |
commit | 6b6f5649ab1f230645a1ee07d684e00ab96baadb (patch) | |
tree | ddf68e5a99ab0cd7cc805e567c0fe93350b2999e /modules/proxy/balancers | |
parent | xforms (diff) | |
download | apache2-6b6f5649ab1f230645a1ee07d684e00ab96baadb.tar.xz apache2-6b6f5649ab1f230645a1ee07d684e00ab96baadb.zip |
Fix curly braces style
Remove useless empty lines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1642803 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy/balancers')
-rw-r--r-- | modules/proxy/balancers/mod_lbmethod_bybusyness.c | 11 | ||||
-rw-r--r-- | modules/proxy/balancers/mod_lbmethod_byrequests.c | 8 | ||||
-rw-r--r-- | modules/proxy/balancers/mod_lbmethod_bytraffic.c | 9 | ||||
-rw-r--r-- | modules/proxy/balancers/mod_lbmethod_heartbeat.c | 12 |
4 files changed, 22 insertions, 18 deletions
diff --git a/modules/proxy/balancers/mod_lbmethod_bybusyness.c b/modules/proxy/balancers/mod_lbmethod_bybusyness.c index 9185f22fc4..67d53a3551 100644 --- a/modules/proxy/balancers/mod_lbmethod_bybusyness.c +++ b/modules/proxy/balancers/mod_lbmethod_bybusyness.c @@ -28,7 +28,6 @@ static int (*ap_proxy_retry_worker_fn)(const char *proxy_function, static proxy_worker *find_best_bybusyness(proxy_balancer *balancer, request_rec *r) { - int i; proxy_worker **worker; proxy_worker *mycandidate = NULL; @@ -116,11 +115,11 @@ static proxy_worker *find_best_bybusyness(proxy_balancer *balancer, } return mycandidate; - } /* assumed to be mutex protected by caller */ -static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { +static apr_status_t reset(proxy_balancer *balancer, server_rec *s) +{ int i; proxy_worker **worker; worker = (proxy_worker **)balancer->workers->elts; @@ -131,8 +130,9 @@ static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } -static apr_status_t age(proxy_balancer *balancer, server_rec *s) { - return APR_SUCCESS; +static apr_status_t age(proxy_balancer *balancer, server_rec *s) +{ + return APR_SUCCESS; } static const proxy_balancer_method bybusyness = @@ -144,7 +144,6 @@ static const proxy_balancer_method bybusyness = &age }; - static void register_hook(apr_pool_t *p) { ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness); diff --git a/modules/proxy/balancers/mod_lbmethod_byrequests.c b/modules/proxy/balancers/mod_lbmethod_byrequests.c index 015de12ad6..206fe9216b 100644 --- a/modules/proxy/balancers/mod_lbmethod_byrequests.c +++ b/modules/proxy/balancers/mod_lbmethod_byrequests.c @@ -149,7 +149,8 @@ static proxy_worker *find_best_byrequests(proxy_balancer *balancer, } /* assumed to be mutex protected by caller */ -static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { +static apr_status_t reset(proxy_balancer *balancer, server_rec *s) +{ int i; proxy_worker **worker; worker = (proxy_worker **)balancer->workers->elts; @@ -159,8 +160,9 @@ static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } -static apr_status_t age(proxy_balancer *balancer, server_rec *s) { - return APR_SUCCESS; +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 ee2451555f..b3fe556a55 100644 --- a/modules/proxy/balancers/mod_lbmethod_bytraffic.c +++ b/modules/proxy/balancers/mod_lbmethod_bytraffic.c @@ -115,14 +115,14 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer, ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, APLOGNO(01210) "proxy: bytraffic selected worker \"%s\" : busy %" APR_SIZE_T_FMT, mycandidate->s->name, mycandidate->s->busy); - } return mycandidate; } /* assumed to be mutex protected by caller */ -static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { +static apr_status_t reset(proxy_balancer *balancer, server_rec *s) +{ int i; proxy_worker **worker; worker = (proxy_worker **)balancer->workers->elts; @@ -135,8 +135,9 @@ static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { return APR_SUCCESS; } -static apr_status_t age(proxy_balancer *balancer, server_rec *s) { - return APR_SUCCESS; +static apr_status_t age(proxy_balancer *balancer, server_rec *s) +{ + return APR_SUCCESS; } static const proxy_balancer_method bytraffic = diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c index e9e1034405..0a4d961ebb 100644 --- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c +++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c @@ -342,12 +342,14 @@ static proxy_worker *find_best_hb(proxy_balancer *balancer, return mycandidate; } -static apr_status_t reset(proxy_balancer *balancer, server_rec *s) { - return APR_SUCCESS; +static apr_status_t reset(proxy_balancer *balancer, server_rec *s) +{ + return APR_SUCCESS; } -static apr_status_t age(proxy_balancer *balancer, server_rec *s) { - return APR_SUCCESS; +static apr_status_t age(proxy_balancer *balancer, server_rec *s) +{ + return APR_SUCCESS; } static const proxy_balancer_method heartbeat = @@ -360,7 +362,7 @@ static const proxy_balancer_method heartbeat = }; static int lb_hb_init(apr_pool_t *p, apr_pool_t *plog, - apr_pool_t *ptemp, server_rec *s) + apr_pool_t *ptemp, server_rec *s) { apr_size_t size; unsigned int num; |