X-Git-Url: http://git.datanom.net/hashtable.git/blobdiff_plain/dd3da95ad9e2d06f5f39d6efea6aad33ae5daf55..refs/heads/master:/hashtable.c?ds=inline diff --git a/hashtable.c b/hashtable.c index b642363..8e713dd 100644 --- a/hashtable.c +++ b/hashtable.c @@ -14,6 +14,7 @@ struct _Hashtable { HashFunc hash; EqualFunc compare; FreeFunc free; + PrintFunc print; Node** nodes; }; @@ -28,15 +29,19 @@ static uint32_t hash_table_index(Hashtable* ht, const void* key) { return (ht->hash(key) % ht->size); } +static void hash_table_default_print(void* data) { + printf("%p", data); +} + Hashtable* hash_table_create(HashFunc hf, EqualFunc ef) { - return hash_table_create_full(hf, ef, TABLESIZE, NULL); + return hash_table_create_full(hf, ef, TABLESIZE, NULL, NULL); } Hashtable* hash_table_create_notify(HashFunc hf, EqualFunc ef, FreeFunc ff) { - return hash_table_create_full(hf, ef, TABLESIZE, ff); + return hash_table_create_full(hf, ef, TABLESIZE, ff, NULL); } -Hashtable* hash_table_create_full(HashFunc hf, EqualFunc ef, uint32_t size, FreeFunc ff) { +Hashtable* hash_table_create_full(HashFunc hf, EqualFunc ef, uint32_t size, FreeFunc ff, PrintFunc pf) { Hashtable* ht = malloc(sizeof(*ht)); ht->size = size; ht->hash = hf; @@ -46,6 +51,11 @@ Hashtable* hash_table_create_full(HashFunc hf, EqualFunc ef, uint32_t size, Free } else { ht->free = free; } + if (pf) { + ht->print = pf; + } else { + ht->print = hash_table_default_print; + } ht->nodes = calloc(sizeof(Node*), ht->size); return ht; } @@ -64,6 +74,10 @@ void hash_table_destroy(Hashtable* ht) { free(ht); } +void hash_table_set_print_func(Hashtable* ht, PrintFunc pf) { + ht->print = pf; +} + void hash_table_print(Hashtable* ht) { printf("Start Table\n"); for (uint32_t i = 0; i < ht->size; i++) { @@ -73,7 +87,9 @@ void hash_table_print(Hashtable* ht) { printf("\t%i\t\n", i); Node* node = ht->nodes[i]; while (node != NULL) { - printf("\"%p\" - (%p)", node->key, node->data); + printf("\"%p\" - (", node->key); + ht->print(node->data); + printf(")"); node = node->next; } printf("\n");