X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fhash.h;h=3281c0e273b0eabac518f71ed66ca4ddc9d2578b;hb=0d70eff1e5dcd89a73f09ce6bc999ccbec8234b5;hp=c0bc5687ea67ca320d81d0cd0323af5e0e3b1ddd;hpb=48386ee68a5283653435d05a9ea4e449710fd370;p=pspp
diff --git a/src/libpspp/hash.h b/src/libpspp/hash.h
index c0bc5687ea..3281c0e273 100644
--- a/src/libpspp/hash.h
+++ b/src/libpspp/hash.h
@@ -1,26 +1,25 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#if !hash_h
#define hash_h 1
#include
#include
+#include "libpspp/hash-functions.h"
typedef int hsh_compare_func (const void *, const void *, const void *aux);
typedef unsigned hsh_hash_func (const void *, const void *aux);
@@ -32,20 +31,13 @@ struct hsh_iterator
size_t next; /* Index of next entry. */
};
-/* Hash functions. */
-unsigned hsh_hash_bytes (const void *, size_t);
-unsigned hsh_hash_string (const char *);
-unsigned hsh_hash_case_string (const char *);
-unsigned hsh_hash_int (int);
-unsigned hsh_hash_double (double);
-
/* Hash tables. */
struct hsh_table *hsh_create (int m, hsh_compare_func *,
hsh_hash_func *, hsh_free_func *,
const void *aux);
struct pool;
-struct hsh_table *hsh_create_pool (struct pool *pool, int m,
+struct hsh_table *hsh_create_pool (struct pool *pool, int m,
hsh_compare_func *,
hsh_hash_func *, hsh_free_func *,
const void *aux);