X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fhash.h;h=af1cdacdc82ae8417c37b8c2abd298d3b93d6125;hb=e7d0a9f16192ceeff9243f0ede8e399ee1ef0d44;hp=e426483aaf10595f0a534098a36b98ade4ad18e8;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp

diff --git a/src/libpspp/hash.h b/src/libpspp/hash.h
index e426483aaf..af1cdacdc8 100644
--- a/src/libpspp/hash.h
+++ b/src/libpspp/hash.h
@@ -21,10 +21,11 @@
 #define hash_h 1
 
 #include <stddef.h>
+#include <stdbool.h>
 
-typedef int hsh_compare_func (const void *, const void *, void *aux);
-typedef unsigned hsh_hash_func (const void *, void *aux);
-typedef void hsh_free_func (void *, void *aux);
+typedef int hsh_compare_func (const void *, const void *, const void *aux);
+typedef unsigned hsh_hash_func (const void *, const void *aux);
+typedef void hsh_free_func (void *, const void *aux);
 
 /* Hash table iterator (opaque). */
 struct hsh_iterator
@@ -42,7 +43,14 @@ unsigned hsh_hash_double (double);
 /* Hash tables. */
 struct hsh_table *hsh_create (int m, hsh_compare_func *,
                               hsh_hash_func *, hsh_free_func *,
-			      void *aux);
+			      const void *aux);
+
+struct pool;
+struct hsh_table *hsh_create_pool (struct pool *pool, int m, 
+				   hsh_compare_func *,
+				   hsh_hash_func *, hsh_free_func *,
+				   const void *aux);
+
 void hsh_clear (struct hsh_table *);
 void hsh_destroy (struct hsh_table *);
 void *const *hsh_sort (struct hsh_table *);
@@ -55,14 +63,14 @@ void **hsh_probe (struct hsh_table *, const void *);
 void *hsh_insert (struct hsh_table *, void *);
 void *hsh_replace (struct hsh_table *, void *);
 void *hsh_find (struct hsh_table *, const void *);
-int hsh_delete (struct hsh_table *, const void *);
+bool hsh_delete (struct hsh_table *, const void *);
 
 /* Iteration. */
 void *hsh_first (struct hsh_table *, struct hsh_iterator *);
 void *hsh_next (struct hsh_table *, struct hsh_iterator *);
 
 /* Search and insertion with assertion. */
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
 void hsh_force_insert (struct hsh_table *, void *);
 void *hsh_force_find (struct hsh_table *, const void *);
 void hsh_force_delete (struct hsh_table *, const void *);
@@ -76,7 +84,7 @@ void hsh_force_delete (struct hsh_table *, const void *);
 size_t hsh_count (struct hsh_table *);
 
 /* Debugging. */
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
 void hsh_dump (struct hsh_table *);
 #endif