From 42f76d8265890044b39653f2e6230e574ccfb824 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 2 Feb 2011 21:25:34 +0000 Subject: [PATCH] No need to pollute the whole namespace... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066631 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.h | 7 ------- modules/proxy/proxy_util.c | 10 +++++++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 7515fd819e..841d6022d4 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -255,7 +255,6 @@ struct proxy_conn_pool { }; /* Keep below in sync with proxy_util.c! */ - /* worker status bits */ #define PROXY_WORKER_INITIALIZED 0x0001 #define PROXY_WORKER_IGNORE_ERRORS 0x0002 @@ -278,12 +277,6 @@ struct proxy_conn_pool { #define PROXY_WORKER_HOT_STANDBY_FLAG 'H' #define PROXY_WORKER_FREE_FLAG 'F' -typedef struct wstat { - unsigned int bit; - char flag; - const char *name; -} wstat; - #define PROXY_WORKER_NOT_USABLE_BITMAP ( PROXY_WORKER_IN_SHUTDOWN | \ PROXY_WORKER_DISABLED | PROXY_WORKER_STOPPED | PROXY_WORKER_IN_ERROR ) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 25f5f6ced1..3bbf1e34b2 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -45,7 +45,11 @@ typedef struct { } forward_info; /* Keep synced with mod_proxy.h! */ -wstat wstat_tbl[] = { +static struct wstat { + unsigned int bit; + char flag; + const char *name; +} wstat_tbl[] = { {PROXY_WORKER_INITIALIZED, PROXY_WORKER_INITIALIZED_FLAG, "Init "}, {PROXY_WORKER_IGNORE_ERRORS, PROXY_WORKER_IGNORE_ERRORS_FLAG, "Ign "}, {PROXY_WORKER_DRAIN, PROXY_WORKER_DRAIN_FLAG, "Drn "}, @@ -2854,7 +2858,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_set_wstatus(const char c, int set, proxy_wo { unsigned int *status = &w->s->status; char flag = toupper(c); - wstat *pwt = wstat_tbl; + struct wstat *pwt = wstat_tbl; while (pwt->bit) { if (flag == pwt->flag) { if (set) @@ -2872,7 +2876,7 @@ PROXY_DECLARE(char *) ap_proxy_parse_wstatus(apr_pool_t *p, proxy_worker *w) { char *ret = ""; unsigned int status = w->s->status; - wstat *pwt = wstat_tbl; + struct wstat *pwt = wstat_tbl; while (pwt->bit) { if (status & pwt->bit) ret = apr_pstrcat(p, ret, pwt->name, NULL); -- 2.50.0