Remove the previously deprecated lh_table_lookup() function, in favor of lh_table_loo...

diff --git a/ChangeLog b/ChangeLog
index c7ca51b79f11d9995d1ece61c54bbd666e1ecf59..f5fee96a520a8ad455045dbe45f59840834af2bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Deprecated and removed features:
 --------------------------------
 * bits.h has been removed
 * lh_abort() has been removed
+* lh_table_lookup() has been removed, use lh_table_lookup_ex() instead.
 
 
 0.13 (up to commit 5dae561, 2017/11/29)

diff --git a/linkhash.c b/linkhash.c
index 73691cd09c12b14de0e7d52d5d3c05f27009a32c..7dddc3631d7cd2cb1773be52ab49e6dd35988ba0 100644 (file)
--- a/linkhash.c
+++ b/linkhash.c
@@ -621,13 +621,6 @@ struct lh_entry* lh_table_lookup_entry(struct lh_table *t, const void *k)
        return lh_table_lookup_entry_w_hash(t, k, lh_get_hash(t, k));
 }
 
-const void* lh_table_lookup(struct lh_table *t, const void *k)
-{
-       void *result;
-       lh_table_lookup_ex(t, k, &result);
-       return result;
-}
-
 json_bool lh_table_lookup_ex(struct lh_table* t, const void* k, void **v)
 {
        struct lh_entry *e = lh_table_lookup_entry(t, k);

diff --git a/linkhash.h b/linkhash.h
index 0f0e398764a4212430e1a86796c00e363c15bc1a..89ef3da64855057e684b9544748da625d7d29ea2 100644 (file)
--- a/linkhash.h
+++ b/linkhash.h
@@ -271,16 +271,6 @@ extern struct lh_entry* lh_table_lookup_entry(struct lh_table *t, const void *k)
  */
 extern struct lh_entry* lh_table_lookup_entry_w_hash(struct lh_table *t, const void *k, const unsigned long h);
 
-/**
- * Lookup a record into the table.
- *
- * @param t the table to lookup
- * @param k a pointer to the key to lookup
- * @return a pointer to the found value or NULL if it does not exist.
- * @deprecated Use lh_table_lookup_ex() instead.
- */
-THIS_FUNCTION_IS_DEPRECATED(extern const void* lh_table_lookup(struct lh_table *t, const void *k));
-
 /**
  * Lookup a record in the table.
  *