You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2014/12/02 08:17:12 UTC
svn commit: r1642803 - in /httpd/httpd/trunk/modules/proxy:
balancers/mod_lbmethod_bybusyness.c balancers/mod_lbmethod_byrequests.c
balancers/mod_lbmethod_bytraffic.c balancers/mod_lbmethod_heartbeat.c
examples/mod_lbmethod_rr.c
Author: jailletc36
Date: Tue Dec 2 07:17:12 2014
New Revision: 1642803
URL: http://svn.apache.org/r1642803
Log:
Fix curly braces style
Remove useless empty lines
Modified:
httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c
httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c
httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c
httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c
Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c?rev=1642803&r1=1642802&r2=1642803&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bybusyness.c Tue Dec 2 07:17:12 2014
@@ -28,7 +28,6 @@ static int (*ap_proxy_retry_worker_fn)(c
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_bybusynes
}
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
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 bybus
&age
};
-
static void register_hook(apr_pool_t *p)
{
ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);
Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c?rev=1642803&r1=1642802&r2=1642803&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_byrequests.c Tue Dec 2 07:17:12 2014
@@ -149,7 +149,8 @@ static proxy_worker *find_best_byrequest
}
/* 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
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;
}
/*
Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c?rev=1642803&r1=1642802&r2=1642803&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_bytraffic.c Tue Dec 2 07:17:12 2014
@@ -115,14 +115,14 @@ static proxy_worker *find_best_bytraffic
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
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 =
Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1642803&r1=1642802&r2=1642803&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c Tue Dec 2 07:17:12 2014
@@ -342,12 +342,14 @@ static proxy_worker *find_best_hb(proxy_
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 heart
};
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;
Modified: httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c?rev=1642803&r1=1642802&r2=1642803&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c (original)
+++ httpd/httpd/trunk/modules/proxy/examples/mod_lbmethod_rr.c Tue Dec 2 07:17:12 2014
@@ -99,12 +99,14 @@ static proxy_worker *find_best_roundrobi
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 roundrobin =
@@ -116,7 +118,6 @@ static const proxy_balancer_method round
&age
};
-
static void ap_proxy_rr_register_hook(apr_pool_t *p)
{
ap_register_provider(p, PROXY_LBMETHOD, "roundrobin", "0", &roundrobin);