X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fhtable%2Ftest%2Frun.c;h=067816a9c51c474aef38d78337f2fab05937a759;hp=46514c7202f2438b54b15aca2f9c0800ca5f5dd4;hb=9e92552b1b2a1b631bde1c379b9f2950725b1245;hpb=2b3517d40f2d8ac728785a21da19db6e1230d010 diff --git a/ccan/htable/test/run.c b/ccan/htable/test/run.c index 46514c72..067816a9 100644 --- a/ccan/htable/test/run.c +++ b/ccan/htable/test/run.c @@ -111,7 +111,7 @@ int main(void) 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. */ @@ -120,7 +120,7 @@ int main(void) /* 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)) { @@ -136,7 +136,7 @@ int main(void) /* 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); @@ -197,15 +197,15 @@ int main(void) 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();