From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 28 Nov 2013 13:01:10 +0000 (+0400)
Subject: Removed duplicated hash function implementation (100% source compatible)
X-Git-Tag: php-5.6.0alpha1~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa427a10d4064e0873b3de8cf1b38f2dabc02913;p=php

Removed duplicated hash function implementation (100% source compatible)
---

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index ae7d8402f4..5d81c285d4 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -876,12 +876,6 @@ ZEND_API void zend_hash_merge_ex(HashTable *target, HashTable *source, copy_ctor
 }
 
 
-ZEND_API ulong zend_get_hash_value(const char *arKey, uint nKeyLength)
-{
-	return zend_inline_hash_func(arKey, nKeyLength);
-}
-
-
 /* Returns SUCCESS if found and FAILURE if not. The pointer to the
  * data is returned in pData. The reason is that there's no reason
  * someone using the hash table might not want to have NULL data
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 69732cd597..74bede1afd 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -157,8 +157,8 @@ ZEND_API int zend_hash_del_key_or_index(HashTable *ht, const char *arKey, uint n
 		zend_hash_del_key_or_index(ht, arKey, nKeyLength, h, HASH_DEL_KEY_QUICK)
 #define zend_hash_index_del(ht, h) \
 		zend_hash_del_key_or_index(ht, NULL, 0, h, HASH_DEL_INDEX)
-
-ZEND_API ulong zend_get_hash_value(const char *arKey, uint nKeyLength);
+#define zend_get_hash_value \
+		zend_hash_func
 
 /* Data retreival */
 ZEND_API int zend_hash_find(const HashTable *ht, const char *arKey, uint nKeyLength, void **pData);