Commit 979dcda6 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Remove all warnings from the input filtering stack. 


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

include/util_filter.h

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ typedef struct ap_filter_t ap_filter_t; 
 */

typedef apr_status_t (*ap_out_filter_func)(ap_filter_t *f, apr_bucket_brigade *b);

typedef apr_status_t (*ap_in_filter_func)(ap_filter_t *f, apr_bucket_brigade *b, 

                                          ap_input_mode_t mode, apr_size_t *readbytes);

                                          ap_input_mode_t mode, apr_off_t *readbytes);



typedef union ap_filter_func {

    ap_out_filter_func out_func;
@@ -277,7 +277,7 @@ struct ap_filter_t { 
 *                  a single line should be read.

 */

AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *filter, apr_bucket_brigade *bucket, 

                                        ap_input_mode_t mode, apr_size_t *readbytes);

                                        ap_input_mode_t mode, apr_off_t *readbytes);



/**

 * Pass the current bucket brigade down to the next filter on the filter

modules/experimental/mod_case_filter_in.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void CaseFilterInInsertFilter(request_rec *r) 


static apr_status_t CaseFilterInFilter(ap_filter_t *f,

				       apr_bucket_brigade *pbbOut,

				       ap_input_mode_t eMode,apr_size_t *nBytes)

				       ap_input_mode_t eMode,apr_off_t *nBytes)

{

    CaseFilterInContext *pCtx=f->ctx;

    apr_status_t ret;

modules/experimental/mod_charset_lite.c

+1 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ static void transfer_brigade(apr_bucket_brigade *in, apr_bucket_brigade *out) 
}



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

                           ap_input_mode_t mode, apr_size_t *readbytes)

                           ap_input_mode_t mode, apr_off_t *readbytes)

{

    apr_status_t rv;

    charset_req_t *reqinfo = ap_get_module_config(f->r->request_config,

modules/experimental/mod_ext_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ static apr_status_t ef_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) 


#if 0

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

                           ap_input_mode_t mode, apr_size_t *readbytes)

                           ap_input_mode_t mode, apr_off_t *readbytes)

{

    apr_status_t rv;

    apr_bucket *b;

modules/http/http_protocol.c

+3 −3
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ struct dechunk_ctx { 
static long get_chunk_size(char *);



apr_status_t ap_dechunk_filter(ap_filter_t *f, apr_bucket_brigade *bb,

                               ap_input_mode_t mode, apr_size_t *readbytes)

                               ap_input_mode_t mode, apr_off_t *readbytes)

{

    apr_status_t rv;

    struct dechunk_ctx *ctx = f->ctx;
@@ -551,7 +551,7 @@ apr_status_t ap_dechunk_filter(ap_filter_t *f, apr_bucket_brigade *bb, 


    if (ctx->state == WANT_BODY) {

        /* Tell ap_http_filter() how many bytes to deliver. */

        apr_size_t chunk_bytes = ctx->chunk_size - ctx->bytes_delivered;

        apr_off_t chunk_bytes = ctx->chunk_size - ctx->bytes_delivered;



        if ((rv = ap_get_brigade(f->next, bb, mode,

                                 &chunk_bytes)) != APR_SUCCESS) {
@@ -588,7 +588,7 @@ typedef struct http_filter_ctx { 
    apr_bucket_brigade *b;

} http_ctx_t;



apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode, apr_size_t *readbytes)

apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode, apr_off_t *readbytes)

{

    apr_bucket *e;

    char *buff;