X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fhash.h;h=06e4d084ed77feb31f16496cb2b6312d5b643b54;hb=9f553490fb222c0fd4337e3479683776db98fd05;hp=1610a47d79ab5cad7738468aabf878bd4fa518a0;hpb=c708736bdd0fea4b79f3ee4a10e00c3abb95d9e3;p=pspp-builds.git diff --git a/src/libpspp/hash.h b/src/libpspp/hash.h index 1610a47d..06e4d084 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 . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -23,9 +22,9 @@ #include #include -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 @@ -43,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 *);