projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made button-box an abstract type
[pspp]
/
src
/
libpspp
/
hash.h
diff --git
a/src/libpspp/hash.h
b/src/libpspp/hash.h
index c0bc5687ea67ca320d81d0cd0323af5e0e3b1ddd..57fc2678d09548ad50922b9130298afb6cf80cac 100644
(file)
--- a/
src/libpspp/hash.h
+++ b/
src/libpspp/hash.h
@@
-1,26
+1,25
@@
-/* PSPP -
computes sample statistic
s.
+/* PSPP -
a program for statistical analysi
s.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
Copyright (C) 1997-9, 2000 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
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
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 <http://www.gnu.org/licenses/>. */
#if !hash_h
#define hash_h 1
#include <stddef.h>
#include <stdbool.h>
#if !hash_h
#define hash_h 1
#include <stddef.h>
#include <stdbool.h>
+#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);
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. */
};
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;
/* 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);
hsh_compare_func *,
hsh_hash_func *, hsh_free_func *,
const void *aux);