Clean up some of the warnings from a Tru64 build, mostly due to

the recent apr_ssize_t->apr_size_t changes.  The problem in mod_cgid
was an int function which didn't have a return statement.

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

diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c
index 72da9e4dbf9e917e7f6c57d687f7a6d96dded473..c9e7b02878ea9460ef9a0cd9de54818dc9eb8592 100644 (file)
--- a/modules/experimental/mod_charset_lite.c
+++ b/modules/experimental/mod_charset_lite.c
@@ -134,7 +134,7 @@ typedef struct charset_filter_ctx_t {
     apr_xlate_t *xlate;
     charset_dir_t *dc;
     ees_t ees;              /* extended error status */
-    apr_ssize_t saved;
+    apr_size_t saved;
     char buf[FATTEST_CHAR]; /* we want to be able to build a complete char here */
     int ran;                /* has filter instance run before? */
     int noop;               /* should we pass brigades through unchanged? */
@@ -452,7 +452,7 @@ static void xlate_insert_filter(request_rec *r)
 /* send_downstream() is passed the translated data; it puts it in a single-
  * bucket brigade and passes the brigade to the next filter
  */
-static apr_status_t send_downstream(ap_filter_t *f, const char *tmp, apr_ssize_t len)
+static apr_status_t send_downstream(ap_filter_t *f, const char *tmp, apr_size_t len)
 {
     ap_bucket_brigade *bb;
     ap_bucket *b;
@@ -476,7 +476,7 @@ static apr_status_t send_eos(ap_filter_t *f)
 
 static apr_status_t set_aside_partial_char(charset_filter_ctx_t *ctx, 
                                            const char *partial,
-                                           apr_ssize_t partial_len)
+                                           apr_size_t partial_len)
 {
     apr_status_t rv;
 
@@ -497,10 +497,10 @@ static apr_status_t set_aside_partial_char(charset_filter_ctx_t *ctx,
 static apr_status_t finish_partial_char(charset_filter_ctx_t *ctx,
                                         /* input buffer: */
                                         const char **cur_str, 
-                                        apr_ssize_t *cur_len,
+                                        apr_size_t *cur_len,
                                         /* output buffer: */
                                         char **out_str,
-                                        apr_ssize_t *out_len)
+                                        apr_size_t *out_len)
 {
     apr_status_t rv;
     apr_size_t tmp_input_len;
@@ -710,8 +710,8 @@ static apr_status_t xlate_brigade(charset_filter_ctx_t *ctx,
 {
     ap_bucket *b, *consumed_bucket;
     const char *bucket;
-    apr_ssize_t bytes_in_bucket; /* total bytes read from current bucket */
-    apr_ssize_t bucket_avail;    /* bytes left in current bucket */
+    apr_size_t bytes_in_bucket; /* total bytes read from current bucket */
+    apr_size_t bucket_avail;    /* bytes left in current bucket */
     apr_status_t rv = APR_SUCCESS;
 
     *hit_eos = 0;
@@ -746,15 +746,15 @@ static apr_status_t xlate_brigade(charset_filter_ctx_t *ctx,
                  * Strangely, finish_partial_char() increments the input buffer
                  * pointer but does not increment the output buffer pointer.
                  */
-                apr_ssize_t old_buffer_avail = *buffer_avail;
+                apr_size_t old_buffer_avail = *buffer_avail;
                 rv = finish_partial_char(ctx,
                                          &bucket, &bucket_avail,
                                          &buffer, buffer_avail);
                 buffer += old_buffer_avail - *buffer_avail;
             }
             else {
-                apr_ssize_t old_buffer_avail = *buffer_avail;
-                apr_ssize_t old_bucket_avail = bucket_avail;
+                apr_size_t old_buffer_avail = *buffer_avail;
+                apr_size_t old_bucket_avail = bucket_avail;
                 rv = apr_xlate_conv_buffer(ctx->xlate,
                                            bucket, &bucket_avail,
                                            buffer,
@@ -821,9 +821,9 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, ap_bucket_brigade *bb)
     charset_filter_ctx_t *ctx = f->ctx;
     ap_bucket *dptr, *consumed_bucket;
     const char *cur_str;
-    apr_ssize_t cur_len, cur_avail;
+    apr_size_t cur_len, cur_avail;
     char tmp[OUTPUT_XLATE_BUF_SIZE];
-    apr_ssize_t space_avail;
+    apr_size_t space_avail;
     int done;
     apr_status_t rv = APR_SUCCESS;
 

diff --git a/modules/experimental/mod_ext_filter.c b/modules/experimental/mod_ext_filter.c
index 83490c44df28732b115a002cf87db78ec92b421b..b39e7d00e57cbe8aae8a5a6c9f26db991a6e218a 100644 (file)
--- a/modules/experimental/mod_ext_filter.c
+++ b/modules/experimental/mod_ext_filter.c
@@ -530,7 +530,7 @@ static apr_status_t drain_available_output(ap_filter_t *f)
 {
     ef_ctx_t *ctx = f->ctx;
     ef_dir_t *dc = ctx->dc;
-    apr_ssize_t len;
+    apr_size_t len;
     char buf[4096];
     apr_status_t rv;
     ap_bucket_brigade *bb;
@@ -571,8 +571,8 @@ static apr_status_t pass_data_to_filter(ap_filter_t *f, const char *data,
     ef_ctx_t *ctx = f->ctx;
     ef_dir_t *dc = ctx->dc;
     apr_status_t rv;
-    apr_ssize_t bytes_written = 0;
-    apr_ssize_t tmplen;
+    apr_size_t bytes_written = 0;
+    apr_size_t tmplen;
     
     do {
         tmplen = len - bytes_written;
@@ -631,7 +631,7 @@ static apr_status_t ef_output_filter(ap_filter_t *f, ap_bucket_brigade *bb)
     ef_ctx_t *ctx = f->ctx;
     ap_bucket *b;
     ef_dir_t *dc;
-    apr_ssize_t len;
+    apr_size_t len;
     const char *data;
     apr_status_t rv;
     char buf[4096];

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 4b41e495edca91a43949f73603d412690229d56d..a1b200ce63188e5f57353e1c535d4ccd21e6c554 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -593,7 +593,7 @@ static int cgi_handler(request_rec *r)
      */
     if (ap_should_client_block(r)) {
        int dbsize, len_read;
-        apr_ssize_t bytes_written, bytes_to_write;
+        apr_size_t bytes_written, bytes_to_write;
         apr_status_t rv;
 
        if (conf->logname) {

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index ac878f780a4de03460c1e7b10559536fc4b807e2..e8f00c15ca8f644ab6f62f083a56a9feb0516685 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -398,7 +398,7 @@ static void send_req(int fd, request_rec *r, char *argv0, char **env)
 #endif 
 } 
 
-static int cgid_server_child(int sd) 
+static void cgid_server_child(int sd) 
 { 
     char *argv0; 
     char *filename; 

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 72c91569e5cee5b2ba6b3c56b36df9fe60dbe141..53c0c83b9ac11faa6acb392e8dd96587af568c8e 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -2927,7 +2927,7 @@ static char *lookup_map_program(request_rec *r, apr_file_t *fpin,
     char buf[LONG_STRING_LEN];
     char c;
     int i;
-    apr_ssize_t nbytes;
+    apr_size_t nbytes;
 
 #ifndef NO_WRITEV
     struct iovec iova[2];
@@ -3164,7 +3164,7 @@ static void rewritelog(request_rec *r, int level, const char *text, ...)
     char redir[20];
     va_list ap;
     int i;
-    apr_ssize_t nbytes;
+    apr_size_t nbytes;
     request_rec *req;
     char *ruser;
     const char *rhost;