From f2f321ff8c673a7fe5dbb6cfd99f59caf4e46f75 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Sat, 3 Dec 2011 13:38:26 +0000 Subject: [PATCH] mod_proxy: Remove dead code. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209910 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.h | 2 -- modules/proxy/proxy_util.c | 50 -------------------------------------- 2 files changed, 52 deletions(-) diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 7a243cc560..1b1bd23dd4 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -537,8 +537,6 @@ PROXY_DECLARE(char *)ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, en int forcedec, int proxyreq); PROXY_DECLARE(char *)ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, char **userp, char **passwordp, char **hostp, apr_port_t *port); -PROXY_DECLARE(int) ap_proxy_hex2sec(const char *x); -PROXY_DECLARE(void) ap_proxy_sec2hex(int t, char *y); PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *message); PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *conf, apr_sockaddr_t *uri_addr); PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r); diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 9ac5387087..c182562aa9 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -391,56 +391,6 @@ PROXY_DECLARE(request_rec *)ap_proxy_make_fake_req(conn_rec *c, request_rec *r) return rp; } -/* - * Converts 8 hex digits to a time integer - */ -PROXY_DECLARE(int) ap_proxy_hex2sec(const char *x) -{ - int i, ch; - unsigned int j; - - for (i = 0, j = 0; i < 8; i++) { - ch = x[i]; - j <<= 4; - if (apr_isdigit(ch)) { - j |= ch - '0'; - } - else if (apr_isupper(ch)) { - j |= ch - ('A' - 10); - } - else { - j |= ch - ('a' - 10); - } - } - if (j == 0xffffffff) { - return -1; /* so that it works with 8-byte ints */ - } - else { - return j; - } -} - -/* - * Converts a time integer to 8 hex digits - */ -PROXY_DECLARE(void) ap_proxy_sec2hex(int t, char *y) -{ - int i, ch; - unsigned int j = t; - - for (i = 7; i >= 0; i--) { - ch = j & 0xF; - j >>= 4; - if (ch >= 10) { - y[i] = ch + ('A' - 10); - } - else { - y[i] = ch + '0'; - } - } - y[8] = '\0'; -} - PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *message) { const char *uri = ap_escape_html(r->pool, r->uri); -- 2.40.0