From 4b7bc4b099d57436f074c28754826d84b0a8d06f Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Mon, 9 Oct 2000 19:03:27 +0000 Subject: [PATCH] Fix some types in the latest tree, so that AIX builds cleanly again. Submitted by: Victor J. Orlikowski Reviewed by: Ryan Bloom git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86484 13f79535-47bb-0310-9956-ffa450edef68 --- modules/generators/mod_cgid.c | 2 +- modules/http/http_core.c | 5 ++--- modules/http/http_protocol.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c index f4bbb54780..a07c37fe46 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -841,7 +841,7 @@ static int cgid_handler(request_rec *r) char **env; struct sockaddr_un unix_addr; apr_file_t *tempsock = NULL; - int nbytes; + apr_ssize_t nbytes; if (r->method_number == M_OPTIONS) { /* 99 out of 100 cgid scripts, this is all they support */ diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 8ecf2a1dc5..8282345c2c 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -2541,7 +2541,7 @@ static const char *set_limit_nproc(cmd_parms *cmd, void *conf_, #endif static apr_status_t writev_it_all(apr_socket_t *s, struct iovec *vec, int nvec, - apr_size_t len, apr_ssize_t *nbytes) + apr_size_t len, apr_size_t *nbytes) { apr_size_t bytes_written = 0; apr_status_t rv; @@ -3274,8 +3274,7 @@ static int core_input_filter(ap_filter_t *f, ap_bucket_brigade *b) */ #define ASCII_LF '\012' char *buff; - apr_size_t length = HUGE_STRING_LEN; - apr_size_t templen; + apr_ssize_t length = HUGE_STRING_LEN, templen; apr_socket_t *csock = NULL; apr_status_t rv; ap_bucket *e; diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index a97f362e9d..282842102c 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -866,7 +866,7 @@ int http_filter(ap_filter_t *f, ap_bucket_brigade *b) #define ASCII_LF '\012' ap_bucket *e; char *buff; - int length; + apr_ssize_t length; char *pos; int state = 0; http_ctx_t *ctx = f->ctx; @@ -963,7 +963,7 @@ static int getline(char *s, int n, conn_rec *c, int fold) const char *temp; int retval; int total = 0; - int length; + apr_ssize_t length; ap_bucket_brigade *b; ap_bucket *e; -- 2.40.0