Commit f850d95f authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Fix various filter functions to return apr_status_t instead of int 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240315 13f79535-47bb-0310-9956-ffa450edef68
parent 32a0e0d4

include/http_core.h

+3 −3
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ 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);



/* 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,

                                  apr_off_t readbytes);

apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *b);

modules/cache/mod_cache.c

+5 −4
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static int cache_handler(request_rec *r) 
 *

 * 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;

    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.

 */



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;

    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

 * 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;

    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

 * 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

modules/debugging/mod_firehose.c

+7 −3
Original line number Diff line number Diff line
@@ -260,8 +260,11 @@ static apr_status_t pumpit(ap_filter_t *f, apr_bucket *b, firehose_ctx_t *ctx) 
    return rv;

}



static int firehose_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,

        ap_input_mode_t mode, apr_read_type_e block, apr_off_t readbytes)

static apr_status_t firehose_input_filter(ap_filter_t *f,

                                          apr_bucket_brigade *bb,

                                          ap_input_mode_t mode,

                                          apr_read_type_e block,

                                          apr_off_t readbytes)

{

    apr_bucket *b;

    apr_status_t rv;
@@ -297,7 +300,8 @@ static int firehose_input_filter(ap_filter_t *f, apr_bucket_brigade *bb, 
    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_status_t rv = APR_SUCCESS;

modules/filters/mod_charset_lite.c

+3 −3
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
    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,

                                    apr_off_t readbytes)

{

modules/filters/mod_ext_filter.c

+3 −3
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ static apr_status_t ef_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
    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,

                                    apr_off_t readbytes)

{