You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2008/09/16 23:01:30 UTC
svn commit: r696055 - in /httpd/flood/trunk: flood_net.c flood_net.h
flood_net_ssl.c flood_net_ssl.h flood_round_robin.c flood_socket_keepalive.c
Author: jerenkrantz
Date: Tue Sep 16 14:01:30 2008
New Revision: 696055
URL: http://svn.apache.org/viewvc?rev=696055&view=rev
Log:
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.
Modified:
httpd/flood/trunk/flood_net.c
httpd/flood/trunk/flood_net.h
httpd/flood/trunk/flood_net_ssl.c
httpd/flood/trunk/flood_net_ssl.h
httpd/flood/trunk/flood_round_robin.c
httpd/flood/trunk/flood_socket_keepalive.c
Modified: httpd/flood/trunk/flood_net.c
URL: http://svn.apache.org/viewvc/httpd/flood/trunk/flood_net.c?rev=696055&r1=696054&r2=696055&view=diff
==============================================================================
--- httpd/flood/trunk/flood_net.c (original)
+++ httpd/flood/trunk/flood_net.c Tue Sep 16 14:01:30 2008
@@ -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;
Modified: httpd/flood/trunk/flood_net.h
URL: http://svn.apache.org/viewvc/httpd/flood/trunk/flood_net.h?rev=696055&r1=696054&r2=696055&view=diff
==============================================================================
--- httpd/flood/trunk/flood_net.h (original)
+++ httpd/flood/trunk/flood_net.h Tue Sep 16 14:01:30 2008
@@ -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 */
Modified: httpd/flood/trunk/flood_net_ssl.c
URL: http://svn.apache.org/viewvc/httpd/flood/trunk/flood_net_ssl.c?rev=696055&r1=696054&r2=696055&view=diff
==============================================================================
--- httpd/flood/trunk/flood_net_ssl.c (original)
+++ httpd/flood/trunk/flood_net_ssl.c Tue Sep 16 14:01:30 2008
@@ -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;
}
Modified: httpd/flood/trunk/flood_net_ssl.h
URL: http://svn.apache.org/viewvc/httpd/flood/trunk/flood_net_ssl.h?rev=696055&r1=696054&r2=696055&view=diff
==============================================================================
--- httpd/flood/trunk/flood_net_ssl.h (original)
+++ httpd/flood/trunk/flood_net_ssl.h Tue Sep 16 14:01:30 2008
@@ -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 */
Modified: httpd/flood/trunk/flood_round_robin.c
URL: http://svn.apache.org/viewvc/httpd/flood/trunk/flood_round_robin.c?rev=696055&r1=696054&r2=696055&view=diff
==============================================================================
--- httpd/flood/trunk/flood_round_robin.c (original)
+++ httpd/flood/trunk/flood_round_robin.c Tue Sep 16 14:01:30 2008
@@ -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;
Modified: httpd/flood/trunk/flood_socket_keepalive.c
URL: http://svn.apache.org/viewvc/httpd/flood/trunk/flood_socket_keepalive.c?rev=696055&r1=696054&r2=696055&view=diff
==============================================================================
--- httpd/flood/trunk/flood_socket_keepalive.c (original)
+++ httpd/flood/trunk/flood_socket_keepalive.c Tue Sep 16 14:01:30 2008
@@ -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;