Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16100:deba2a70b794
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.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Sat, 19 Nov 2011 12:43:48 +0100 |
| parents | 8cde7f4a7e97 |
| children | 4d287898db14 |
| files | ChangeLog lib/hash.c |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-11-19 Simon Josefsson <simon@josefsson.org> + + * lib/hash.c (hash_insert): Use hash_insert_if_absent, + not hash_insert0. + (hash_insert_if_absent): Doc fix. + 2011-11-19 Simon Josefsson <simon@josefsson.org> * m4/readline.m4 (gl_FUNC_READLINE): Check for readline/history.h.
--- a/lib/hash.c +++ b/lib/hash.c @@ -1032,8 +1032,8 @@ 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 @@ 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));