From: Giuseppe Scrivano Date: Fri, 3 Apr 2015 13:58:12 +0000 (+0100) Subject: hash: remove deprecated hash_insert0 function X-Git-Tag: v1.0~7106 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=634ddcf870551aef7dd2a1d0f0c62987a9c986c1;p=gnulib.git hash: remove deprecated hash_insert0 function * lib/hash.h (hash_insert0): Remove deprecated function. * lib/hash.c (hash_insert0): Likewise. * NEWS: Document the interface change. --- diff --git a/ChangeLog b/ChangeLog index 2bce94a36d..2cf42d263d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-04-03 Giuseppe Scrivano + + hash: remove deprecated hash_insert0 function + * lib/hash.h (hash_insert0): Remove deprecated function. + * lib/hash.c (hash_insert0): Likewise. + 2015-04-02 Pádraig Brady mountlist: remove dependency on libmount diff --git a/NEWS b/NEWS index 23dd4f11a5..ef397ef212 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,8 @@ User visible incompatible changes Date Modules Changes +2015-04-03 hash hash_insert0 function removed (deprecated in 2011). + 2014-10-29 obstack The obstack functions are no longer limited to int sizes; size values are now of type size_t. This changes both the ABI and the API. diff --git a/lib/hash.c b/lib/hash.c index 439c533dba..4f27d5c8f8 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -1116,14 +1116,6 @@ hash_insert_if_absent (Hash_table *table, void const *entry, return 1; } -/* hash_insert0 is the deprecated name for hash_insert_if_absent. - . */ -int -hash_insert0 (Hash_table *table, void const *entry, void const **matched_ent) -{ - return hash_insert_if_absent (table, entry, matched_ent); -} - /* If ENTRY matches an entry already in the hash table, return the pointer to the entry from the table. Otherwise, insert ENTRY and return ENTRY. Return NULL if the storage required for insertion cannot be allocated. diff --git a/lib/hash.h b/lib/hash.h index e678a2bbd8..1e90c31a6c 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -96,10 +96,6 @@ void hash_free (Hash_table *); bool hash_rehash (Hash_table *, size_t) _GL_ATTRIBUTE_WUR; void *hash_insert (Hash_table *, const void *) _GL_ATTRIBUTE_WUR; -/* Deprecate this interface. It has been renamed to hash_insert_if_absent. */ -int hash_insert0 (Hash_table *table, /* FIXME: remove in 2013 */ - const void *entry, - const void **matched_ent) _GL_ATTRIBUTE_DEPRECATED; int hash_insert_if_absent (Hash_table *table, const void *entry, const void **matched_ent); void *hash_delete (Hash_table *, const void *);