ben 97/09/06 07:17:02
Modified: src/modules/proxy mod_proxy.h proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c proxy_util.c Log: Unfix warnings. Revision Changes Path 1.22 +4 -4 apachen/src/modules/proxy/mod_proxy.h Index: mod_proxy.h =================================================================== RCS file: /export/home/cvs/apachen/src/modules/proxy/mod_proxy.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_proxy.h 1997/09/05 19:38:32 1.21 +++ mod_proxy.h 1997/09/06 14:16:56 1.22 @@ -131,7 +131,7 @@ struct proxy_services { const char *scheme; - unsigned short port; + int port; }; /* static information about a remote proxy */ @@ -140,7 +140,7 @@ const char *scheme; /* the schemes handled by this proxy, or '*' */ const char *protocol; /* the scheme used to talk to this proxy */ const char *hostname; /* the hostname of this proxy */ - unsigned short port; /* the port for this proxy */ + int port; /* the port for this proxy */ }; struct proxy_alias { @@ -238,7 +238,7 @@ /* proxy_connect.c */ int proxy_connect_handler(request_rec *r, struct cache_req *c, char *url, - const char *proxyhost, unsigned short proxyport); + const char *proxyhost, int proxyport); /* proxy_ftp.c */ @@ -250,7 +250,7 @@ int proxy_http_canon(request_rec *r, char *url, const char *scheme, int def_port); int proxy_http_handler(request_rec *r, struct cache_req *c, char *url, - const char *proxyhost, unsigned short proxyport); + const char *proxyhost, int proxyport); /* proxy_util.c */ 1.26 +3 -4 apachen/src/modules/proxy/proxy_cache.c Index: proxy_cache.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_cache.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- proxy_cache.c 1997/09/05 19:38:34 1.25 +++ proxy_cache.c 1997/09/06 14:16:56 1.26 @@ -87,9 +87,8 @@ else return 0; } -static int every; -static unsigned curbytes, cachesize; -static unsigned long curblocks; +static int curbytes, cachesize, every; +static unsigned long int curblocks; static time_t now, expire; static char *filename; static mutex *garbage_mutex = NULL; @@ -874,7 +873,7 @@ proxy_cache_tidy(struct cache_req *c) { server_rec *s=c->req->server; - unsigned long bc; + long int bc; if (c->fp == NULL) return; 1.17 +2 -3 apachen/src/modules/proxy/proxy_connect.c Index: proxy_connect.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_connect.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- proxy_connect.c 1997/09/05 19:38:34 1.16 +++ proxy_connect.c 1997/09/06 14:16:56 1.17 @@ -94,15 +94,14 @@ int proxy_connect_handler(request_rec *r, struct cache_req *c, char *url, - const char *proxyhost, unsigned short proxyport) + const char *proxyhost, int proxyport) { struct sockaddr_in server; struct in_addr destaddr; struct hostent server_hp; const char *host, *err; char *p; - unsigned short port; - int sock; + int port, sock; char buffer[HUGE_STRING_LEN]; int nbytes, i, j; fd_set fds; 1.37 +5 -6 apachen/src/modules/proxy/proxy_ftp.c Index: proxy_ftp.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- proxy_ftp.c 1997/09/05 19:38:35 1.36 +++ proxy_ftp.c 1997/09/06 14:16:57 1.37 @@ -249,14 +249,13 @@ char urlptr[HUGE_STRING_LEN]; long total_bytes_sent; register int n, o, w; - unsigned l; conn_rec *con = r->connection; tempurl = pstrdup(r->pool, url); - if ((l = strcspn(tempurl, "@")) != strlen(tempurl)) /* hide user/passwd */ + if ((n = strcspn(tempurl, "@")) != strlen(tempurl)) /* hide user/passwd */ { - memmove(tempurl + (l - 5), tempurl, 6); - tempurl += l - 5; /* leave room for ftp:// */ + memmove(tempurl + (n - 5), tempurl, 6); + tempurl += n - 5; /* leave room for ftp:// */ } n = decodeenc(tempurl); @@ -394,7 +393,7 @@ { char *host, *path, *p, *user, *password, *parms; const char *err; - int userlen, i, j, len, sock, dsock, rc, nocache; + int port, userlen, i, j, len, sock, dsock, rc, nocache; int passlen = 0; int csd = 0; struct sockaddr_in server; @@ -418,7 +417,7 @@ /* stuff for PASV mode */ unsigned int presult, h0, h1, h2, h3, p0, p1; unsigned int paddr; - unsigned short pport, port; + unsigned short pport; struct sockaddr_in data_addr; int pasvmode = 0; char pasv[64]; 1.32 +2 -2 apachen/src/modules/proxy/proxy_http.c Index: proxy_http.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_http.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- proxy_http.c 1997/09/05 19:38:36 1.31 +++ proxy_http.c 1997/09/06 14:16:57 1.32 @@ -139,7 +139,7 @@ */ int proxy_http_handler(request_rec *r, struct cache_req *c, char *url, - const char *proxyhost, unsigned short proxyport) + const char *proxyhost, int proxyport) { char *p; const char *err, *desthost; @@ -154,7 +154,7 @@ char buffer[HUGE_STRING_LEN]; pool *pool=r->pool; const long int zero=0L; - unsigned short destport = 0; + int destport = 0; char *destportstr = NULL; char *urlptr = NULL; 1.29 +1 -2 apachen/src/modules/proxy/proxy_util.c Index: proxy_util.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_util.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- proxy_util.c 1997/09/05 19:38:36 1.28 +++ proxy_util.c 1997/09/06 14:16:58 1.29 @@ -110,8 +110,7 @@ char * proxy_canonenc(pool *p, const char *x, int len, enum enctype t, int isenc) { - int i, j; - char ch; + int i, j, ch; char *y; const char *allowed; /* characters which should not be encoded */ const char *reserved; /* characters which much not be en/de-coded */