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

diff --git a/src/libpspp/hash.h b/src/libpspp/hash.h
index e426483aaf..06e4d084ed 100644
--- a/src/libpspp/hash.h
+++ b/src/libpspp/hash.h
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -21,10 +20,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 +42,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 +62,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 +83,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