Rename switch_hash_first() and switch_hash_next() to switch_core_hash_first() and...

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index efd983ded879449f359d855e8103f2b5b670598a..a7c412275914f0a1d863b7a3114aa900c36f2e61 100644 (file)
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -1332,14 +1332,14 @@ SWITCH_DECLARE(void *) switch_core_hash_find_rdlock(_In_ switch_hash_t *hash, _I
  \param hash the hashtable to use
  \return The element, or NULL if it wasn't found 
 */
-SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(char *deprecate_me, _In_ switch_hash_t *hash);
+SWITCH_DECLARE(switch_hash_index_t *) switch_core_hash_first(_In_ switch_hash_t *hash);
 
 /*!
  \brief Gets the next element of a hashtable
  \param hi The current element
  \return The next element, or NULL if there are no more
 */
-SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(_In_ switch_hash_index_t *hi);
+SWITCH_DECLARE(switch_hash_index_t *) switch_core_hash_next(_In_ switch_hash_index_t *hi);
 
 /*!
  \brief Gets the key and value of the current hash element
@@ -1348,6 +1348,31 @@ SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(_In_ switch_hash_index_t
  \param klen [out] the key's size
  \param val [out] the value 
 */
+SWITCH_DECLARE(void) switch_core_hash_this(_In_ switch_hash_index_t *hi, _Out_opt_ptrdiff_cap_(klen)
+                                                                         const void **key, _Out_opt_ switch_ssize_t *klen, _Out_ void **val);
+
+/*!
+ \brief DEPRECATED in favor of switch_core_hash_first(). Gets the first element of a hashtable.
+ \param deprecate_me [deprecated] NULL
+ \param hash the hashtable to use
+ \return The element, or NULL if it wasn't found 
+*/
+SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(char *deprecate_me, _In_ switch_hash_t *hash);
+
+/*!
+ \brief DEPRECATED in favor of switch_core_hash_next(). Gets the next element of a hashtable.
+ \param hi The current element
+ \return The next element, or NULL if there are no more
+*/
+SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(_In_ switch_hash_index_t *hi);
+
+/*!
+ \brief DEPRECATED in favor of switch_core_hash_this(). Gets the key and value of the current hash element.
+ \param hi The current element 
+ \param key [out] the key
+ \param klen [out] the key's size
+ \param val [out] the value 
+*/
 SWITCH_DECLARE(void) switch_hash_this(_In_ switch_hash_index_t *hi, _Out_opt_ptrdiff_cap_(klen)
                                                                          const void **key, _Out_opt_ switch_ssize_t *klen, _Out_ void **val);
 

diff --git a/src/switch_core_hash.c b/src/switch_core_hash.c
index c31a31fa9cd07f020fd08b9e109937bdec101f87..fd9494374a5c78be8fa51e6bbb6cdbb84e12ce83 100644 (file)
--- a/src/switch_core_hash.c
+++ b/src/switch_core_hash.c
@@ -222,17 +222,17 @@ SWITCH_DECLARE(void *) switch_core_hash_find_rdlock(switch_hash_t *hash, const c
        return val;
 }
 
-SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(char *deprecate_me, switch_hash_t *hash)
+SWITCH_DECLARE(switch_hash_index_t *) switch_core_hash_first(switch_hash_t *hash)
 {
        return (switch_hash_index_t *) sqliteHashFirst(&hash->table);
 }
 
-SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(switch_hash_index_t *hi)
+SWITCH_DECLARE(switch_hash_index_t *) switch_core_hash_next(switch_hash_index_t *hi)
 {
        return (switch_hash_index_t *) sqliteHashNext((HashElem *) hi);
 }
 
-SWITCH_DECLARE(void) switch_hash_this(switch_hash_index_t *hi, const void **key, switch_ssize_t *klen, void **val)
+SWITCH_DECLARE(void) switch_core_hash_this(switch_hash_index_t *hi, const void **key, switch_ssize_t *klen, void **val)
 {
        if (key) {
                *key = sqliteHashKey((HashElem *) hi);
@@ -245,6 +245,25 @@ SWITCH_DECLARE(void) switch_hash_this(switch_hash_index_t *hi, const void **key,
        }
 }
 
+/* Deprecated */
+SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(char *deprecate_me, switch_hash_t *hash)
+{
+       (void*)(deprecate_me);
+       return switch_core_hash_first(hash);
+}
+
+/* Deprecated */
+SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(switch_hash_index_t *hi)
+{
+       return switch_core_hash_next(hi);
+}
+
+/* Deprecated */
+SWITCH_DECLARE(void) switch_hash_this(switch_hash_index_t *hi, const void **key, switch_ssize_t *klen, void **val)
+{
+       return switch_core_hash_this(hi, key, klen, val);
+}
+
 /* For Emacs:
  * Local Variables:
  * mode:c