You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by or...@apache.org on 2002/07/10 08:01:15 UTC
cvs commit: httpd-2.0/test test_limits.c time-sem.c
orlikowski 2002/07/09 23:01:14
Modified: modules/aaa mod_auth_digest.c
modules/dav/fs dbm.c
modules/dav/main util.c
modules/filters mod_include.c
modules/mappers mod_negotiation.c mod_rewrite.c
modules/proxy proxy_ftp.c proxy_util.c
server log.c vhost.c
file_io/os2 readwrite.c
file_io/win32 filepath.c
i18n/unix xlate.c
misc/win32 internal.c start.c
network_io/beos sendrecv.c
network_io/os2 sendrecv.c sendrecv_udp.c
network_io/unix inet_ntop.c sendrecv.c
passwd apr_getpass.c apr_md5.c
strings apr_strings.c
test testmd5.c
support htdigest.c htpasswd.c
test test_limits.c time-sem.c
Log:
Continue the Bill Rowe apr_size_t crusade.
Revision Changes Path
1.68 +3 -2 httpd-2.0/modules/aaa/mod_auth_digest.c
Index: mod_auth_digest.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mod_auth_digest.c 5 Jul 2002 00:53:12 -0000 1.67
+++ mod_auth_digest.c 10 Jul 2002 06:01:09 -0000 1.68
@@ -862,7 +862,7 @@
static int get_digest_rec(request_rec *r, digest_header_rec *resp)
{
const char *auth_line;
- size_t l;
+ apr_size_t l;
int vk = 0, vv = 0;
char *key, *value;
@@ -1209,7 +1209,8 @@
static const char *guess_domain(apr_pool_t *p, const char *uri,
const char *filename, const char *dir)
{
- size_t u_len = strlen(uri), f_len = strlen(filename), d_len = strlen(dir);
+ apr_size_t u_len = strlen(uri), f_len = strlen(filename),
+ d_len = strlen(dir);
const char *u, *f;
1.25 +1 -2 httpd-2.0/modules/dav/fs/dbm.c
Index: dbm.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/fs/dbm.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dbm.c 6 Apr 2002 00:19:19 -0000 1.24
+++ dbm.c 10 Jul 2002 06:01:10 -0000 1.25
@@ -331,8 +331,7 @@
static apr_datum_t dav_build_key(dav_db *db, const dav_prop_name *name)
{
char nsbuf[20];
- size_t l_ns;
- size_t l_name = strlen(name->name);
+ apr_size_t l_ns, l_name = strlen(name->name);
apr_datum_t key = { 0 };
/*
1.41 +4 -4 httpd-2.0/modules/dav/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/main/util.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- util.c 6 Jul 2002 20:04:38 -0000 1.40
+++ util.c 10 Jul 2002 06:01:10 -0000 1.41
@@ -162,7 +162,7 @@
DAV_DECLARE(void) dav_buffer_append(apr_pool_t *p, dav_buffer *pbuf,
const char *str)
{
- size_t len = strlen(str);
+ apr_size_t len = strlen(str);
dav_check_bufsize(p, pbuf, len + 1);
memcpy(pbuf->buf + pbuf->cur_len, str, len + 1);
@@ -173,7 +173,7 @@
DAV_DECLARE(void) dav_buffer_place(apr_pool_t *p, dav_buffer *pbuf,
const char *str)
{
- size_t len = strlen(str);
+ apr_size_t len = strlen(str);
dav_check_bufsize(p, pbuf, len + 1);
memcpy(pbuf->buf + pbuf->cur_len, str, len + 1);
@@ -541,7 +541,7 @@
/* add_if_resource returns a new if_header, linking it to next_ih.
*/
static dav_if_header *dav_add_if_resource(apr_pool_t *p, dav_if_header *next_ih,
- const char *uri, size_t uri_len)
+ const char *uri, apr_size_t uri_len)
{
dav_if_header *ih;
@@ -625,7 +625,7 @@
char *list;
const char *state_token;
const char *uri = NULL; /* scope of current production; NULL=no-tag */
- size_t uri_len = 0;
+ apr_size_t uri_len = 0;
dav_if_header *ih = NULL;
apr_uri_t parsed_uri;
const dav_hooks_locks *locks_hooks = DAV_GET_HOOKS_LOCKS(r);
1.231 +1 -1 httpd-2.0/modules/filters/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- mod_include.c 28 Jun 2002 08:40:24 -0000 1.230
+++ mod_include.c 10 Jul 2002 06:01:10 -0000 1.231
@@ -1066,7 +1066,7 @@
char *end_of_var_name; /* end of var name + 1 */
const char *expansion, *temp_end, *val;
char tmp_store;
- size_t l;
+ apr_size_t l;
/* guess that the expansion won't happen */
expansion = in - 1;
1.103 +1 -1 httpd-2.0/modules/mappers/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- mod_negotiation.c 17 May 2002 11:24:16 -0000 1.102
+++ mod_negotiation.c 10 Jul 2002 06:01:10 -0000 1.103
@@ -1519,7 +1519,7 @@
float fiddle_q = 0.0f;
int any_match_on_star = 0;
int i, j;
- size_t alen, longest_lang_range_len;
+ apr_size_t alen, longest_lang_range_len;
for (j = 0; j < variant->content_languages->nelts; ++j) {
p = NULL;
1.124 +2 -2 httpd-2.0/modules/mappers/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- mod_rewrite.c 22 Jun 2002 03:36:57 -0000 1.123
+++ mod_rewrite.c 10 Jul 2002 06:01:10 -0000 1.124
@@ -2328,7 +2328,7 @@
backrefinfo *briRR, backrefinfo *briRC)
{
char *inp, *outp;
- size_t span, space;
+ apr_size_t span, space;
/*
* for security reasons this expansion must be performed in a
@@ -2907,7 +2907,7 @@
char line[1024];
char *value = NULL;
char *cpT;
- size_t skip;
+ apr_size_t skip;
char *curkey;
char *curval;
1.126 +1 -1 httpd-2.0/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- proxy_ftp.c 6 Jul 2002 20:04:38 -0000 1.125
+++ proxy_ftp.c 10 Jul 2002 06:01:11 -0000 1.126
@@ -514,7 +514,7 @@
}
{
- size_t n = strlen(ctx->buffer);
+ apr_size_t n = strlen(ctx->buffer);
if (ctx->buffer[n-1] == CRLF[1]) /* strip trailing '\n' */
ctx->buffer[--n] = '\0';
if (ctx->buffer[n-1] == CRLF[0]) /* strip trailing '\r' if present */
1.95 +1 -1 httpd-2.0/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_util.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- proxy_util.c 23 Jun 2002 06:06:25 -0000 1.94
+++ proxy_util.c 10 Jul 2002 06:01:11 -0000 1.95
@@ -1028,7 +1028,7 @@
* (EBCDIC) machines either.
*/
PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb,
- char *buff, size_t bufflen, int *eos)
+ char *buff, apr_size_t bufflen, int *eos)
{
apr_bucket *e;
apr_status_t rv;
1.125 +1 -1 httpd-2.0/server/log.c
Index: log.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/log.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- log.c 9 Jun 2002 03:44:03 -0000 1.124
+++ log.c 10 Jul 2002 06:01:11 -0000 1.125
@@ -387,7 +387,7 @@
const char *fmt, va_list args)
{
char errstr[MAX_STRING_LEN];
- size_t len, errstrlen;
+ apr_size_t len, errstrlen;
apr_file_t *logf = NULL;
const char *referer;
int level_and_mask = level & APLOG_LEVELMASK;
1.77 +1 -1 httpd-2.0/server/vhost.c
Index: vhost.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/vhost.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- vhost.c 23 Jun 2002 08:10:49 -0000 1.76
+++ vhost.c 10 Jul 2002 06:01:11 -0000 1.77
@@ -185,7 +185,7 @@
server_addr_rec *sar;
char *w, *host, *scope_id;
int wild_port;
- size_t wlen;
+ apr_size_t wlen;
apr_port_t port;
apr_status_t rv;
1.51 +1 -1 apr/file_io/os2/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/readwrite.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- readwrite.c 28 Jun 2002 14:04:35 -0000 1.50
+++ readwrite.c 10 Jul 2002 06:01:12 -0000 1.51
@@ -325,7 +325,7 @@
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;
1.25 +1 -1 apr/file_io/win32/filepath.c
Index: filepath.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/filepath.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- filepath.c 3 May 2002 15:34:45 -0000 1.24
+++ filepath.c 10 Jul 2002 06:01:12 -0000 1.25
@@ -871,7 +871,7 @@
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 */
1.27 +5 -5 apr/i18n/unix/xlate.c
Index: xlate.c
===================================================================
RCS file: /home/cvs/apr/i18n/unix/xlate.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xlate.c 8 Jun 2002 18:53:13 -0000 1.26
+++ xlate.c 10 Jul 2002 06:01:12 -0000 1.27
@@ -191,9 +191,9 @@
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 @@
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 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 @@
* 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
1.5 +5 -5 apr/misc/win32/internal.c
Index: internal.c
===================================================================
RCS file: /home/cvs/apr/misc/win32/internal.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- internal.c 13 Apr 2002 19:27:24 -0000 1.4
+++ internal.c 10 Jul 2002 06:01:12 -0000 1.5
@@ -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 @@
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 @@
_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 @@
_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;
}
1.39 +3 -3 apr/misc/win32/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apr/misc/win32/start.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- start.c 9 Jul 2002 22:52:06 -0000 1.38
+++ start.c 10 Jul 2002 06:01:12 -0000 1.39
@@ -79,9 +79,9 @@
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;
1.26 +3 -3 apr/network_io/beos/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apr/network_io/beos/sendrecv.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sendrecv.c 13 Mar 2002 20:39:24 -0000 1.25
+++ sendrecv.c 10 Jul 2002 06:01:12 -0000 1.26
@@ -97,7 +97,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;
do {
rv = send(sock->socketdes, buf, (*len), 0);
@@ -170,7 +170,7 @@
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_int32_t flags, char *buf,
apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
if (from == NULL){
return APR_ENOMEM;
1.24 +2 -2 apr/network_io/os2/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apr/network_io/os2/sendrecv.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sendrecv.c 8 May 2002 08:33:10 -0000 1.23
+++ sendrecv.c 10 Jul 2002 06:01:12 -0000 1.24
@@ -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_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
int fds, err = 0;
do {
1.5 +2 -2 apr/network_io/os2/sendrecv_udp.c
Index: sendrecv_udp.c
===================================================================
RCS file: /home/cvs/apr/network_io/os2/sendrecv_udp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sendrecv_udp.c 13 Mar 2002 20:39:24 -0000 1.4
+++ sendrecv_udp.c 10 Jul 2002 06:01:12 -0000 1.5
@@ -84,7 +84,7 @@
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_int32_t flags, char *buf,
apr_size_t *len)
{
- ssize_t rv;
+ apr_ssize_t rv;
int serrno;
do {
1.18 +1 -1 apr/network_io/unix/inet_ntop.c
Index: inet_ntop.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/inet_ntop.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- inet_ntop.c 5 May 2002 06:33:37 -0000 1.17
+++ inet_ntop.c 10 Jul 2002 06:01:12 -0000 1.18
@@ -235,7 +235,7 @@
/*
* 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);
}
1.86 +9 -9 apr/network_io/unix/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/sendrecv.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sendrecv.c 2 Jul 2002 21:33:43 -0000 1.85
+++ sendrecv.c 10 Jul 2002 06:01:12 -0000 1.86
@@ -99,7 +99,7 @@
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 @@
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 @@
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_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 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 @@
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_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_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;
1.21 +1 -1 apr/passwd/apr_getpass.c
Index: apr_getpass.c
===================================================================
RCS file: /home/cvs/apr/passwd/apr_getpass.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- apr_getpass.c 13 Mar 2002 20:39:26 -0000 1.20
+++ apr_getpass.c 10 Jul 2002 06:01:13 -0000 1.21
@@ -223,7 +223,7 @@
* 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)
1.21 +1 -1 apr/passwd/apr_md5.c
Index: apr_md5.c
===================================================================
RCS file: /home/cvs/apr/passwd/apr_md5.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- apr_md5.c 8 Jun 2002 18:53:13 -0000 1.20
+++ apr_md5.c 10 Jul 2002 06:01:13 -0000 1.21
@@ -520,7 +520,7 @@
}
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,
1.29 +1 -1 apr/strings/apr_strings.c
Index: apr_strings.c
===================================================================
RCS file: /home/cvs/apr/strings/apr_strings.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apr_strings.c 28 Jun 2002 21:05:14 -0000 1.28
+++ apr_strings.c 10 Jul 2002 06:01:13 -0000 1.29
@@ -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;
1.14 +1 -1 apr/test/testmd5.c
Index: testmd5.c
===================================================================
RCS file: /home/cvs/apr/test/testmd5.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- testmd5.c 13 Mar 2002 20:39:27 -0000 1.13
+++ testmd5.c 10 Jul 2002 06:01:13 -0000 1.14
@@ -86,7 +86,7 @@
"\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;
1.33 +1 -1 httpd-2.0/support/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/htdigest.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- htdigest.c 10 May 2002 18:20:29 -0000 1.32
+++ htdigest.c 10 Jul 2002 06:01:13 -0000 1.33
@@ -156,7 +156,7 @@
char pwin[MAX_STRING_LEN];
char pwv[MAX_STRING_LEN];
unsigned int i;
- size_t len = sizeof(pwin);
+ apr_size_t len = sizeof(pwin);
if (apr_password_get("New password: ", pwin, &len) != APR_SUCCESS) {
fprintf(stderr, "password too long");
1.55 +2 -2 httpd-2.0/support/htpasswd.c
Index: htpasswd.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/htpasswd.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- htpasswd.c 8 Jul 2002 20:25:28 -0000 1.54
+++ htpasswd.c 10 Jul 2002 06:01:14 -0000 1.55
@@ -162,7 +162,7 @@
* indicates success; failure means that the output buffer contains an
* error message instead.
*/
-static int mkrecord(char *user, char *record, size_t rlen, char *passwd,
+static int mkrecord(char *user, char *record, apr_size_t rlen, char *passwd,
int alg)
{
char *pw;
@@ -170,7 +170,7 @@
char pwin[MAX_STRING_LEN];
char pwv[MAX_STRING_LEN];
char salt[9];
- size_t bufsize;
+ apr_size_t bufsize;
if (passwd != NULL) {
pw = passwd;
1.2 +1 -1 httpd-2.0/test/test_limits.c
Index: test_limits.c
===================================================================
RCS file: /home/cvs/httpd-2.0/test/test_limits.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test_limits.c 24 Aug 1999 06:46:02 -0000 1.1
+++ test_limits.c 10 Jul 2002 06:01:14 -0000 1.2
@@ -184,7 +184,7 @@
fflush(f);
{
- ssize_t len;
+ apr_ssize_t len;
char buff[512];
while ((len = read(sd, buff, 512)) > 0)
1.4 +2 -2 httpd-2.0/test/time-sem.c
Index: time-sem.c
===================================================================
RCS file: /home/cvs/httpd-2.0/test/time-sem.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- time-sem.c 11 Oct 1999 22:40:18 -0000 1.3
+++ time-sem.c 10 Jul 2002 06:01:14 -0000 1.4
@@ -401,7 +401,7 @@
#ifndef USE_SHMGET_SCOREBOARD
-static void *get_shared_mem(size_t size)
+static void *get_shared_mem(apr_size_t size)
{
void *result;
@@ -419,7 +419,7 @@
#include <sys/ipc.h>
#include <sys/shm.h>
-static void *get_shared_mem(size_t size)
+static void *get_shared_mem(apr_size_t size)
{
key_t shmkey = IPC_PRIVATE;
int shmid = -1;