Ticket #1741: 0008-Rename-INITIAL_BUCKETS-to-INITIAL_SIZE.patch

src/hash.c

@@ -28 +28 @@
 
 /* the number of entries above which it's faster to hash the hashval instead of
  * looping over the used HashBuckets directly */
-#define INITIAL_BUCKETS  8
+#define INITIAL_SIZE  8
 
 /* HEADERIZER HFILE: include/parrot/hash.h */
 
@@ -1014 +1014 @@
     ASSERT_ARGS(parrot_create_hash)
     HashBucket  *bp;
     void        *alloc = Parrot_gc_allocate_memory_chunk_with_interior_pointers(
-                            interp, sizeof (Hash) + HASH_ALLOC_SIZE(INITIAL_BUCKETS));
+                            interp, sizeof (Hash) + HASH_ALLOC_SIZE(INITIAL_SIZE));
     Hash * const hash  = (Hash*)alloc;
     size_t       i;
 
-    PARROT_ASSERT(INITIAL_BUCKETS % 4 == 0);
+    PARROT_ASSERT(INITIAL_SIZE % 4 == 0);
 
     hash->compare    = compare;
     hash->hash_val   = keyhash;
     hash->entry_type = val_type;
     hash->key_type   = hkey_type;
     hash->seed       = interp->hash_seed;
-    hash->mask       = INITIAL_BUCKETS - 1;
+    hash->mask       = INITIAL_SIZE - 1;
     hash->entries    = 0;
     hash->free_list  = NULL;
 
 
 
     hash->buckets    = (HashBucket *)((char *)alloc + sizeof (Hash));;
-    hash->index      = (HashBucket **)(hash->buckets + N_BUCKETS(INITIAL_BUCKETS));
+    hash->index      = (HashBucket **)(hash->buckets + N_BUCKETS(INITIAL_SIZE));
 
     /* fill free_list from hi addresses so that we can use
      * buckets[i] directly in an OrderedHash, *if* nothing
      * was deleted */
 
-    bp = (hash->buckets + N_BUCKETS(INITIAL_BUCKETS));
+    bp = (hash->buckets + N_BUCKETS(INITIAL_SIZE));
 
-    for (i = 0, --bp; i < N_BUCKETS(INITIAL_BUCKETS); ++i, --bp) {
+    for (i = 0, --bp; i < N_BUCKETS(INITIAL_SIZE); ++i, --bp) {
         bp->next        = hash->free_list;
         hash->free_list = bp;
     }