brian 96/10/22 11:45:40
Modified: src http_core.c http_request.c http_protocol.c
Log:
Removed various -Wall warnings, such as unused variables, and made the
definition of no_set_limit only active when the conditions under which
it would be called exist given various #ifdef's of RLIMIT_ variables.
Revision Changes Path
1.38 +2 -0 apache/src/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C3 -r1.37 -r1.38
*** http_core.c 1996/10/20 18:03:30 1.37
--- http_core.c 1996/10/22 18:45:31 1.38
***************
*** 946,951 ****
--- 946,952 ----
}
#endif
+ #if !defined (RLIMIT_CPU) || !(defined (RLIMIT_DATA) || defined
(RLIMIT_VMEM)) || !defined (RLIMIT_NPROC)
static const char *no_set_limit (cmd_parms *cmd, core_dir_config *conf,
char *arg)
{
***************
*** 953,958 ****
--- 954,960 ----
cmd->cmd->name);
return NULL;
}
+ #endif
#ifdef RLIMIT_CPU
const char *set_limit_cpu (cmd_parms *cmd, core_dir_config *conf, char *arg)
1.25 +1 -2 apache/src/http_request.c
Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C3 -r1.24 -r1.25
*** http_request.c 1996/10/20 20:45:51 1.24
--- http_request.c 1996/10/22 18:45:34 1.25
***************
*** 50,56 ****
*
*/
! /* $Id: http_request.c,v 1.24 1996/10/20 20:45:51 ben Exp $ */
/*
* http_request.c: functions to get and process requests
--- 50,56 ----
*
*/
! /* $Id: http_request.c,v 1.25 1996/10/22 18:45:34 brian Exp $ */
/*
* http_request.c: functions to get and process requests
***************
*** 784,790 ****
void process_request_internal (request_rec *r)
{
int access_status;
- void *save_per_dir_config;
/* Kludge to be reading the assbackwards field outside of protocol.c,
* but we've got to check for this sort of nonsense somewhere...
--- 784,789 ----
1.62 +0 -1 apache/src/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C3 -r1.61 -r1.62
*** http_protocol.c 1996/10/20 20:45:50 1.61
--- http_protocol.c 1996/10/22 18:45:36 1.62
***************
*** 240,246 ****
int each_byterange (request_rec *r, long *offset, long *length) {
long range_start, range_end;
char *range;
- const char *rp;
if (!*r->range) {
if (r->byterange > 1)
--- 240,245 ----
