summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--file_io/os2/readwrite.c2
-rw-r--r--file_io/win32/filepath.c2
-rw-r--r--i18n/unix/xlate.c10
-rw-r--r--misc/win32/internal.c10
-rw-r--r--misc/win32/start.c6
-rw-r--r--network_io/beos/sendrecv.c6
-rw-r--r--network_io/os2/sendrecv.c4
-rw-r--r--network_io/os2/sendrecv_udp.c4
-rw-r--r--network_io/unix/inet_ntop.c2
-rw-r--r--network_io/unix/sendrecv.c18
-rw-r--r--passwd/apr_getpass.c2
-rw-r--r--passwd/apr_md5.c2
-rw-r--r--strings/apr_strings.c2
-rw-r--r--test/testmd5.c2
14 files changed, 36 insertions, 36 deletions
diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c
index faeee1bb3..1cf6cb836 100644
--- a/file_io/os2/readwrite.c
+++ b/file_io/os2/readwrite.c
@@ -325,7 +325,7 @@ APR_DECLARE(apr_status_t) apr_file_flush(apr_file_t *thefile)
APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, apr_file_t *thefile)
{
- size_t readlen;
+ apr_size_t readlen;
apr_status_t rv = APR_SUCCESS;
int i;
diff --git a/file_io/win32/filepath.c b/file_io/win32/filepath.c
index 42dfbe5ce..13222b232 100644
--- a/file_io/win32/filepath.c
+++ b/file_io/win32/filepath.c
@@ -871,7 +871,7 @@ APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath,
path[keptlen + seglen] = '\0';
if ((rv = apr_lstat(&finfo, path, APR_FINFO_TYPE | APR_FINFO_NAME, p))
== APR_SUCCESS) {
- size_t namelen = strlen(finfo.name);
+ apr_size_t namelen = strlen(finfo.name);
#if defined(OS2) || defined(NETWARE) /* only has case folding, never aliases that change the length */
diff --git a/i18n/unix/xlate.c b/i18n/unix/xlate.c
index 7ded783de..06644cb29 100644
--- a/i18n/unix/xlate.c
+++ b/i18n/unix/xlate.c
@@ -191,9 +191,9 @@ static void check_sbcs(apr_xlate_t *convset)
char inbuf[256], outbuf[256];
char *inbufptr = inbuf;
char *outbufptr = outbuf;
- size_t inbytes_left, outbytes_left;
+ apr_size_t inbytes_left, outbytes_left;
int i;
- size_t translated;
+ apr_size_t translated;
for (i = 0; i < sizeof(inbuf); i++) {
inbuf[i] = i;
@@ -202,7 +202,7 @@ static void check_sbcs(apr_xlate_t *convset)
inbytes_left = outbytes_left = sizeof(inbuf);
translated = iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
&inbytes_left, &outbufptr, &outbytes_left);
- if (translated != (size_t) -1 &&
+ if (translated != (apr_size_t) -1 &&
inbytes_left == 0 &&
outbytes_left == 0) {
/* hurray... this is simple translation; save the table,
@@ -288,7 +288,7 @@ apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf,
{
apr_status_t status = APR_SUCCESS;
#ifdef HAVE_ICONV
- size_t translated;
+ apr_size_t translated;
if (convset->ich != (iconv_t)-1) {
const char *inbufptr = inbuf;
@@ -308,7 +308,7 @@ apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf,
* the last input character is incomplete)
* c) the error condition where the input is invalid
*/
- if (translated == (size_t)-1) {
+ if (translated == (apr_size_t)-1) {
switch (errno) {
case E2BIG: /* out of space on output */
status = 0; /* change table lookup code below if you
diff --git a/misc/win32/internal.c b/misc/win32/internal.c
index 4ba6f70ba..df34a8675 100644
--- a/misc/win32/internal.c
+++ b/misc/win32/internal.c
@@ -79,7 +79,7 @@
int apr_wastrtoastr(char const * const * *retarr,
wchar_t const * const *arr, int args)
{
- size_t elesize = 0;
+ apr_size_t elesize = 0;
char **newarr;
char *elements;
char *ele;
@@ -95,7 +95,7 @@ int apr_wastrtoastr(char const * const * *retarr,
for (arg = 0; arg < args; ++arg) {
newarr[arg] = (void*)(wcslen(arr[arg]) + 1);
- elesize += (size_t)newarr[arg];
+ elesize += (apr_size_t)newarr[arg];
}
/* This is a safe max allocation, we will realloc after
@@ -108,8 +108,8 @@ int apr_wastrtoastr(char const * const * *retarr,
_CRT_BLOCK, __FILE__, __LINE__);
for (arg = 0; arg < args; ++arg) {
- size_t len = (size_t)newarr[arg];
- size_t newlen = elesize;
+ apr_size_t len = (apr_size_t)newarr[arg];
+ apr_size_t newlen = elesize;
newarr[arg] = ele;
(void)apr_conv_ucs2_to_utf8(arr[arg], &len,
@@ -129,7 +129,7 @@ int apr_wastrtoastr(char const * const * *retarr,
_CRT_BLOCK, __FILE__, __LINE__);
if (ele != elements) {
- size_t diff = ele - elements;
+ apr_size_t diff = ele - elements;
for (arg = 0; arg < args; ++arg) {
newarr[arg] += diff;
}
diff --git a/misc/win32/start.c b/misc/win32/start.c
index 48c588cc3..cd83860dd 100644
--- a/misc/win32/start.c
+++ b/misc/win32/start.c
@@ -79,9 +79,9 @@ static int warrsztoastr(const char * const * *retarr,
const wchar_t * arrsz, int args)
{
const apr_wchar_t *wch;
- size_t totlen;
- size_t newlen;
- size_t wsize;
+ apr_size_t totlen;
+ apr_size_t newlen;
+ apr_size_t wsize;
char **newarr;
int arg;
diff --git a/network_io/beos/sendrecv.c b/network_io/beos/sendrecv.c
index b520b3ae1..3762befbb 100644
--- a/network_io/beos/sendrecv.c
+++ b/network_io/beos/sendrecv.c
@@ -97,7 +97,7 @@ apr_status_t apr_wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
do {
rv = send(sock->socketdes, buf, (*len), 0);
@@ -170,7 +170,7 @@ APR_DECLARE(apr_status_t) apr_sendv(apr_socket_t * sock, const struct iovec *vec
APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
apr_int32_t flags, const char *buf, apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
do {
rv = sendto(sock->socketdes, buf, (*len), flags,
@@ -204,7 +204,7 @@ APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
apr_int32_t flags, char *buf,
apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
if (from == NULL){
return APR_ENOMEM;
diff --git a/network_io/os2/sendrecv.c b/network_io/os2/sendrecv.c
index a059fb3b0..e3631dadf 100644
--- a/network_io/os2/sendrecv.c
+++ b/network_io/os2/sendrecv.c
@@ -61,7 +61,7 @@
APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
int fds, err = 0;
do {
@@ -100,7 +100,7 @@ APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf, apr_size
APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
int fds, err = 0;
do {
diff --git a/network_io/os2/sendrecv_udp.c b/network_io/os2/sendrecv_udp.c
index 1cf97b1b4..480d8c41e 100644
--- a/network_io/os2/sendrecv_udp.c
+++ b/network_io/os2/sendrecv_udp.c
@@ -84,7 +84,7 @@ apr_status_t apr_wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
apr_int32_t flags, const char *buf, apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
int serrno;
do {
@@ -123,7 +123,7 @@ APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
apr_int32_t flags, char *buf,
apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
int serrno;
do {
diff --git a/network_io/unix/inet_ntop.c b/network_io/unix/inet_ntop.c
index 15e2c4521..9cd78852e 100644
--- a/network_io/unix/inet_ntop.c
+++ b/network_io/unix/inet_ntop.c
@@ -235,7 +235,7 @@ inet_ntop6(const unsigned char *src, char *dst, apr_size_t size)
/*
* Check for overflow, copy, and we're done.
*/
- if ((size_t)(tp - tmp) > size) {
+ if ((apr_size_t)(tp - tmp) > size) {
errno = ENOSPC;
return (NULL);
}
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
index 172d1fe98..c2b9dd5a3 100644
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
@@ -99,7 +99,7 @@ apr_status_t apr_wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
if (sock->netmask & APR_INCOMPLETE_WRITE) {
sock->netmask &= ~APR_INCOMPLETE_WRITE;
@@ -138,7 +138,7 @@ do_select:
apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
apr_status_t arv;
if (sock->netmask & APR_INCOMPLETE_READ) {
@@ -181,7 +181,7 @@ do_select:
apr_status_t apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
apr_int32_t flags, const char *buf, apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
do {
rv = sendto(sock->socketdes, buf, (*len), flags,
@@ -215,7 +215,7 @@ apr_status_t apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
apr_int32_t flags, char *buf,
apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
do {
rv = recvfrom(sock->socketdes, buf, (*len), flags,
@@ -463,7 +463,7 @@ static int include_hdrs_in_length(void)
static api_e api;
int kernel_version;
- size_t kernel_version_size;
+ apr_size_t kernel_version_size;
if (api != UNKNOWN) {
return (api == OLD);
@@ -495,7 +495,7 @@ apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
off_t nbytes = 0;
int rv, i;
struct sf_hdtr headerstruct;
- size_t bytes_to_send = *len;
+ apr_size_t bytes_to_send = *len;
/* Ignore flags for now. */
flags = 0;
@@ -625,8 +625,8 @@ apr_status_t apr_sendfile(apr_socket_t *sock, apr_file_t *file,
apr_int32_t flags)
{
int i;
- ssize_t rc;
- size_t nbytes = *len, headerlen, trailerlen;
+ apr_ssize_t rc;
+ apr_size_t nbytes = *len, headerlen, trailerlen;
struct iovec hdtrarray[2];
char *headerbuf, *trailerbuf;
@@ -902,7 +902,7 @@ apr_status_t apr_sendfile(apr_socket_t *sock, apr_file_t *file,
apr_int32_t flags)
{
apr_status_t rv, arv;
- size_t nbytes;
+ apr_size_t nbytes;
sendfilevec_t *sfv;
int vecs, curvec, i, repeat;
apr_size_t requested_len = 0;
diff --git a/passwd/apr_getpass.c b/passwd/apr_getpass.c
index 199f4fc26..cf84b7f1d 100644
--- a/passwd/apr_getpass.c
+++ b/passwd/apr_getpass.c
@@ -223,7 +223,7 @@ static char *getpass(const char *prompt)
* smaller than our own.
*/
-APR_DECLARE(apr_status_t) apr_password_get(const char *prompt, char *pwbuf, size_t *bufsiz)
+APR_DECLARE(apr_status_t) apr_password_get(const char *prompt, char *pwbuf, apr_size_t *bufsiz)
{
char *pw_got = getpass(prompt);
if (!pw_got)
diff --git a/passwd/apr_md5.c b/passwd/apr_md5.c
index 58d1119ee..958400dbc 100644
--- a/passwd/apr_md5.c
+++ b/passwd/apr_md5.c
@@ -520,7 +520,7 @@ static void to64(char *s, unsigned long v, int n)
}
APR_DECLARE(apr_status_t) apr_md5_encode(const char *pw, const char *salt,
- char *result, size_t nbytes)
+ char *result, apr_size_t nbytes)
{
/*
* Minimum size is 8 bytes for salt, plus 1 for the trailing NUL,
diff --git a/strings/apr_strings.c b/strings/apr_strings.c
index 9c6af2f0d..4dd000d6b 100644
--- a/strings/apr_strings.c
+++ b/strings/apr_strings.c
@@ -71,7 +71,7 @@
APR_DECLARE(char *) apr_pstrdup(apr_pool_t *a, const char *s)
{
char *res;
- size_t len;
+ apr_size_t len;
if (s == NULL) {
return NULL;
diff --git a/test/testmd5.c b/test/testmd5.c
index 1803ddab4..80aad42b3 100644
--- a/test/testmd5.c
+++ b/test/testmd5.c
@@ -86,7 +86,7 @@ struct testcase testcases[] =
"\xd1\xa1\xc0\x97\x8a\x60\xbb\xfb\x2a\x25\x46\x9d\xa5\xae\xd0\xb0"}
};
-static void try(const void *buf, size_t bufLen, apr_xlate_t *xlate,
+static void try(const void *buf, apr_size_t bufLen, apr_xlate_t *xlate,
const void *digest)
{
int i;
View Lorry Controller Status