From 0334ff99172107d3fce11f07a7f03694ce4d704e Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Sat, 19 Nov 2011 12:43:48 +0100 Subject: [PATCH] hash: Don't refer to deprecated interfaces. * lib/hash.c (hash_insert): Use hash_insert_if_absent, not hash_insert0. (hash_insert_if_absent): Doc fix. --- ChangeLog | 6 ++++++ lib/hash.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8738d35e71..86bca08464 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-11-19 Simon Josefsson + + * lib/hash.c (hash_insert): Use hash_insert_if_absent, + not hash_insert0. + (hash_insert_if_absent): Doc fix. + 2011-11-19 Simon Josefsson * m4/readline.m4 (gl_FUNC_READLINE): Check for readline/history.h. diff --git a/lib/hash.c b/lib/hash.c index 0e44913609..9f2d07569e 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -1032,8 +1032,8 @@ hash_rehash (Hash_table *table, size_t candidate) hash_insert, the only way to distinguish those cases is to compare the return value and ENTRY. That works only when you can have two different ENTRY values that point to data that compares "equal". Thus, - when the ENTRY value is a simple scalar, you must use hash_insert0. - ENTRY must not be NULL. */ + when the ENTRY value is a simple scalar, you must use + hash_insert_if_absent. ENTRY must not be NULL. */ int hash_insert_if_absent (Hash_table *table, void const *entry, void const **matched_ent) @@ -1134,7 +1134,7 @@ void * hash_insert (Hash_table *table, void const *entry) { void const *matched_ent; - int err = hash_insert0 (table, entry, &matched_ent); + int err = hash_insert_if_absent (table, entry, &matched_ent); return (err == -1 ? NULL : (void *) (err == 0 ? matched_ent : entry)); -- 2.39.5