From 8bfbc4b05b219950e3eb8ac377b8cb3020ddb9ab Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 9 Feb 2015 21:28:11 +0100 Subject: Work on nullfs --- src/common/common.lib | Bin 35663 -> 35823 bytes src/common/hashtbl.c | 17 +++++++++-------- src/common/include/hashtbl.h | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) (limited to 'src/common') diff --git a/src/common/common.lib b/src/common/common.lib index 55de3ef..4eede87 100644 Binary files a/src/common/common.lib and b/src/common/common.lib differ diff --git a/src/common/hashtbl.c b/src/common/hashtbl.c index d034ff5..b87bcef 100644 --- a/src/common/hashtbl.c +++ b/src/common/hashtbl.c @@ -16,12 +16,12 @@ typedef struct hashtbl_item { struct hashtbl { key_eq_fun_t ef; hash_fun_t hf; - key_free_fun_t kff; + free_fun_t kff; size_t size, nitems; hashtbl_item_t **items; }; -hashtbl_t *create_hashtbl(key_eq_fun_t ef, hash_fun_t hf, key_free_fun_t kff, size_t initial_size) { +hashtbl_t *create_hashtbl(key_eq_fun_t ef, hash_fun_t hf, free_fun_t kff, size_t initial_size) { hashtbl_t *ht = (hashtbl_t*)malloc(sizeof(hashtbl_t)); if (ht == 0) return 0; @@ -43,11 +43,12 @@ hashtbl_t *create_hashtbl(key_eq_fun_t ef, hash_fun_t hf, key_free_fun_t kff, si return ht; } -void delete_hashtbl(hashtbl_t *ht) { +void delete_hashtbl(hashtbl_t *ht, free_fun_t data_free_fun) { // Free items for (size_t i = 0; i < ht->size; i++) { while (ht->items[i] != 0) { hashtbl_item_t *n = ht->items[i]->next; + if (data_free_fun) data_free_fun(ht->items[i]->val); if (ht->kff) ht->kff(ht->items[i]->key); free(ht->items[i]); ht->items[i] = n; @@ -87,11 +88,11 @@ static void hashtbl_check_size(hashtbl_t *ht) { } } -int hashtbl_add(hashtbl_t *ht, void* key, void* v) { +bool hashtbl_add(hashtbl_t *ht, void* key, void* v) { size_t slot = SLOT_OF_HASH(ht->hf(key), ht->size); hashtbl_item_t *i = (hashtbl_item_t*)malloc(sizeof(hashtbl_item_t)); - if (i == 0) return 1; // OOM + if (i == 0) return false; // OOM // make sure item is not already present hashtbl_remove(ht, key); @@ -104,10 +105,10 @@ int hashtbl_add(hashtbl_t *ht, void* key, void* v) { hashtbl_check_size(ht); - return 0; + return true; } -void* hashtbl_find(hashtbl_t* ht, void* key) { +void* hashtbl_find(hashtbl_t* ht, const void* key) { size_t slot = SLOT_OF_HASH(ht->hf(key), ht->size); for (hashtbl_item_t *i = ht->items[slot]; i != 0; i = i->next) { @@ -117,7 +118,7 @@ void* hashtbl_find(hashtbl_t* ht, void* key) { return 0; } -void hashtbl_remove(hashtbl_t* ht, void* key) { +void hashtbl_remove(hashtbl_t* ht, const void* key) { size_t slot = SLOT_OF_HASH(ht->hf(key), ht->size); if (ht->items[slot] == 0) return; diff --git a/src/common/include/hashtbl.h b/src/common/include/hashtbl.h index 3b5a44d..ecac0a8 100644 --- a/src/common/include/hashtbl.h +++ b/src/common/include/hashtbl.h @@ -19,14 +19,14 @@ typedef struct hashtbl hashtbl_t; typedef size_t hash_t; typedef hash_t (*hash_fun_t)(const void*); typedef bool (*key_eq_fun_t)(const void*, const void*); -typedef void (*key_free_fun_t)(void*); +typedef void (*free_fun_t)(void*); -hashtbl_t* create_hashtbl(key_eq_fun_t ef, hash_fun_t hf, key_free_fun_t ff, size_t initial_size); // 0 -> default size -void delete_hashtbl(hashtbl_t* ht); +hashtbl_t* create_hashtbl(key_eq_fun_t ef, hash_fun_t hf, free_fun_t key_ff, size_t initial_size); // 0 -> default size +void delete_hashtbl(hashtbl_t* ht, free_fun_t data_free_fun); -int hashtbl_add(hashtbl_t* ht, void* key, void* v); // non-null on error (OOM for instance) -void* hashtbl_find(hashtbl_t* ht, void* key); // null when not found -void hashtbl_remove(hashtbl_t* ht, void* key); +bool hashtbl_add(hashtbl_t* ht, void* key, void* v); // true = ok, false on error (OOM for instance) +void* hashtbl_find(hashtbl_t* ht, const void* key); // null when not found +void hashtbl_remove(hashtbl_t* ht, const void* key); size_t hashtbl_count(hashtbl_t* ht); hash_t id_hash_fun(const void* v); -- cgit v1.2.3