dgaudet 97/07/08 16:11:44
Modified: src alloc.h buff.h http_config.c mod_dir.c
mod_mime_magic.c
Log:
-Wall cleanup
Revision Changes Path
1.26 +0 -5 apache/src/alloc.h
Index: alloc.h
===================================================================
RCS file: /export/home/cvs/apache/src/alloc.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C3 -r1.25 -r1.26
*** alloc.h 1997/07/08 06:32:33 1.25
--- alloc.h 1997/07/08 23:11:40 1.26
***************
*** 247,257 ****
int spawn_child_err (pool *, int (*)(void *), void *,
enum kill_conditions, FILE **pipe_in, FILE **pipe_out,
FILE **pipe_err);
- #if 0
- int spawn_child_err_buff (pool *, int (*)(void *), void *,
- enum kill_conditions, BUFF **pipe_in, BUFF **pipe_out,
- BUFF **pipe_err);
- #endif
#define spawn_child(p,f,v,k,in,out) spawn_child_err(p,f,v,k,in,out,NULL)
/* magic numbers --- min free bytes to consider a free pool block useable,
--- 247,252 ----
1.16 +4 -0 apache/src/buff.h
Index: buff.h
===================================================================
RCS file: /export/home/cvs/apache/src/buff.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** buff.h 1997/06/30 20:28:50 1.15
--- buff.h 1997/07/08 23:11:40 1.16
***************
*** 155,157 ****
--- 155,161 ----
#define bputc(c, fb) ((((fb)->flags & (B_EOUT|B_WRERR|B_WR)) != B_WR || \
(fb)->outcnt == (fb)->bufsiz) ? bflsbuf(c, (fb)) : \
((fb)->outbase[(fb)->outcnt++] = (c), 0))
+
+ int spawn_child_err_buff (pool *, int (*)(void *), void *,
+ enum kill_conditions, BUFF **pipe_in, BUFF **pipe_out,
+ BUFF **pipe_err);
1.58 +1 -1 apache/src/http_config.c
Index: http_config.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C3 -r1.57 -r1.58
*** http_config.c 1997/07/08 18:02:07 1.57
--- http_config.c 1997/07/08 23:11:40 1.58
***************
*** 866,872 ****
FILE *f = NULL;
cmd_parms parms;
const char *errmsg;
! char *filename;
const struct htaccess_result *cache;
struct htaccess_result *new;
void *dc;
--- 866,872 ----
FILE *f = NULL;
cmd_parms parms;
const char *errmsg;
! char *filename = NULL;
const struct htaccess_result *cache;
struct htaccess_result *new;
void *dc;
1.34 +0 -1 apache/src/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_dir.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C3 -r1.33 -r1.34
*** mod_dir.c 1997/07/08 19:50:46 1.33
--- mod_dir.c 1997/07/08 23:11:41 1.34
***************
*** 108,114 ****
(dir_config_rec *)get_module_config (r->per_dir_config,
&dir_module);
const char *names_ptr = d->index_names ? d->index_names : DEFAULT_INDEX;
- int allow_opts = allow_options (r);
int error_notfound = 0;
if (r->uri[0] == '\0' || r->uri[strlen(r->uri)-1] != '/') {
--- 108,113 ----
1.2 +1 -2 apache/src/mod_mime_magic.c
Index: mod_mime_magic.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_mime_magic.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** mod_mime_magic.c 1997/07/07 18:18:43 1.1
--- mod_mime_magic.c 1997/07/08 23:11:41 1.2
***************
*** 53,59 ****
/*
* mod_mime_magic: MIME type lookup via file magic numbers
* Copyright (c) 1996-1997 Cisco Systems, Inc.
! * $Revision: 1.1 $
*
* This software was submitted by Cisco Systems to the Apache Group in July
* 1997. Future revisions and derivatives of this source code must
--- 53,59 ----
/*
* mod_mime_magic: MIME type lookup via file magic numbers
* Copyright (c) 1996-1997 Cisco Systems, Inc.
! * $Revision: 1.2 $
*
* This software was submitted by Cisco Systems to the Apache Group in July
* 1997. Future revisions and derivatives of this source code must
***************
*** 241,247 ****
*/
static int apprentice(server_rec *, pool *);
static int ascmagic(request_rec *, unsigned char *, int);
- static int is_compress(const unsigned char *, int *);
static int is_tar(unsigned char *, int);
static void magic_process(request_rec *);
static int softmagic(request_rec *, unsigned char *, int);
--- 241,246 ----
