Fix a lot of the fallback from the apr_ssize_t to apr_size_t change

Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>

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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 86887bd3a101339ce6d9529714bc68979b081bf1..2c65dc92b571228565799d919cf799354fa314c4 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -185,7 +185,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)
 {
-    apr_ssize_t len;
+    apr_size_t len;
     const char *c;
     const char *buf;
     int state = 0;
@@ -341,7 +341,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;
-    apr_ssize_t length; 
+    apr_size_t length; 
     char *t = tag, *tag_val, term;
 
     /* makes code below a little less cluttered */
@@ -475,7 +475,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;
-    apr_ssize_t length; 
+    apr_size_t length; 
 
     /* make room for nul terminator */
     --len;

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 3329d8da143e3ffadc57d4c09de97c0dd9f8d34b..ed44bdbaaba5ce83b3d28c0796ab3db759b7a8bb 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -912,7 +912,7 @@ static void do_emit_plain(request_rec *r, apr_file_t *f)
 {
     char buf[IOBUFSIZE + 1];
     int i, c, ch;
-    apr_ssize_t n;
+    apr_size_t n;
     apr_status_t stat;
 
     ap_rputs("<PRE>\n", r);
@@ -1106,7 +1106,7 @@ static char *find_title(request_rec *r)
     char titlebuf[MAX_STRING_LEN], *find = "<TITLE>";
     apr_file_t *thefile = NULL;
     int x, y, p;
-    apr_ssize_t n;
+    apr_size_t n;
 
     if (r->status != HTTP_OK) {
        return NULL;

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 4cf81744afeddee8239247612af4ddbde4ceb20a..ac878f780a4de03460c1e7b10559536fc4b807e2 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -745,7 +745,7 @@ static int cgid_handler(request_rec *r)
     char **env; 
     struct sockaddr_un unix_addr;
     apr_file_t *tempsock = NULL;
-    apr_ssize_t nbytes;
+    apr_size_t nbytes;
 
     if (r->method_number == M_OPTIONS) { 
         /* 99 out of 100 cgid scripts, this is all they support */ 

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index eea5b12019a21357000e3910afa1fabb98421ce0..f052df93f187566d19e0bda27cc5367634af2a54 100644 (file)
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -255,7 +255,7 @@ typedef struct {
     apr_file_t *log_fd;
     char *condition_var;
 #ifdef BUFFERED_LOGS
-    apr_ssize_t outcnt;
+    apr_size_t outcnt;
     char outbuf[LOG_BUFSIZE];
 #endif
 } config_log_state;
@@ -828,7 +828,7 @@ static int config_log_transaction(request_rec *r, config_log_state *cls,
     int *strl;
     request_rec *orig;
     int i;
-    apr_ssize_t len = 0;
+    apr_size_t len = 0;
     apr_array_header_t *format;
     char *envar;
 
@@ -881,7 +881,7 @@ static int config_log_transaction(request_rec *r, config_log_state *cls,
         flush_log(cls);
     }
     if (len >= LOG_BUFSIZE) {
-        apr_ssize_t w;
+        apr_size_t w;
 
         str = apr_palloc(r->pool, len + 1);
         for (i = 0, s = str; i < format->nelts; ++i) {

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 900c08ea290f386b302f2981f91df2d9c887a709..535db9ce899f58a19e70b0f203d9b466f5d61bf0 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -474,7 +474,7 @@ static void check_pipe_of_death(void)
     if (!workers_may_exit) {
         int ret;
         char pipe_read_char;
-        apr_ssize_t n = 1;
+        apr_size_t n = 1;
 
         ret = apr_recv(listenfds[0], &pipe_read_char, &n);
         if (APR_STATUS_IS_EAGAIN(ret)) {
@@ -977,7 +977,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     int remaining_children_to_start;
     int i;
     apr_status_t rv;
-    apr_ssize_t one = 1;
+    apr_size_t one = 1;
 
     pconf = _pconf;
     ap_server_conf = s;

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index a9c1c7bd0b6447dcccb4790760afffefbae95416..d934e9e99a505fe37a231ef2157f1d79b7acd09a 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -512,7 +512,7 @@ static void check_pipe_of_death(void)
     if (!workers_may_exit) {
         int ret;
         char pipe_read_char;
-        apr_ssize_t n = 1;
+        apr_size_t n = 1;
 
         ret = apr_recv(listenfds[0], &pipe_read_char, &n);
         if (APR_STATUS_IS_EAGAIN(ret)) {
@@ -1138,7 +1138,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     int remaining_children_to_start;
     int i;
     apr_status_t rv;
-    apr_ssize_t one = 1;
+    apr_size_t one = 1;
 
     pconf = _pconf;
     ap_server_conf = s;

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 5bd7b8b7539caf142917a211163c6396eeb3fc2f..240307f499f34bb1eaf94fd34f065ca030264c47 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -426,7 +426,7 @@ static void check_pipe_of_death(void)
     if (!workers_may_exit) {
         apr_status_t ret;
         char pipe_read_char;
-       apr_ssize_t n = 1;
+       apr_size_t n = 1;
 
         ret = apr_recv(listensocks[0], &pipe_read_char, &n);
         if (APR_STATUS_IS_EAGAIN(ret)) {
@@ -822,7 +822,7 @@ static void perform_idle_server_maintenance(void)
     int free_slots[MAX_SPAWN_RATE];
     int last_non_dead;
     int total_non_dead;
-    apr_ssize_t one = 1;
+    apr_size_t one = 1;
     apr_status_t rv;
 
     /* initialize the free_list */
@@ -998,7 +998,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
 {
     int remaining_children_to_start;
     apr_status_t rv;
-    apr_ssize_t one = 1;
+    apr_size_t one = 1;
 
     pconf = _pconf;
     ap_server_conf = s;

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index a9c1c7bd0b6447dcccb4790760afffefbae95416..d934e9e99a505fe37a231ef2157f1d79b7acd09a 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -512,7 +512,7 @@ static void check_pipe_of_death(void)
     if (!workers_may_exit) {
         int ret;
         char pipe_read_char;
-        apr_ssize_t n = 1;
+        apr_size_t n = 1;
 
         ret = apr_recv(listenfds[0], &pipe_read_char, &n);
         if (APR_STATUS_IS_EAGAIN(ret)) {
@@ -1138,7 +1138,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     int remaining_children_to_start;
     int i;
     apr_status_t rv;
-    apr_ssize_t one = 1;
+    apr_size_t one = 1;
 
     pconf = _pconf;
     ap_server_conf = s;

diff --git a/support/ab.c b/support/ab.c
index 007324f29b52e748666e59e67d4badaea9d533a9..7704d47a60217219d37d6948807daa39da18a267 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -183,7 +183,7 @@ char hostname[1024];        /* host name */
 char path[1024];               /* path name */
 char postfile[1024];        /* name of file containing post data */
 char *postdata;                        /* *buffer containing data from postfile */
-apr_ssize_t postlen = 0;    /* length of data to be POSTed */
+apr_size_t postlen = 0;    /* length of data to be POSTed */
 char content_type[1024];    /* content type to put in POST header */
 char cookie[1024],             /* optional cookie line */
      auth[1024],               /* optional (basic/uuencoded)
@@ -214,7 +214,7 @@ apr_time_t start, endtime;
 
 /* global request (and its length) */
 char request[512];
-apr_ssize_t reqlen;
+apr_size_t reqlen;
 
 /* one global throw-away buffer to read stuff into */
 char buffer[8192];
@@ -258,7 +258,7 @@ static void apr_err(char *s, apr_status_t rv)
 
 static void write_request(struct connection *c)
 {
-    apr_ssize_t len = reqlen;
+    apr_size_t len = reqlen;
     c->connect = apr_now();
     apr_setsocketopt(c->aprsock, APR_SO_TIMEOUT, aprtimeout);
     if (apr_send(c->aprsock, request, &reqlen) != APR_SUCCESS ||
@@ -569,7 +569,7 @@ static void close_connection(struct connection *c)
 
 static void read_connection(struct connection *c)
 {
-    apr_ssize_t r;
+    apr_size_t r;
     apr_status_t status;
     char *part;
     char respcode[4];          /* 3 digits and null */
@@ -876,14 +876,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.31 $> apache-2.0");
+        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.32 $> 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.31 $");
+        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.32 $");
         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");
@@ -956,7 +956,7 @@ static int open_postfile(const char *pfile)
     apr_file_t *postfd = NULL;
     apr_finfo_t finfo;
     apr_fileperms_t mode = APR_OS_DEFAULT;
-    apr_ssize_t length;
+    apr_size_t length;
 
     if (apr_open(&postfd, pfile, APR_READ, mode, cntxt) != APR_SUCCESS) {
         printf("Invalid postfile name (%s)\n", pfile);