diff options
| author | Ryan Bloom <rbb@apache.org> | 2000-11-07 21:21:55 +0100 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2000-11-07 21:21:55 +0100 |
| commit | 134dbc9e7a3f1c64dbe9e7844257ed899193d83f (patch) | |
| tree | 42fcf69db132c64ba85034ae41b49676e16030eb /server | |
| parent | Remove the original ap_send_fd code. The filters have been working for a (diff) | |
| download | apache2-134dbc9e7a3f1c64dbe9e7844257ed899193d83f.tar.xz apache2-134dbc9e7a3f1c64dbe9e7844257ed899193d83f.zip | |
Convert a lot of apr_ssize_t to apr_size_t. We don't ever accept or return
signed values in these integers, and we return the error codes directly,
so we should always report the number of bytes read/written correctly. If
we have an error, that is 0 bytes. If that is true, then using signed
values doesn't make any sense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86857 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/connection.c | 2 | ||||
| -rw-r--r-- | server/rfc1413.c | 4 | ||||
| -rw-r--r-- | server/util_md5.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/server/connection.c b/server/connection.c index 27812d58d5..b6a1b1a53c 100644 --- a/server/connection.c +++ b/server/connection.c @@ -156,7 +156,7 @@ void ap_lingering_close(conn_rec *c) { char dummybuf[512]; apr_time_t start; - apr_ssize_t nbytes; + apr_size_t nbytes; apr_status_t rc; int timeout; diff --git a/server/rfc1413.c b/server/rfc1413.c index 500553334c..1008705723 100644 --- a/server/rfc1413.c +++ b/server/rfc1413.c @@ -158,7 +158,7 @@ static int get_rfc1413(apr_socket_t *sock, const char *local_ip, /* send query to server. Handle short write. */ i = 0; while(i < strlen(buffer)) { - apr_ssize_t j = strlen(buffer + i); + apr_size_t j = strlen(buffer + i); apr_status_t status; status = apr_send(sock, buffer+i, &j); if (status != APR_SUCCESS && !APR_STATUS_IS_EINTR(status)) { @@ -184,7 +184,7 @@ static int get_rfc1413(apr_socket_t *sock, const char *local_ip, * this allows it to work on both ASCII and EBCDIC machines. */ while((cp = strchr(buffer, '\012')) == NULL && i < sizeof(buffer) - 1) { - apr_ssize_t j = sizeof(buffer) - 1 - i; + apr_size_t j = sizeof(buffer) - 1 - i; apr_status_t status; status = apr_recv(sock, buffer+i, &j); if (status != APR_SUCCESS && !APR_STATUS_IS_EINTR(status)) { diff --git a/server/util_md5.c b/server/util_md5.c index 03cbb104b6..b1957a8427 100644 --- a/server/util_md5.c +++ b/server/util_md5.c @@ -200,7 +200,7 @@ AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile) apr_md5_ctx_t context; unsigned char buf[1000]; long length = 0; - apr_ssize_t nbytes; + apr_size_t nbytes; apr_off_t offset = 0L; apr_MD5Init(&context); |