cvs commit: apache-2.0/src/main http_config.c http_core.c

[rb...@locus.apache.org]

rbb         00/08/13 20:07:58

  Modified:    src/ap   ap_buckets.c ap_buckets_heap.c
               src/main http_config.c http_core.c
  Log:
  Remove a bunch of warnings from the server when compiled using
  --with-maintainer-mode
  
  Revision  Changes    Path
  1.5       +1 -1      apache-2.0/src/ap/ap_buckets.c
  
  Index: ap_buckets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ap_buckets.c	2000/08/14 00:55:20	1.4
  +++ ap_buckets.c	2000/08/14 03:07:57	1.5
  @@ -165,7 +165,7 @@
   {
       ap_bucket *r;
       const char *x;
  -    int j, k, rv;
  +    int j, k;
       apr_ssize_t i;
   
       for (k = 0;;) {
  
  
  
  1.4       +2 -0      apache-2.0/src/ap/ap_buckets_heap.c
  
  Index: ap_buckets_heap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_heap.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ap_buckets_heap.c	2000/08/14 00:55:20	1.3
  +++ ap_buckets_heap.c	2000/08/14 03:07:57	1.4
  @@ -61,6 +61,8 @@
   #define DEFAULT_RWBUF_SIZE (4096)
   #endif
   
  +void ap_heap_setaside(ap_bucket *e);
  +
   static apr_status_t heap_get_str(ap_bucket *e, const char **str, 
                                    apr_ssize_t *len, int block)
   {
  
  
  
  1.75      +1 -0      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- http_config.c	2000/08/11 23:41:53	1.74
  +++ http_config.c	2000/08/14 03:07:57	1.75
  @@ -79,6 +79,7 @@
   #include "apr_file_io.h"
   #include "httpd.h"
   #include "http_config.h"
  +#include "http_protocol.h"
   #include "http_core.h"
   #include "http_log.h"		/* for errors in parse_htaccess */
   #include "http_request.h"	/* for default_handler (see invoke_handler) */
  
  
  
  1.100     +3 -1      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- http_core.c	2000/08/13 00:53:43	1.99
  +++ http_core.c	2000/08/14 03:07:58	1.100
  @@ -2928,9 +2928,11 @@
    */
   static int core_filter(ap_filter_t *f, ap_bucket_brigade *b)
   {
  +#if 0
       request_rec *r = f->r;
  +#endif
  +    apr_ssize_t bytes_sent = 0;
       ap_bucket *dptr = b->head;
  -    apr_ssize_t bytes_sent;
       int len = 0, written;
       const char *str;