Fix up various compiler warnings.
* flood_net_ssl.c, flood_net_ssl.h
(ssl_read_socket): Switch from int to apr_size_t.
* flood_socket_keepalive.c
(keepalive_read_chunk, keepalive_load_resp, keepalive_recv_resp): Switch
from int to apr_size_t.
* flood_round_robin.c
(round_robin_postprocess): Switch from int to apr_size_t.
* flood_net.c, flood_net.h
(read_socket): Switch from int to apr_size_t.
git-svn-id: https://svn.apache.org/repos/asf/httpd/flood/trunk@696055 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/flood_net.c b/flood_net.c
index 44f8047..0da45a9 100644
--- a/flood_net.c
+++ b/flood_net.c
@@ -100,7 +100,7 @@
apr_socket_close(s->socket);
}
-apr_status_t read_socket(flood_socket_t *s, char *buf, int *buflen)
+apr_status_t read_socket(flood_socket_t *s, char *buf, apr_size_t *buflen)
{
apr_status_t e;
apr_int32_t socketsRead;
diff --git a/flood_net.h b/flood_net.h
index 412b966..3170b42 100644
--- a/flood_net.h
+++ b/flood_net.h
@@ -34,7 +34,7 @@
apr_status_t *status);
void close_socket(flood_socket_t *s);
apr_status_t write_socket(flood_socket_t *s, request_t *r);
-apr_status_t read_socket(flood_socket_t *s, char *buf, int *buflen);
+apr_status_t read_socket(flood_socket_t *s, char *buf, apr_size_t *buflen);
apr_status_t check_socket(flood_socket_t *s, apr_pool_t *pool);
#endif /* __flood_socket_h */
diff --git a/flood_net_ssl.c b/flood_net_ssl.c
index 17c99ba..cd6f6d5 100644
--- a/flood_net_ssl.c
+++ b/flood_net_ssl.c
@@ -237,7 +237,7 @@
close_socket(s->socket);
}
-apr_status_t ssl_read_socket(ssl_socket_t *s, char *buf, int *buflen)
+apr_status_t ssl_read_socket(ssl_socket_t *s, char *buf, apr_size_t *buflen)
{
apr_status_t e;
int sslError;
@@ -340,7 +340,7 @@
return APR_ENOTIMPL;
}
-apr_status_t ssl_read_socket(ssl_socket_t *s, char *buf, int *buflen)
+apr_status_t ssl_read_socket(ssl_socket_t *s, char *buf, apr_size_t *buflen)
{
return APR_ENOTIMPL;
}
diff --git a/flood_net_ssl.h b/flood_net_ssl.h
index badac80..452bc10 100644
--- a/flood_net_ssl.h
+++ b/flood_net_ssl.h
@@ -29,6 +29,6 @@
apr_status_t *status);
void ssl_close_socket(ssl_socket_t *s);
apr_status_t ssl_write_socket(ssl_socket_t *s, request_t *r);
-apr_status_t ssl_read_socket(ssl_socket_t *s, char *buf, int *buflen);
+apr_status_t ssl_read_socket(ssl_socket_t *s, char *buf, apr_size_t *buflen);
#endif /* __flood_net_socket_h */
diff --git a/flood_round_robin.c b/flood_round_robin.c
index 0d524ef..097373f 100644
--- a/flood_round_robin.c
+++ b/flood_round_robin.c
@@ -1215,7 +1215,7 @@
while (wbytes < nbytes) {
- int bytes;
+ apr_size_t bytes;
apr_int32_t nrdes;
const apr_pollfd_t *ardes = NULL;
const apr_pollfd_t *rdes;
diff --git a/flood_socket_keepalive.c b/flood_socket_keepalive.c
index 128c870..c9eacc9 100644
--- a/flood_socket_keepalive.c
+++ b/flood_socket_keepalive.c
@@ -169,7 +169,7 @@
do {
/* Sentinel value */
- int blen = 0;
+ apr_size_t blen = 0;
char *start_chunk, *end_chunk, *b;
/* Always reset the b. */
@@ -276,7 +276,8 @@
apr_size_t remaining, apr_pool_t *pool)
{
/* Ugh, we want everything. */
- int currentalloc, remain, i;
+ int currentalloc, remain;
+ apr_size_t i;
char *cp, *op, b[MAX_DOC_LENGTH];
apr_status_t status;
@@ -338,7 +339,7 @@
keepalive_socket_t *ksock = (keepalive_socket_t *)sock;
char *cl, *ecl, cls[17];
char *current_line;
- int i;
+ apr_size_t i;
response_t *new_resp;
apr_status_t status;
long content_length = 0, chunk_length;
