Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 18 Nov 2000 13:53:08 -0000
Message-ID: <20001118135308.87503.qmail@locus.apache.org>
From: wrowe@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/modules/dav/fs repos.c lock.c

wrowe       00/11/18 05:53:07

  Modified:    src/modules/dav/fs repos.c lock.c
  Log:
    Some signedness issues - consistify the size_t references
  
  Revision  Changes    Path
  1.29      +10 -10    apache-2.0/src/modules/dav/fs/repos.c
  
  Index: repos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/fs/repos.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- repos.c	2000/11/15 02:05:11	1.28
  +++ repos.c	2000/11/18 13:53:07	1.29
  @@ -243,7 +243,7 @@
       }
       else {
           char *dirpath = ap_make_dirstr_parent(ctx->pool, ctx->pathname);
  -        size_t dirlen = strlen(dirpath);
  +        apr_size_t dirlen = strlen(dirpath);
   
           if (fname_p != NULL)
               *fname_p = ctx->pathname + dirlen;
  @@ -598,7 +598,7 @@
       dav_resource *resource;
       char *s;
       char *filename;
  -    size_t len;
  +    apr_size_t len;
   
       /* ### optimize this into a single allocation! */
   
  @@ -759,8 +759,8 @@
   {
       dav_resource_private *ctx1 = res1->info;
       dav_resource_private *ctx2 = res2->info;
  -    size_t len1 = strlen(ctx1->pathname);
  -    size_t len2;
  +    apr_size_t len1 = strlen(ctx1->pathname);
  +    apr_size_t len2;
   
       if (res1->hooks != res2->hooks)
   	return 0;
  @@ -1349,7 +1349,7 @@
       }
       while ((apr_readdir(dirp)) == APR_SUCCESS) {
   	char *name;
  -	size_t len;
  +	apr_size_t len;
   
   	apr_get_dir_filename(&name, dirp);
   	len = strlen(name);
  @@ -1410,9 +1410,9 @@
   	    }
   	}
   	else if (fsctx->info1.finfo.filetype == APR_DIR) {
  -	    size_t save_path_len = fsctx->path1.cur_len;
  -	    size_t save_uri_len = fsctx->uri_buf.cur_len;
  -	    size_t save_path2_len = fsctx->path2.cur_len;
  +	    apr_size_t save_path_len = fsctx->path1.cur_len;
  +	    apr_size_t save_uri_len = fsctx->uri_buf.cur_len;
  +	    apr_size_t save_path2_len = fsctx->path2.cur_len;
   
   	    /* adjust length to incorporate the subdir name */
   	    fsctx->path1.cur_len += len;
  @@ -1453,7 +1453,7 @@
   	return err;
   
       if (params->walk_type & DAV_WALKTYPE_LOCKNULL) {
  -	size_t offset = 0;
  +	apr_size_t offset = 0;
   
   	/* null terminate the directory name */
   	fsctx->path1.buf[fsctx->path1.cur_len - 1] = '\0';
  @@ -1475,7 +1475,7 @@
   	memset(&fsctx->info1.finfo, 0, sizeof(fsctx->info1.finfo));
   
   	while (offset < fsctx->locknull_buf.cur_len) {
  -	    size_t len = strlen(fsctx->locknull_buf.buf + offset);
  +	    apr_size_t len = strlen(fsctx->locknull_buf.buf + offset);
   	    dav_lock *locks = NULL;
   
   	    /*
  
  
  
  1.11      +3 -3      apache-2.0/src/modules/dav/fs/lock.c
  
  Index: lock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/fs/lock.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- lock.c	2000/10/07 00:50:41	1.10
  +++ lock.c	2000/11/18 13:53:07	1.11
  @@ -591,7 +591,7 @@
   {
       apr_pool_t *p = lockdb->info->pool;
       dav_error *err;
  -    size_t offset = 0;
  +    apr_size_t offset = 0;
       int need_save = DAV_FALSE;
       dav_datum val = { 0 };
       dav_lock_discovery *dp;
  @@ -921,8 +921,8 @@
   						 dav_buffer *pbuf)
   {
       dav_error *err;
  -    size_t len;
  -    size_t scanlen;
  +    apr_size_t len;
  +    apr_size_t scanlen;
       char *scan;
       const char *scanend;
       char *dirpath = apr_pstrdup(p, filename);