www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-30 20:03:10 +03:00
Code Activity

Fix various filter functions to return apr_status_t instead of int

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240315 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2012-02-03 19:48:01 +00:00
parent 9f1045e8b5
commit d79b3c1513
7 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/http_core.h
View File

@ -680,9 +680,9 @@ AP_CORE_DECLARE(const char *) ap_add_if_conf(apr_pool_t *p, core_dir_config *con
AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy, const char *arg); AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy, const char *arg);
/* Core filters; not exported. */ /* Core filters; not exported. */
int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, apr_status_t ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
ap_input_mode_t mode, apr_read_type_e block, ap_input_mode_t mode, apr_read_type_e block,
apr_off_t readbytes); apr_off_t readbytes);
apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *b); apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *b);

9
modules/cache/mod_cache.c vendored
View File

@ -577,7 +577,7 @@ static int cache_handler(request_rec *r)
* *
* Deliver cached content (headers and body) up the stack. * Deliver cached content (headers and body) up the stack.
*/ */
static int cache_out_filter(ap_filter_t *f, apr_bucket_brigade *in) static apr_status_t cache_out_filter(ap_filter_t *f, apr_bucket_brigade *in)
{ {
request_rec *r = f->r; request_rec *r = f->r;
apr_bucket *e; apr_bucket *e;
@ -726,7 +726,7 @@ static int cache_save_store(ap_filter_t *f, apr_bucket_brigade *in,
* waiting for a potentially slow client to acknowledge the failure. * waiting for a potentially slow client to acknowledge the failure.
*/ */
static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
{ {
int rv = !OK; int rv = !OK;
request_rec *r = f->r; request_rec *r = f->r;
@ -1477,7 +1477,8 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
* Therefore, if this filter is left in, it must mean we need to toss any * Therefore, if this filter is left in, it must mean we need to toss any
* existing files. * existing files.
*/ */
static int cache_remove_url_filter(ap_filter_t *f, apr_bucket_brigade *in) static apr_status_t cache_remove_url_filter(ap_filter_t *f,
apr_bucket_brigade *in)
{ {
request_rec *r = f->r; request_rec *r = f->r;
cache_request_rec *cache; cache_request_rec *cache;
@ -1522,7 +1523,7 @@ static int cache_remove_url_filter(ap_filter_t *f, apr_bucket_brigade *in)
* INCLUDES filter, or to a filter that might perform transformations unique * INCLUDES filter, or to a filter that might perform transformations unique
* to the specific request and that would otherwise be non-cacheable. * to the specific request and that would otherwise be non-cacheable.
*/ */
static int cache_filter(ap_filter_t *f, apr_bucket_brigade *in) static apr_status_t cache_filter(ap_filter_t *f, apr_bucket_brigade *in)
{ {
cache_server_conf cache_server_conf

10
modules/debugging/mod_firehose.c
View File

@ -260,8 +260,11 @@ static apr_status_t pumpit(ap_filter_t *f, apr_bucket *b, firehose_ctx_t *ctx)
return rv; return rv;
} }
static int firehose_input_filter(ap_filter_t *f, apr_bucket_brigade *bb, static apr_status_t firehose_input_filter(ap_filter_t *f,
ap_input_mode_t mode, apr_read_type_e block, apr_off_t readbytes) apr_bucket_brigade *bb,
ap_input_mode_t mode,
apr_read_type_e block,
apr_off_t readbytes)
{ {
apr_bucket *b; apr_bucket *b;
apr_status_t rv; apr_status_t rv;
@ -297,7 +300,8 @@ static int firehose_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
return APR_SUCCESS; return APR_SUCCESS;
} }
static int firehose_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) static apr_status_t firehose_output_filter(ap_filter_t *f,
apr_bucket_brigade *bb)
{ {
apr_bucket *b; apr_bucket *b;
apr_status_t rv = APR_SUCCESS; apr_status_t rv = APR_SUCCESS;

6
modules/filters/mod_charset_lite.c
View File

@ -969,9 +969,9 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, apr_bucket_brigade *bb)
return rv; return rv;
} }
static int xlate_in_filter(ap_filter_t *f, apr_bucket_brigade *bb, static apr_status_t xlate_in_filter(ap_filter_t *f, apr_bucket_brigade *bb,
ap_input_mode_t mode, apr_read_type_e block, ap_input_mode_t mode, apr_read_type_e block,
apr_off_t readbytes) apr_off_t readbytes)
{ {
apr_status_t rv; apr_status_t rv;
charset_req_t *reqinfo = ap_get_module_config(f->r->request_config, charset_req_t *reqinfo = ap_get_module_config(f->r->request_config,

6
modules/filters/mod_ext_filter.c
View File

@ -884,9 +884,9 @@ static apr_status_t ef_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
return rv; return rv;
} }
static int ef_input_filter(ap_filter_t *f, apr_bucket_brigade *bb, static apr_status_t ef_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
ap_input_mode_t mode, apr_read_type_e block, ap_input_mode_t mode, apr_read_type_e block,
apr_off_t readbytes) apr_off_t readbytes)
{ {
ef_ctx_t *ctx = f->ctx; ef_ctx_t *ctx = f->ctx;
apr_status_t rv; apr_status_t rv;

2
modules/filters/mod_proxy_html.c
View File

@ -844,7 +844,7 @@ static saxctxt *check_filter_init (ap_filter_t *f)
return f->ctx; return f->ctx;
} }
static int proxy_html_filter(ap_filter_t *f, apr_bucket_brigade *bb) static apr_status_t proxy_html_filter(ap_filter_t *f, apr_bucket_brigade *bb)
{ {
apr_bucket* b; apr_bucket* b;
meta *m = NULL; meta *m = NULL;

6
server/core_filters.c
View File

@ -104,9 +104,9 @@ AP_DECLARE(apr_bucket_brigade *) ap_core_ctx_get_bb(core_ctx_t *ctx)
return ctx->b; return ctx->b;
} }
int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, apr_status_t ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
ap_input_mode_t mode, apr_read_type_e block, ap_input_mode_t mode, apr_read_type_e block,
apr_off_t readbytes) apr_off_t readbytes)
{ {
apr_bucket *e; apr_bucket *e;
apr_status_t rv; apr_status_t rv;