From d982829aa1f6cf8baabf77cd300983cb8de8ee7b Mon Sep 17 00:00:00 2001 From: "Victor J. Orlikowski" Date: Wed, 10 Jul 2002 06:01:14 +0000 Subject: [PATCH] Continue the Bill Rowe apr_size_t crusade. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95993 13f79535-47bb-0310-9956-ffa450edef68 --- modules/aaa/mod_auth_digest.c | 5 +++-- modules/dav/fs/dbm.c | 3 +-- modules/dav/main/util.c | 8 ++++---- modules/filters/mod_include.c | 2 +- modules/mappers/mod_negotiation.c | 2 +- modules/mappers/mod_rewrite.c | 4 ++-- modules/proxy/proxy_ftp.c | 2 +- modules/proxy/proxy_util.c | 2 +- server/log.c | 2 +- server/vhost.c | 2 +- support/htdigest.c | 2 +- support/htpasswd.c | 4 ++-- test/test_limits.c | 2 +- test/time-sem.c | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c index 48d758cba5..2ea178fff7 100644 --- a/modules/aaa/mod_auth_digest.c +++ b/modules/aaa/mod_auth_digest.c @@ -862,7 +862,7 @@ static client_entry *add_client(unsigned long key, client_entry *info, 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 void clear_session(const digest_header_rec *resp) 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; diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c index f9abf745dc..d31ca26d16 100644 --- a/modules/dav/fs/dbm.c +++ b/modules/dav/fs/dbm.c @@ -331,8 +331,7 @@ struct dav_namespace_map { 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 }; /* diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c index 1d558acf18..f6521d21b5 100644 --- a/modules/dav/main/util.c +++ b/modules/dav/main/util.c @@ -162,7 +162,7 @@ DAV_DECLARE(void) dav_buffer_init(apr_pool_t *p, dav_buffer *pbuf, 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_append(apr_pool_t *p, dav_buffer *pbuf, 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 @@ time_t dav_get_timeout(request_rec *r) /* 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 @@ static dav_error * dav_process_if_header(request_rec *r, dav_if_header **p_ih) 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); diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index 9a52aec9dd..8b1db773fd 100644 --- a/modules/filters/mod_include.c +++ b/modules/filters/mod_include.c @@ -1066,7 +1066,7 @@ static char *ap_ssi_parse_string(request_rec *r, include_ctx_t *ctx, 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; diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c index 8b85b4a58e..1912e96e77 100644 --- a/modules/mappers/mod_negotiation.c +++ b/modules/mappers/mod_negotiation.c @@ -1519,7 +1519,7 @@ static void set_language_quality(negotiation_state *neg, var_rec *variant) 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; diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index 9aaddae54d..df315b2914 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -2328,7 +2328,7 @@ static void do_expand(request_rec *r, char *input, char *buffer, int nbuf, 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 @@ static char *lookup_map_txtfile(request_rec *r, const char *file, char *key) char line[1024]; char *value = NULL; char *cpT; - size_t skip; + apr_size_t skip; char *curkey; char *curval; diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c index 3c5ff18eba..fc44581c7f 100644 --- a/modules/proxy/proxy_ftp.c +++ b/modules/proxy/proxy_ftp.c @@ -514,7 +514,7 @@ apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f, apr_bucket_brigade *in) } { - 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 */ diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 5ba48f21bb..ffb30255b9 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1028,7 +1028,7 @@ PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r) * (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; diff --git a/server/log.c b/server/log.c index 091f8fcfa4..4522ea24cf 100644 --- a/server/log.c +++ b/server/log.c @@ -387,7 +387,7 @@ static void log_error_core(const char *file, int line, int level, 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; diff --git a/server/vhost.c b/server/vhost.c index 1ca68733d9..324b305bfe 100644 --- a/server/vhost.c +++ b/server/vhost.c @@ -185,7 +185,7 @@ static const char *get_addresses(apr_pool_t *p, const char *w_, 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; diff --git a/support/htdigest.c b/support/htdigest.c index 7f41bfcd23..464c763484 100644 --- a/support/htdigest.c +++ b/support/htdigest.c @@ -156,7 +156,7 @@ static void add_password(const char *user, const char *realm, apr_file_t *f) 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"); diff --git a/support/htpasswd.c b/support/htpasswd.c index aba4f3d98d..f9a3215ae6 100644 --- a/support/htpasswd.c +++ b/support/htpasswd.c @@ -162,7 +162,7 @@ static void putline(apr_file_t *f, const char *l) * 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 @@ static int mkrecord(char *user, char *record, size_t rlen, char *passwd, 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; diff --git a/test/test_limits.c b/test/test_limits.c index 8d76ce2e08..8dca825b21 100644 --- a/test/test_limits.c +++ b/test/test_limits.c @@ -184,7 +184,7 @@ main(int argc, char *argv[]) fflush(f); { - ssize_t len; + apr_ssize_t len; char buff[512]; while ((len = read(sd, buff, 512)) > 0) diff --git a/test/time-sem.c b/test/time-sem.c index 7800844ed2..f75217d282 100644 --- a/test/time-sem.c +++ b/test/time-sem.c @@ -401,7 +401,7 @@ void accept_mutex_off() #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 @@ static void *get_shared_mem(size_t size) #include #include -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; -- 2.50.1