dne = i;
htable_init(&ht, hash, NULL);
- ok1(ht.max == 0);
+ ok1(ht_max(&ht) == 0);
ok1(ht.bits == 0);
/* We cannot find an entry which doesn't exist. */
/* This should increase it once. */
add_vals(&ht, val, 0, 1);
ok1(ht.bits == 1);
- ok1(ht.max == 1);
+ ok1(ht_max(&ht) == 1);
weight = 0;
for (i = 0; i < sizeof(ht.common_mask) * CHAR_BIT; i++) {
if (ht.common_mask & ((uintptr_t)1 << i)) {
/* This should increase it again. */
add_vals(&ht, val, 1, 1);
ok1(ht.bits == 2);
- ok1(ht.max == 3);
+ ok1(ht_max(&ht) == 3);
/* Mask should be set. */
ok1(ht.common_mask != 0);
/* Corner cases: wipe out the perfect bit using bogus pointer. */
htable_clear(&ht);
htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]));
- ok1(ht.perfect_bit);
- perfect_bit = ht.perfect_bit;
+ ok1(ht_perfect_mask(&ht));
+ perfect_bit = ht_perfect_mask(&ht);
htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]
| perfect_bit));
- ok1(ht.perfect_bit == 0);
+ ok1(ht_perfect_mask(&ht) == 0);
htable_del(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1] | perfect_bit));
/* Enlarging should restore it... */
add_vals(&ht, val, 0, NUM_VALS-1);
- ok1(ht.perfect_bit != 0);
+ ok1(ht_perfect_mask(&ht) != 0);
htable_clear(&ht);
ok1(htable_init_sized(&ht, hash, NULL, 1024));
- ok1(ht.max >= 1024);
+ ok1(ht_max(&ht) >= 1024);
htable_clear(&ht);
ok1(htable_init_sized(&ht, hash, NULL, 1023));
- ok1(ht.max >= 1023);
+ ok1(ht_max(&ht) >= 1023);
htable_clear(&ht);
ok1(htable_init_sized(&ht, hash, NULL, 1025));
- ok1(ht.max >= 1025);
+ ok1(ht_max(&ht) >= 1025);
htable_clear(&ht);
return exit_status();