cvs commit: apache-2.0/src/lib/apr/buckets ap_buf.c

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

rbb         00/07/12 16:24:32

  Modified:    src/lib/apr/buckets ap_buf.c
  Log:
  Change to use read/write buckets by default.  This will need to be cleaned
  up a bit.  Basically, I will think we want to use rwmem if they are the
  last bucket in the list, and rmem if there are no rwmem buckets at the
  end of the brigade.  This solves the problem of current modules not working
  with the filtering.
  
  Revision  Changes    Path
  1.9       +4 -4      apache-2.0/src/lib/apr/buckets/ap_buf.c
  
  Index: ap_buf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/ap_buf.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ap_buf.c	2000/07/12 22:12:48	1.8
  +++ ap_buf.c	2000/07/12 23:24:32	1.9
  @@ -303,13 +303,13 @@
       }
       
       for (k = 0;;) {
  -        r = ap_bucket_new(AP_BUCKET_rmem);
  +        r = ap_bucket_new(AP_BUCKET_rwmem);
           x = va_arg(va, const char *);
           if (x == NULL)
               break;
           j = strlen(x);
          
  -        rv = ap_rmem_write(r->data, x, j, &i);
  +        rv = ap_rwmem_write(r->data, x, j, &i);
           if (i != j) {
               /* Do we need better error reporting?  */
               return -1;
  @@ -355,8 +355,8 @@
   
       res = ap_vsnprintf(buf, 4096, fmt, va);
   
  -    r = ap_bucket_new(AP_BUCKET_rmem);
  -    res = ap_rmem_write(r->data, buf, strlen(buf), &i);
  +    r = ap_bucket_new(AP_BUCKET_rwmem);
  +    res = ap_rwmem_write(r->data, buf, strlen(buf), &i);
   
       /* This really requires an API.  Basically we are just adding
        * a bucket to a bucket list.