Refactor configuration

 * Move configuration loading into conf.c
 * Have user modules with same name merge/override modules in system.

1 files changed, 9 insertions, 1 deletions

diff --git a/p11-kit/hash.h b/p11-kit/hash.h
index 649b98b..8c3060a 100644
--- a/p11-kit/hash.h
+++ b/p11-kit/hash.h
@@ -81,7 +81,6 @@ typedef struct hash hash_t;
 typedef struct hash_iter
 {
 	hash_t* ht;
-	struct hash_entry* ths;
 	struct hash_entry* next;
 	unsigned int index;
 } hash_iter_t;
@@ -140,6 +139,15 @@ int                hash_remove                 (hash_t* ht,
                                                 const void* key);
 
 /*
+ * hash_steal: Remove a value from the hash table without calling destroy funcs
+ * - returns 1 if the entry was found
+ */
+int                hash_steal                  (hash_t *ht,
+                                                const void *key,
+                                                void **stolen_key,
+                                                void **stolen_value);
+
+/*
  * hash_first: Start enumerating through the hash table
  * - returns a hash iterator
  */