Commit 218fe3f3 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 4bb06b14

modules/proxy/mod_proxy.h

+0 −7
Changes for modules/proxy/mod_proxy.h: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -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 )

modules/proxy/proxy_util.c

+7 −3
Changes for modules/proxy/proxy_util.c: 7 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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);