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

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 48d758cba55ceb755b935542c163a50e06023aa9..2ea178fff78021826258823ad3339d0ad655bbfa 100644 (file)
--- 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 f9abf745dc7ac40b2a4bc87782f75a8de26ce0a8..d31ca26d169a3cc5607334b5757482098c17e05a 100644 (file)
--- 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 1d558acf1892e4107a9786823eda9f33ff33a4d2..f6521d21b5c0e6bed0fffb92323e9e4561b8bc88 100644 (file)
--- 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 9a52aec9dddf05ed2e35fdd9009baadfef801120..8b1db773fd353f1451f182384c80809d92529f03 100644 (file)
--- 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 8b85b4a58eae98eceb77a2ab35850113c8ac2aae..1912e96e77e5b007b97bf222768a4eac123ab9f0 100644 (file)
--- 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 9aaddae54df5355c345a5a9ee52feb663f4a50c0..df315b291458114c83738996ca3b0901cfdf5148 100644 (file)
--- 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 3c5ff18eba681192f593ed7ebda9910817228b2d..fc44581c7fe81b600e11b7e5d581e23596feaf8f 100644 (file)
--- 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 5ba48f21bba1878d62d361c665743ce12781cc5c..ffb30255b97eb9c70aa87a58cf45da485873d1be 100644 (file)
--- 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 091f8fcfa44e6a07001ec239357cbe46eabcb31e..4522ea24cf5b945912c9f6b1b326ca8af73c9da5 100644 (file)
--- 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 1ca68733d96bb9e7666bf2a0d2b32e9649a2fd26..324b305bfe7fcf335c8f6df4ddafa1fa906e1aaf 100644 (file)
--- 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 7f41bfcd23c160af983b94993f5e181863acc301..464c763484f94cdc08c30b5474319f916f77e35b 100644 (file)
--- 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 aba4f3d98dd0a636998cdd48b36f80622f9991fe..f9a3215ae6d825d25255f84b6450f48ced910cf2 100644 (file)
--- 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 8d76ce2e083bca965c3d7a368f0c701a6cb7c963..8dca825b2178ef885e2566c63fcb74ddd891d02f 100644 (file)
--- 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 7800844ed20fe64ed11cf1154a5bd91ec00b468b..f75217d282eee0fc0e0b62e33e22bbf01a052238 100644 (file)
--- 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 <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;