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

diff --git a/include/util_filter.h b/include/util_filter.h
index a5191438a72811cdb412405fd034f3a38f90656f..54c2a67e3b570d6294f2f355dd881558aa6188e3 100644 (file)
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -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

diff --git a/modules/experimental/mod_case_filter_in.c b/modules/experimental/mod_case_filter_in.c
index a240975c679924545760471c52f1b4919068e801..0c8efd7602df9c239a7f6d26e2d9dfc86e611b0a 100644 (file)
--- a/modules/experimental/mod_case_filter_in.c
+++ b/modules/experimental/mod_case_filter_in.c
@@ -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;

diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c
index 79830eed08da375cae5011a9cfea1c3eac8b4536..573c87124ef3fdbf35df498fb79b28de6fd8ad59 100644 (file)
--- a/modules/experimental/mod_charset_lite.c
+++ b/modules/experimental/mod_charset_lite.c
@@ -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,

diff --git a/modules/experimental/mod_ext_filter.c b/modules/experimental/mod_ext_filter.c
index 46b4b1e5273df102727481e201163f58fff9e7b2..20804b6b1dbdf2e3ea630db9d49a9b6d577ea536 100644 (file)
--- a/modules/experimental/mod_ext_filter.c
+++ b/modules/experimental/mod_ext_filter.c
@@ -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;

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 875af1770364d8701a4b59e4892cbc1764738209..095edef781e83c0592c1dc4b6a27f32720d78e7e 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -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;

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index a278cd7d87164f811645d6a47a9d51e50daf3dc6..8c8584fdfa4440064fc7ce66ea9e4fc25e6842d4 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -390,7 +390,7 @@ static void check_pipeline_flush(request_rec *r)
        ### allow us to defer creation of the brigade to when we actually
        ### need to send a FLUSH. */
     apr_bucket_brigade *bb = apr_brigade_create(r->pool);
-    apr_size_t zero = 0;
+    apr_off_t zero = 0;
 
     /* Flush the filter contents if:
      *

diff --git a/modules/http/mod_core.h b/modules/http/mod_core.h
index 0a1991f232e550699a2d823805c37b8f0fd96932..4f9ff091838239996b7cb4eba2427f7aecb13bd0 100644 (file)
--- a/modules/http/mod_core.h
+++ b/modules/http/mod_core.h
@@ -74,9 +74,9 @@ extern "C" {
  * These (input) filters are internal to the mod_core operation.
  */
 apr_status_t ap_http_filter(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);
 apr_status_t ap_dechunk_filter(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);
 
 char *ap_response_code_string(request_rec *r, int error_index);
 

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index e479561962e3b1c17d90aec70cd302c0c0abfae1..60ec0dcb64337129699e910c981fb6f07edf86df 100644 (file)
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -664,7 +664,7 @@ const char *ssl_cmd_SSLSessionCache(
             return "SSLSessionCache: shared memory cache not useable on this platform";
 #endif
         mc->nSessionCacheMode      = SSL_SCMODE_SHMHT;
-        cp = strchr(arg, ':');
+        cp = ap_strchr_c(arg, ':');
         mc->szSessionCacheDataFile = (char *)apr_pstrdup(mc->pPool,
                                      ap_server_root_relative(cmd->pool, cp+1));
         mc->tSessionCacheDataTable = NULL;

diff --git a/modules/ssl/ssl_engine_dh.c b/modules/ssl/ssl_engine_dh.c
index 35689dd6e0a6f760913b6813d9afd102cfbe91d4..5e8e09d1c68aa50e54d4d4a4922ec914019e27a7 100644 (file)
--- a/modules/ssl/ssl_engine_dh.c
+++ b/modules/ssl/ssl_engine_dh.c
@@ -101,7 +101,7 @@ static unsigned char dh512_g[] =
     0x02,
 };
 
-static DH *get_dh512()
+static DH *get_dh512(void)
 {
     DH *dh;
 
@@ -132,7 +132,7 @@ static unsigned char dh1024_g[] =
     0x02,
 };
 
-static DH *get_dh1024()
+static DH *get_dh1024(void)
 {
     DH *dh;
 

diff --git a/server/core.c b/server/core.c
index 093efce4fd7e484c3d4d88cb9768f2f2aa162886..f85f8834addb71287faa6d90f47e65abe0c1479d 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3002,7 +3002,7 @@ static int default_handler(request_rec *r)
     return ap_pass_brigade(r->output_filters, bb);
 }
 
-static int core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode, apr_size_t *readbytes)
+static int core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode, apr_off_t *readbytes)
 {
     apr_bucket *e;
 

diff --git a/server/protocol.c b/server/protocol.c
index 210d9078e435783b53e36ff6005bb29104e56598..305ca53e6769c8b72171540bf5d7e2991e69ceac 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -216,7 +216,7 @@ AP_CORE_DECLARE(int) ap_getline(char *s, int n, request_rec *r, int fold)
 
     while (1) {
         if (APR_BRIGADE_EMPTY(b)) {
-            apr_size_t zero = 0;
+            apr_off_t zero = 0;
             if ((retval = ap_get_brigade(c->input_filters, b,
                                          AP_MODE_BLOCKING,
                                          &zero /* readline */)) != APR_SUCCESS ||

diff --git a/server/util_filter.c b/server/util_filter.c
index 86833583aa83faa9122252c1317e1367db2430a3..b8e6dfa0e96750af9d8b08c3bbab1542bc476553 100644 (file)
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -211,7 +211,7 @@ AP_DECLARE(void) ap_remove_output_filter(ap_filter_t *f)
 AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *next,
                                         apr_bucket_brigade *bb, 
                                         ap_input_mode_t mode,
-                                        apr_size_t *readbytes)
+                                        apr_off_t *readbytes)
 {
     if (next) {
         return next->frec->filter_func.in_func(next, bb, mode, readbytes);