From: Sara Golemon <pollita@php.net>
Date: Mon, 25 May 2009 01:18:00 +0000 (+0000)
Subject: MFH(r-1.103) Expand zend_symtable_update_current_key to allow specifying HashPosition
X-Git-Tag: php-5.3.0RC3~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00a554b4a3c1ae9c254f230e96837a44f11d4b13;p=php

MFH(r-1.103) Expand zend_symtable_update_current_key to allow specifying HashPosition
---

diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 618da2bfa4..e8f2dc99bf 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -367,11 +367,14 @@ static inline int zend_symtable_exists(HashTable *ht, const char *arKey, uint nK
 	return zend_hash_exists(ht, arKey, nKeyLength);
 }
 
-static inline int zend_symtable_update_current_key(HashTable *ht, const char *arKey, uint nKeyLength, int mode)
+static inline int zend_symtable_update_current_key_ex(HashTable *ht, const char *arKey, uint nKeyLength, int mode, HashPosition *pos)
 {
-	ZEND_HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_update_current_key_ex(ht, HASH_KEY_IS_LONG, NULL, 0, idx, mode, NULL));
-	return zend_hash_update_current_key_ex(ht, HASH_KEY_IS_STRING, arKey, nKeyLength, 0, mode, NULL);
+	ZEND_HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_update_current_key_ex(ht, HASH_KEY_IS_LONG, NULL, 0, idx, mode, pos));
+	return zend_hash_update_current_key_ex(ht, HASH_KEY_IS_STRING, arKey, nKeyLength, 0, mode, pos);
 }
+#define zend_symtable_update_current_key(ht,arKey,nKeyLength,mode) \
+	zend_symtable_update_current_key_ex(ht, arKey, nKeyLength, mode, NULL)
+
 
 #endif							/* ZEND_HASH_H */