took out zend_hash_pointer_update() & zend_hash_pointer_index_update_or_next_insert...

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index ba2a4aa9e997aaed3df18ba4d4cc381ee530f493..921fa00a0599f9c1363f0623548612420e69ce72 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -453,20 +453,6 @@ ZEND_API int zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void
 }
 
 
-ZEND_API int zend_hash_pointer_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData)
-{
-       zend_error(E_ERROR, "zend_hash_pointer_*() functions are no longer supported");
-       return FAILURE;
-}
-
-
-ZEND_API int zend_hash_pointer_index_update_or_next_insert(HashTable *ht, ulong h, void *pData, int flag)
-{
-       zend_error(E_ERROR, "zend_hash_pointer_*() functions are no longer supported");
-       return FAILURE;
-}
-
-
 static int zend_hash_if_full_do_resize(HashTable *ht)
 {
        Bucket **t;

diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index b824cd4bf30e7a59bd6d45e2163e9aa01e8d5cb5..5d512b70ef01fea0b85237317c14fdedd8f8b150 100644 (file)
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -103,8 +103,6 @@ ZEND_API int zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void
 #define zend_hash_next_index_insert_ptr(ht,pData,nDataSize,pDest) \
                zend_hash_index_update_or_next_insert(ht,0,pData,nDataSize,pDest,HASH_NEXT_INSERT|HASH_ADD_PTR)
 
-ZEND_API int zend_hash_pointer_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData);
-
 typedef struct _zend_hash_key {
        char *arKey;
        uint nKeyLength;
@@ -115,11 +113,6 @@ typedef struct _zend_hash_key {
 #define ZEND_STD_HASH_APPLIER          \
        int (*)(void *element, int num_args, va_list args, zend_hash_key *hash_key)
 
-ZEND_API int zend_hash_pointer_index_update_or_next_insert(HashTable *ht, ulong h, void *pData, int flag);
-#define zend_hash_pointer_index_update(ht,h,pData) \
-               zend_hash_pointer_index_update_or_next_insert(ht,h,pData,HASH_UPDATE)
-#define zend_hash_next_index_pointer_insert(ht,pData) \
-        zend_hash_pointer_index_update_or_next_insert(ht,0,pData,HASH_NEXT_INSERT)
 ZEND_API void zend_hash_graceful_destroy(HashTable *ht);
 ZEND_API void zend_hash_apply(HashTable *ht,int (*destruct)(void *));
 ZEND_API void zend_hash_apply_with_argument(HashTable *ht,int (*destruct)(void *, void *), void *);