akosut 96/03/21 17:05:28
Modified: src mod_digest.c mod_proxy.c mod_userdir.c util_md5.c
Log:
Fix several of the -Wall warnings, mostly the ones that were my fault.
Sorry about that.
Revision Changes Path
1.2 +0 -4 apache/src/mod_digest.c
Index: mod_digest.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_digest.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** mod_digest.c 1996/03/21 03:50:16 1.1
--- mod_digest.c 1996/03/22 01:05:21 1.2
***************
*** 282,296 ****
/* Checking ID */
int digest_check_auth (request_rec *r) {
- digest_config_rec *sec =
- (digest_config_rec *)get_module_config (r->per_dir_config,
- &digest_module);
char *user = r->connection->user;
int m = r->method_number;
register int x;
char *t, *w;
- table *grpstatus;
array_header *reqs_arr = requires (r);
require_line *reqs;
--- 282,292 ----
1.9 +1 -1 apache/src/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_proxy.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C3 -r1.8 -r1.9
*** mod_proxy.c 1996/03/01 13:59:29 1.8
--- mod_proxy.c 1996/03/22 01:05:22 1.9
***************
*** 1627,1633 ****
{
request_rec *r=c->req;
char *p;
! int i, j;
struct hdr_entry *expire, *dates, *lmods, *clen;
time_t expc, date, lmod, now;
char buff[46];
--- 1627,1633 ----
{
request_rec *r=c->req;
char *p;
! int i;
struct hdr_entry *expire, *dates, *lmods, *clen;
time_t expc, date, lmod, now;
char buff[46];
1.7 +5 -5 apache/src/mod_userdir.c
Index: mod_userdir.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_userdir.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** mod_userdir.c 1996/03/18 19:44:32 1.6
--- mod_userdir.c 1996/03/22 01:05:23 1.7
***************
*** 67,77 ****
*
* UserDir public_html -> ~bar/public_html/one/two.html
* UserDir /usr/web -> /usr/web/bar/one/two.html
! * UserDir /home/* /www -> /home/bar/www/one/two.html
! * NOTE: this ^ space only added allow it to work in a comment, ignore
* UserDir http://x/users -> (302) http://x/users/bar/one/two.html
! * UserDir http://x/* /y -> (302) http://x/bar/y/one/two.html
! * NOTE: here also
*
* In addition, you can use multiple entries, to specify alternate
* user directories (a la Directory Index). For example:
--- 67,77 ----
*
* UserDir public_html -> ~bar/public_html/one/two.html
* UserDir /usr/web -> /usr/web/bar/one/two.html
! * UserDir /home/ * /www -> /home/bar/www/one/two.html
! * NOTE: theses ^ ^ space only added allow it to work in a comment, ignore
* UserDir http://x/users -> (302) http://x/users/bar/one/two.html
! * UserDir http://x/ * /y -> (302) http://x/bar/y/one/two.html
! * NOTE: here also ^ ^
*
* In addition, you can use multiple entries, to specify alternate
* user directories (a la Directory Index). For example:
***************
*** 163,169 ****
}
else {
struct passwd *pw;
! if(pw=getpwnam(w))
#ifdef __EMX__
/* Need to manually add user name for OS/2 */
filename = pstrcat (r->pool, pw->pw_dir, w, "/", userdir, NULL);
--- 163,169 ----
}
else {
struct passwd *pw;
! if((pw=getpwnam(w)))
#ifdef __EMX__
/* Need to manually add user name for OS/2 */
filename = pstrcat (r->pool, pw->pw_dir, w, "/", userdir, NULL);
1.2 +1 -1 apache/src/util_md5.c
Index: util_md5.c
===================================================================
RCS file: /export/home/cvs/apache/src/util_md5.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** util_md5.c 1996/03/21 03:50:16 1.1
--- util_md5.c 1996/03/22 01:05:24 1.2
***************
*** 182,188 ****
int nbytes;
MD5Init(&context);
! while (nbytes = fread(buf, 1, sizeof(buf), infile)) {
length += nbytes;
MD5Update(&context, buf, nbytes);
}
--- 182,188 ----
int nbytes;
MD5Init(&context);
! while ((nbytes = fread(buf, 1, sizeof(buf), infile))) {
length += nbytes;
MD5Update(&context, buf, nbytes);
}
