Fix the types of the variables passed as the len parm to bucket->read()

(in various places).
In ab, change the declaration of argv so that it can be passed into
apr_initopt() without warning.
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>
Reviewed and modified slightly by:	Jeff Trawick

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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index ac8de0f5fb8e069b78bc5adc41d50d96bb0064e7..389a75d10837fae51901b874050c99b0390550c6 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -184,7 +184,7 @@ static void add_include_vars(request_rec *r, char *timefmt)
 
 static ap_bucket *find_string(ap_bucket *dptr, const char *str, ap_bucket *end)
 {
-    int len;
+    apr_ssize_t len;
     const char *c;
     const char *buf;
     int state = 0;
@@ -340,7 +340,7 @@ static char *get_tag(apr_pool_t *p, ap_bucket *in, char *tag, int tagbuf_len, in
     ap_bucket *dptr = in;
     const char *c;
     const char *str;
-    int length; 
+    apr_ssize_t length; 
     char *t = tag, *tag_val, term;
 
     /* makes code below a little less cluttered */
@@ -472,7 +472,7 @@ static int get_directive(ap_bucket *in, char *dest, size_t len, apr_pool_t *p)
     char *d = dest;
     const char *c;
     const char *str;
-    int length; 
+    apr_ssize_t length; 
 
     /* make room for nul terminator */
     --len;

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index ecf505c88c24b54b6e0a790f4653bd47ae0903dd..18eff8d393dcc3adc1de930c4ea24f46fb5f1958 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -3062,9 +3062,8 @@ static int core_filter(ap_filter_t *f, ap_bucket_brigade *b)
     request_rec *r = f->r;
 #endif
     apr_status_t rv;
-    apr_ssize_t bytes_sent = 0;
+    apr_ssize_t bytes_sent = 0, len = 0, written;
     ap_bucket *e;
-    int len = 0, written;
     const char *str;
     
 #if 0 /* XXX: bit rot! */

diff --git a/support/ab.c b/support/ab.c
index 7f16db6bd692f3a135dcd91712e86a3b672c6897..688c4568665a5de3b58e3dab9c98b8dae887d7c9 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -862,14 +862,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.26 $> apache-2.0");
+        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.27 $> apache-2.0");
         printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
         printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
         printf("\n");
     }
     else {
         printf("<p>\n");
-        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.26 $");
+        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.27 $");
         printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
         printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
         printf("</p>\n<p>\n");
@@ -968,7 +968,7 @@ static int open_postfile(const char *pfile)
 /* ------------------------------------------------------- */
 
 /* sort out command-line args and call test */
-int main(int argc, char **argv)
+int main(int argc, char *const *argv)
 {
     int r, l;
     char tmp[1024];