svn commit: r814854 - /httpd/httpd/trunk/server/core_filters.c

[rp...@apache.org]

Author: rpluem
Date: Mon Sep 14 21:03:31 2009
New Revision: 814854

URL: http://svn.apache.org/viewvc?rev=814854&view=rev
Log:
* Replace brigade_move with apr_brigade_split_ex as spotted by pquerna.

Modified:
    httpd/httpd/trunk/server/core_filters.c

Modified: httpd/httpd/trunk/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core_filters.c?rev=814854&r1=814853&r2=814854&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core_filters.c (original)
+++ httpd/httpd/trunk/server/core_filters.c Mon Sep 14 21:03:31 2009
@@ -76,26 +76,6 @@
 } while (0)
 
 
-/**
- * Split the contents of a brigade after bucket 'e' to an existing brigade
- *
- * XXXX: Should this function be added to APR-Util?
- */
-static void brigade_move(apr_bucket_brigade *b, apr_bucket_brigade *a,
-                         apr_bucket *e)
-{
-    apr_bucket *f;
-
-    if (e != APR_BRIGADE_SENTINEL(b)) {
-        f = APR_RING_LAST(&b->list);
-        APR_RING_UNSPLICE(e, f, link);
-        APR_RING_SPLICE_HEAD(&a->list, e, f, apr_bucket, link);
-    }
-
-    APR_BRIGADE_CHECK_CONSISTENCY(a);
-    APR_BRIGADE_CHECK_CONSISTENCY(b);
-}
-
 int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
                          ap_input_mode_t mode, apr_read_type_e block,
                          apr_off_t readbytes)
@@ -307,7 +287,7 @@
         }
 
         /* Must do move before CONCAT */
-        brigade_move(ctx->b, ctx->tmpbb, e);
+        ctx->tmpbb = apr_brigade_split_ex(ctx->b, e, ctx->tmpbb);
 
         if (mode == AP_MODE_READBYTES) {
             APR_BRIGADE_CONCAT(b, ctx->b);