X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=ccan%2Fhtable%2Ftest%2Frun-size.c;h=1a2f5cdd1ef8cbbfc1ab84f8221b5bb61b9734ab;hb=ad2ce76c10f808283ea7cf25cd8e76a15710c4f3;hp=01e4bb41acf7ad526dde9e5d3f1fa726ddc84f70;hpb=45f24da35118db441e6153f02f6ddd937da1fa1c;p=ccan

diff --git a/ccan/htable/test/run-size.c b/ccan/htable/test/run-size.c
index 01e4bb41..1a2f5cdd 100644
--- a/ccan/htable/test/run-size.c
+++ b/ccan/htable/test/run-size.c
@@ -8,15 +8,15 @@
 
 /* We use the number divided by two as the hash (for lots of
    collisions). */
-static size_t hash(const void *elem, void *unused)
+static size_t hash(const void *elem, void *unused UNNEEDED)
 {
 	size_t h = *(uint64_t *)elem / 2;
 	return h;
 }
 
-int main(int argc, char *argv[])
+int main(void)
 {
-	struct htable *ht;
+	struct htable ht;
 	uint64_t val[NUM_VALS];
 	unsigned int i;
 
@@ -24,13 +24,13 @@ int main(int argc, char *argv[])
 	for (i = 0; i < NUM_VALS; i++)
 		val[i] = i;
 
-	ht = htable_new(hash, NULL);
+	htable_init(&ht, hash, NULL);
 	for (i = 0; i < NUM_VALS; i++) {
-		ok1(ht->max >= i);
-		ok1(ht->max <= i * 2);
-		htable_add(ht, hash(&val[i], NULL), &val[i]);
+		ok1(ht.max >= i);
+		ok1(ht.max <= i * 2);
+		htable_add(&ht, hash(&val[i], NULL), &val[i]);
 	}
-	htable_free(ht);
+	htable_clear(&ht);
 
 	return exit_status();
 }