httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/tables apr_hash.c
Date Thu, 05 Oct 2000 22:20:38 GMT
gstein      00/10/05 15:20:37

  Modified:    src/lib/apr/include apr_hash.h
               src/lib/apr/tables apr_hash.c
  Log:
  size_t should be an apr_size_t.
  
  Revision  Changes    Path
  1.10      +8 -7      apache-2.0/src/lib/apr/include/apr_hash.h
  
  Index: apr_hash.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_hash.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr_hash.h	2000/08/06 06:07:08	1.9
  +++ apr_hash.h	2000/10/05 22:20:35	1.10
  @@ -95,10 +95,10 @@
    *             If the length is 0 it is assumed to be strlen(key)+1
    * @param val Value to associate with the key
    * @tip If the value is NULL the hash entry is deleted.
  - * @deffunc void apr_hash_set(apr_hash_t *ht, const void *key, size_t klen, const void
*val)
  + * @deffunc void apr_hash_set(apr_hash_t *ht, const void *key, apr_size_t klen, const void
*val)
    */
  -APR_EXPORT(void) apr_hash_set(apr_hash_t *ht, const void *key, size_t klen, 
  -                             const void *val);
  +APR_EXPORT(void) apr_hash_set(apr_hash_t *ht, const void *key,
  +                              apr_size_t klen, const void *val);
   
   /**
    * Look up the value associated with a key in a hash table.
  @@ -107,9 +107,10 @@
    * @param klen Length of the key
    *         If the length is 0 it is assumed to be strlen(key)+1
    * @return Returns NULL if the key is not present.
  - * @deffunc void *apr_hash_get(apr_hash_t *ht, const void *key, size_t klen)
  + * @deffunc void *apr_hash_get(apr_hash_t *ht, const void *key, apr_size_t klen)
    */
  -APR_EXPORT(void) *apr_hash_get(apr_hash_t *ht, const void *key, size_t klen);
  +APR_EXPORT(void) *apr_hash_get(apr_hash_t *ht, const void *key,
  +                               apr_size_t klen);
   
   /**
    * Start iterating over the entries in a hash table.
  @@ -155,10 +156,10 @@
    * @param val Return pointer for the associated value.
    * @tip The return pointers should point to a variable that will be set to the
    *      corresponding data, or they may be NULL if the data isn't interesting.
  - * @deffunc void apr_hash_this(apr_hash_index_t *hi, const void **key, size_t *klen, void
**val);
  + * @deffunc void apr_hash_this(apr_hash_index_t *hi, const void **key, apr_size_t *klen,
void **val);
    */
   APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi, const void **key, 
  -                              size_t *klen, void **val);
  +                               apr_size_t *klen, void **val);
   
   #ifdef __cplusplus
   }
  
  
  
  1.4       +7 -7      apache-2.0/src/lib/apr/tables/apr_hash.c
  
  Index: apr_hash.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/tables/apr_hash.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_hash.c	2000/08/06 06:07:27	1.3
  +++ apr_hash.c	2000/10/05 22:20:37	1.4
  @@ -86,7 +86,7 @@
       apr_hash_entry_t	*next;
       int			 hash;
       const void		*key;
  -    size_t		 klen;
  +    apr_size_t		 klen;
       const void		*val;
   };
   
  @@ -100,7 +100,7 @@
   struct apr_hash_t {
       apr_pool_t		*pool;
       apr_hash_entry_t   **array;
  -    size_t		 count, max;
  +    apr_size_t		 count, max;
   };
   #define INITIAL_MAX 15 /* tunable == 2^n - 1 */
   
  @@ -114,7 +114,7 @@
   struct apr_hash_index_t {
       apr_hash_t	       *ht;
       apr_hash_entry_t   *this, *next;
  -    size_t		index;
  +    apr_size_t		index;
   };
   
   
  @@ -168,7 +168,7 @@
   
   APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi,
   			       const void **key,
  -			       size_t *klen,
  +			       apr_size_t *klen,
   			       void **val)
   {
       if (key)  *key  = hi->this->key;
  @@ -207,7 +207,7 @@
   
   static apr_hash_entry_t **find_entry(apr_hash_t *ht,
   				    const void *key,
  -				    size_t klen,
  +				    apr_size_t klen,
   				    const void *val)
   {
       apr_hash_entry_t **hep, *he;
  @@ -282,7 +282,7 @@
   
   APR_EXPORT(void *) apr_hash_get(apr_hash_t *ht,
   			       const void *key,
  -			       size_t klen)
  +			       apr_size_t klen)
   {
       apr_hash_entry_t *he;
       he = *find_entry(ht, key, klen, NULL);
  @@ -294,7 +294,7 @@
   
   APR_EXPORT(void) apr_hash_set(apr_hash_t *ht,
   			     const void *key,
  -			     size_t klen,
  +			     apr_size_t klen,
   			     const void *val)
   {
       apr_hash_entry_t **hep;
  
  
  

Mime
View raw message