httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/modules/http http_protocol.c
Date Thu, 08 Nov 2001 19:35:32 GMT
jerenkrantz    01/11/08 11:35:32

  Modified:    modules/http http_protocol.c
  Log:
  Clean up the declarations and comments of some of the variables in
  ap_get_client_block.
  There were two len_read vars (each of different types), so the outer one
  was shadowed - move it to the correct scope.
  Move apr_bucket* old declaration inside of the loop so it is obvious
  what its scope is.
  
  Revision  Changes    Path
  1.379     +6 -6      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.378
  retrieving revision 1.379
  diff -u -r1.378 -r1.379
  --- http_protocol.c	2001/11/08 19:27:48	1.378
  +++ http_protocol.c	2001/11/08 19:35:32	1.379
  @@ -1402,9 +1402,8 @@
   {
       apr_size_t total;
       apr_status_t rv;
  -    apr_bucket *b, *old;
  +    apr_bucket *b;
       const char *tempbuf;
  -    apr_off_t len_read;
       core_request_config *req_cfg =
           (core_request_config *)ap_get_module_config(r->request_config,
                                                       &core_module);
  @@ -1412,7 +1411,7 @@
   
       /* read until we get a non-empty brigade */
       while (APR_BRIGADE_EMPTY(bb)) {
  -        len_read = bufsiz;
  +        apr_off_t len_read = bufsiz;
           if (ap_get_brigade(r->input_filters, bb, AP_MODE_BLOCKING,
                              &len_read) != APR_SUCCESS) {
               /* if we actually fail here, we want to just return and
  @@ -1444,6 +1443,7 @@
              && b != APR_BRIGADE_SENTINEL(bb)
              && !APR_BUCKET_IS_EOS(b)) {
           apr_size_t len_read;
  +        apr_bucket *old;
   
           if ((rv = apr_bucket_read(b, &tempbuf, &len_read,
                                     APR_BLOCK_READ)) != APR_SUCCESS) {
  @@ -1456,9 +1456,9 @@
           memcpy(buffer, tempbuf, len_read);
           buffer += len_read;
           total += len_read;
  -        /* XXX the next two fields shouldn't be mucked with here,
  -         * as they are in terms of bytes in the unfiltered body;
  -         * gotta see if anybody else actually uses these
  +        /* XXX the next field shouldn't be mucked with here,
  +         * as it is in terms of bytes in the unfiltered body;
  +         * gotta see if anybody else actually uses it
            */
           r->read_length += len_read; /* XXX yank me? */
           old = b;
  
  
  

Mime
View raw message