Make the changes requested by Greg.

1)  remove all instances of apr_buf.h from the two util_filter files.
2)  remove ap_pass_brigade from the two files
3)  remove parameters from ap_filter_func type.

#3 causes warnings until we add those parameters back in.  We can't
release 2.0 with these files until we have a filter mechanism in place,
so those warnings will go away in time.  In the meantime, we just have
to live with it.

I also added some comments to the bottom of this file mentioning those
things that were removed.  I tried to keep those comments patch neutral
while still leaving enough information for the next guy to help out
with the patch implementation
Submitted by:	Greg Stein and Ryan Bloom


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60449 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 18 insertions, 19 deletions

diff --git a/buckets/util_filter.c b/buckets/util_filter.c
index 5a30a0415..77bdc9872 100644
--- a/buckets/util_filter.c
+++ b/buckets/util_filter.c
@@ -53,7 +53,6 @@
  */
 
 #include "util_filter.h"
-#include "apr_buf.h"
 
 /*
  * ap_filter_rec_t:
@@ -145,14 +144,3 @@ API_EXPORT(void) ap_add_filter(const char *name, void *ctx, request_rec *r)
     }
 }
 
-API_EXPORT(int) ap_pass_brigade(request_rec *r, ap_filter_t *filter, 
-                                 ap_bucket_brigade *bucket)
-{
-    if (filter == NULL) {
-        return APR_ENOTIMPL;
-    }
-    else {
-        return (*filter->filter_func)(r, filter->next, bucket);
-    }
-}
-
diff --git a/buckets/util_filter.h b/buckets/util_filter.h
index 830912cba..f2f564a5a 100644
--- a/buckets/util_filter.h
+++ b/buckets/util_filter.h
@@ -64,7 +64,6 @@ extern "C" {
 #endif
 
 #include "httpd.h"
-#include "apr_buf.h"
 #include "apr.h"
 
 /*
@@ -115,8 +114,7 @@ typedef struct ap_filter_t ap_filter_t;
  * next/prev to insert/remove/replace elements in the bucket list, but
  * the types and values of the individual buckets should not be altered.
  */
-typedef int (*ap_filter_func)(request_rec *r, ap_filter_t *filter,
-                                    ap_bucket_brigade *bucket);
+typedef ap_status_t (*ap_filter_func)();
 
 /*
  * ap_filter_type:
@@ -170,10 +168,6 @@ struct ap_filter_t {
     ap_filter_t *next;
 };
 
-API_EXPORT(int) ap_pass_brigade(request_rec *r, ap_filter_t *filter, 
-                                 ap_bucket_brigade *bucket);
-
-
 /*
  * ap_register_filter():
  *
@@ -202,6 +196,23 @@ API_EXPORT(void) ap_register_filter(const char *name,
 API_EXPORT(void) ap_add_filter(const char *name, void *ctx, request_rec *r);
 
 
+/*
+ * Things to do later:
+ * Add parameters to ap_filter_func type.  Those parameters will be something
+ *     like:
+ *         (request_rec *r, ap_filter_t *filter, ap_data_list *the_data)
+ *      obviously, the request_rec is the current request, and the filter
+ *      is the current filter stack.  The data_list is a bucket list or
+ *      bucket_brigade, but I am trying to keep this patch neutral.  (If this
+ *      comment breaks that, well sorry, but the information must be there
+ *      somewhere.  :-)
+ *
+ * Add a function like ap_pass_data.  This function will basically just
+ * call the next filter in the chain, until the current filter is NULL.  If the
+ * current filter is NULL, that means that nobody wrote to the network, and
+ * we have a HUGE bug, so we need to return an error and log it to the 
+ * log file.
+ */
 #ifdef __cplusplus
 }
 #endif