apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/tables apr_hash.c
Date Wed, 07 Mar 2001 17:57:22 GMT
trawick     01/03/07 09:57:21

  Modified:    .        STATUS
               include  apr_hash.h
               tables   apr_hash.c
  Log:
  Change the return type of apr_hash_count() to some counter type
  ("int") instead of a size type (apr_size_t).
  
  Revision  Changes    Path
  1.36      +1 -5      apr/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apr/STATUS,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- STATUS	2001/02/18 00:32:16	1.35
  +++ STATUS	2001/03/07 17:57:11	1.36
  @@ -1,5 +1,5 @@
   APACHE PORTABLE RUNTIME (APR) LIBRARY STATUS:			-*-text-*-
  -Last modified at [$Date: 2001/02/18 00:32:16 $]
  +Last modified at [$Date: 2001/03/07 17:57:11 $]
   
   Release:
   
  @@ -104,10 +104,6 @@
                get around to it soonish...
   
       * toss the per-Makefile setup of INCLUDES; shift to rules.mk.in
  -
  -    * Change the return type of apr_hash_count() to some counter type 
  -      (like "int") instead of a size type (apr_size_t).  Jeff will
  -      do this Real Soon Now (so he says on 20010121).
   
       * add the rest of the pool accessor declare/impl macros.
         Status: Greg volunteers
  
  
  
  1.24      +2 -2      apr/include/apr_hash.h
  
  Index: apr_hash.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_hash.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apr_hash.h	2001/02/16 04:15:45	1.23
  +++ apr_hash.h	2001/03/07 17:57:15	1.24
  @@ -177,9 +177,9 @@
    * Get the number of key/value pairs in the hash table.
    * @param ht The hash table
    * @return The number of key/value pairs in the hash table.
  - * @deffunc void apr_hash_count(apr_hash_t *ht, apr_size_t *count);
  + * @deffunc int apr_hash_count(apr_hash_t *ht);
    */
  -APR_DECLARE(apr_size_t) apr_hash_count(apr_hash_t *ht);
  +APR_DECLARE(int) apr_hash_count(apr_hash_t *ht);
   
   
   #ifdef __cplusplus
  
  
  
  1.16      +5 -5      apr/tables/apr_hash.c
  
  Index: apr_hash.c
  ===================================================================
  RCS file: /home/cvs/apr/tables/apr_hash.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- apr_hash.c	2001/02/26 04:19:58	1.15
  +++ apr_hash.c	2001/03/07 17:57:19	1.16
  @@ -100,7 +100,7 @@
   struct apr_hash_t {
       apr_pool_t		*pool;
       apr_hash_entry_t   **array;
  -    apr_size_t		 count, max;
  +    int                  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;
  -    apr_size_t		index;
  +    int                 index;
   };
   
   
  @@ -122,7 +122,7 @@
    * Hash creation functions.
    */
   
  -static apr_hash_entry_t **alloc_array(apr_hash_t *ht, apr_size_t max)
  +static apr_hash_entry_t **alloc_array(apr_hash_t *ht, int max)
   {
      return apr_pcalloc(ht->pool, sizeof(*ht->array) * (max + 1));
   }
  @@ -185,7 +185,7 @@
   {
       apr_hash_index_t *hi;
       apr_hash_entry_t **new_array;
  -    apr_size_t new_max;
  +    int new_max;
       int i;
   
       new_max = ht->max * 2 + 1;
  @@ -315,7 +315,7 @@
       /* else key not present and val==NULL */
   }
   
  -APR_DECLARE(apr_size_t) apr_hash_count(apr_hash_t *ht)
  +APR_DECLARE(int) apr_hash_count(apr_hash_t *ht)
   {
       return ht->count;
   }
  
  
  

Mime
View raw message