MINOR/CLEANUP: proxy: rename "proxy" to "proxies_list"
Rename the global variable "proxy" to "proxies_list".
There's been multiple proxies in haproxy for quite some time, and "proxy"
is a potential source of bugs, a number of functions have a "proxy" argument,
and some code used "proxy" when it really meant "px" or "curproxy". It worked
by pure luck, because it usually happened while parsing the config, and thus
"proxy" pointed to the currently parsed proxy, but we should probably not
rely on this.
[wt: some of these are definitely fixes that are worth backporting]
diff --git a/src/cli.c b/src/cli.c
index 3d88780..149ecd7 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -170,8 +170,8 @@
return NULL;
init_new_proxy(fe);
- fe->next = proxy;
- proxy = fe;
+ fe->next = proxies_list;
+ proxies_list = fe;
fe->last_change = now.tv_sec;
fe->id = strdup("GLOBAL");
fe->cap = PR_CAP_FE;
@@ -1276,7 +1276,7 @@
* First, calculates the total number of FD, so that we can let
* the caller know how much he should expects.
*/
- px = proxy;
+ px = proxies_list;
while (px) {
struct listener *l;
@@ -1313,7 +1313,7 @@
cmsg->cmsg_type = SCM_RIGHTS;
tmpfd = (int *)CMSG_DATA(cmsg);
- px = proxy;
+ px = proxies_list;
/* For each socket, e message is sent, containing the following :
* Size of the namespace name (or 0 if none), as an unsigned char.
* The namespace name, if any