From: Nick Kew Date: Wed, 12 Oct 2005 20:18:33 +0000 (+0000) Subject: Make ap_register_output_filter a #define X-Git-Tag: 2.3.0~2882 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5134335beedcec5acb3cc224efe3402c145b49f2;p=apache Make ap_register_output_filter a #define git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@315024 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/util_filter.h b/include/util_filter.h index 0f29aaa5dd..26a6245df2 100644 --- a/include/util_filter.h +++ b/include/util_filter.h @@ -344,15 +344,8 @@ AP_DECLARE(ap_filter_rec_t *) ap_register_input_filter(const char *name, * ::AP_FTYPE_CONNECTION * @see ap_add_output_filter() */ -AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter(const char *name, - ap_out_filter_func filter_func, - ap_init_filter_func filter_init, - ap_filter_type ftype); - -/* For httpd-2.2 I suggest replacing the above with #define ap_register_output_filter(name,ffunc,init,ftype) \ ap_register_output_filter_protocol(name,ffunc,init,ftype,0) -*/ /** * This function is used to register an output filter with the system. diff --git a/server/util_filter.c b/server/util_filter.c index baeaf48d2a..0b23edc1d5 100644 --- a/server/util_filter.c +++ b/server/util_filter.c @@ -248,15 +248,6 @@ AP_DECLARE(ap_filter_rec_t *) ap_register_input_filter(const char *name, ®istered_input_filters); } -/* Prepare to make this a #define in 2.2 */ -AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter(const char *name, - ap_out_filter_func filter_func, - ap_init_filter_func filter_init, - ap_filter_type ftype) -{ - return ap_register_output_filter_protocol(name, filter_func, - filter_init, ftype, 0) ; -} AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter_protocol( const char *name, ap_out_filter_func filter_func,