cvs commit: httpd-apreq-2/src apreq.c apreq_version.h

[joes]

joes        2003/11/15 20:03:46

  Modified:    env/c-modules/apreq_request_test mod_apreq_request_test.c
               src      apreq.c apreq_version.h
  Log:
  Drop deprecated APR_BRIGADE_FOREACH
  
  Revision  Changes    Path
  1.3       +3 -1      
httpd-apreq-2/env/c-modules/apreq_request_test/mod_apreq_request_test.c
  
  Index: mod_apreq_request_test.c
  ===================================================================
  RCS file: 
/home/cvs/httpd-apreq-2/env/c-modules/apreq_request_test/mod_apreq_request_test.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_apreq_request_test.c  15 Jul 2003 16:15:50 -0000      1.2
  +++ mod_apreq_request_test.c  16 Nov 2003 04:03:46 -0000      1.3
  @@ -97,7 +97,9 @@
           s = ap_get_brigade(r->input_filters, bb, AP_MODE_READBYTES,
                              APR_BLOCK_READ, HUGE_STRING_LEN);
   
  -        APR_BRIGADE_FOREACH(e,bb) {
  +        for (e = APR_BRIGADE_FIRST(bb); e != APR_BRIGADE_SENTINEL(bb);
  +             e = APR_BUCKET_NEXT(e))
  +        {
               if (APR_BUCKET_IS_EOS(e)) {
                   saw_eos = 1;
                   break;
  
  
  
  1.29      +6 -2      httpd-apreq-2/src/apreq.c
  
  Index: apreq.c
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/src/apreq.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- apreq.c   17 Oct 2003 06:10:35 -0000      1.28
  +++ apreq.c   16 Nov 2003 04:03:46 -0000      1.29
  @@ -673,7 +673,9 @@
       int n = 0;
       *wlen = 0;
   
  -    APR_BRIGADE_FOREACH(e,bb) {
  +    for (e = APR_BRIGADE_FIRST(bb); e != APR_BRIGADE_SENTINEL(bb);
  +         e = APR_BUCKET_NEXT(e)) 
  +    {
           apr_size_t len;
           if (n == APREQ_NELTS) {
               s = apreq_fwritev(f, v, &n, &len);
  @@ -744,7 +746,9 @@
       apr_bucket *e;
   
       copy = apr_brigade_create(bb->p, bb->bucket_alloc);
  -    APR_BRIGADE_FOREACH(e,bb) {
  +    for (e = APR_BRIGADE_FIRST(bb); e != APR_BRIGADE_SENTINEL(bb);
  +         e = APR_BUCKET_NEXT(e))
  +    {
           apr_bucket *c;
           apr_bucket_copy(e, &c);
           APR_BRIGADE_INSERT_TAIL(copy, c);
  
  
  
  1.4       +1 -1      httpd-apreq-2/src/apreq_version.h
  
  Index: apreq_version.h
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/src/apreq_version.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apreq_version.h   29 Oct 2003 02:20:24 -0000      1.3
  +++ apreq_version.h   16 Nov 2003 04:03:46 -0000      1.4
  @@ -98,7 +98,7 @@
   #define APREQ_MINOR_VERSION       0
   
   /** patch level */
  -#define APREQ_PATCH_VERSION       1
  +#define APREQ_PATCH_VERSION       2
   
   /** 
    *  This symbol is defined for internal, "development" copies of libapreq.