mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-05 06:50:21 +02:00
Use proper assoc/hash function types in `hashtab.c'.
This is a followup to d587c9e8b2
("Use
proper types for hash/assoc functions in `hashtab.h'.").
* libguile/hashtab.c (scm_i_rehash, scm_hash_fn_create_handle_x,
scm_hash_fn_ref, scm_hash_fn_set_x, scm_hash_fn_remove_x): Use
`scm_t_hash_fn' and `scm_t_assoc_fn' as appropriate.
This commit is contained in:
parent
f916cbc4b1
commit
f044da55c5
1 changed files with 14 additions and 11 deletions
|
@ -207,7 +207,7 @@ make_hash_table (int flags, unsigned long k, const char *func_name)
|
|||
|
||||
void
|
||||
scm_i_rehash (SCM table,
|
||||
unsigned long (*hash_fn)(),
|
||||
scm_t_hash_fn hash_fn,
|
||||
void *closure,
|
||||
const char* func_name)
|
||||
{
|
||||
|
@ -472,8 +472,9 @@ scm_hash_fn_get_handle (SCM table, SCM obj,
|
|||
|
||||
|
||||
SCM
|
||||
scm_hash_fn_create_handle_x (SCM table, SCM obj, SCM init, unsigned long (*hash_fn)(),
|
||||
SCM (*assoc_fn)(), void * closure)
|
||||
scm_hash_fn_create_handle_x (SCM table, SCM obj, SCM init,
|
||||
scm_t_hash_fn hash_fn, scm_t_assoc_fn assoc_fn,
|
||||
void * closure)
|
||||
#define FUNC_NAME "scm_hash_fn_create_handle_x"
|
||||
{
|
||||
int weak = 0;
|
||||
|
@ -564,8 +565,9 @@ scm_hash_fn_create_handle_x (SCM table, SCM obj, SCM init, unsigned long (*hash_
|
|||
|
||||
|
||||
SCM
|
||||
scm_hash_fn_ref (SCM table, SCM obj, SCM dflt, unsigned long (*hash_fn)(),
|
||||
SCM (*assoc_fn)(), void * closure)
|
||||
scm_hash_fn_ref (SCM table, SCM obj, SCM dflt,
|
||||
scm_t_hash_fn hash_fn, scm_t_assoc_fn assoc_fn,
|
||||
void *closure)
|
||||
{
|
||||
SCM it = scm_hash_fn_get_handle (table, obj, hash_fn, assoc_fn, closure);
|
||||
if (scm_is_pair (it))
|
||||
|
@ -578,8 +580,9 @@ scm_hash_fn_ref (SCM table, SCM obj, SCM dflt, unsigned long (*hash_fn)(),
|
|||
|
||||
|
||||
SCM
|
||||
scm_hash_fn_set_x (SCM table, SCM obj, SCM val, unsigned long (*hash_fn)(),
|
||||
SCM (*assoc_fn)(), void * closure)
|
||||
scm_hash_fn_set_x (SCM table, SCM obj, SCM val,
|
||||
scm_t_hash_fn hash_fn, scm_t_assoc_fn assoc_fn,
|
||||
void *closure)
|
||||
{
|
||||
SCM it;
|
||||
|
||||
|
@ -591,8 +594,8 @@ scm_hash_fn_set_x (SCM table, SCM obj, SCM val, unsigned long (*hash_fn)(),
|
|||
|
||||
SCM
|
||||
scm_hash_fn_remove_x (SCM table, SCM obj,
|
||||
unsigned long (*hash_fn)(),
|
||||
SCM (*assoc_fn)(),
|
||||
scm_t_hash_fn hash_fn,
|
||||
scm_t_assoc_fn assoc_fn,
|
||||
void *closure)
|
||||
{
|
||||
int weak = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue