cvs: ZendEngine2(PHP_5_3) / zend_hash.h

pollita		Mon May 25 01:18:00 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_hash.h 
  Log:
  MFH(r-1.103) Expand zend_symtable_update_current_key to allow specifying HashPosition
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.h?r1=1.78.2.2.2.2.2.12&r2=1.78.2.2.2.2.2.13&diff_format=u
Index: ZendEngine2/zend_hash.h
diff -u ZendEngine2/zend_hash.h:1.78.2.2.2.2.2.12 ZendEngine2/zend_hash.h:1.78.2.2.2.2.2.13
--- ZendEngine2/zend_hash.h:1.78.2.2.2.2.2.12	Tue Mar 24 16:02:50 2009
+++ ZendEngine2/zend_hash.h	Mon May 25 01:18:00 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_hash.h,v 1.78.2.2.2.2.2.12 2009/03/24 16:02:50 dmitry Exp $ */
+/* $Id: zend_hash.h,v 1.78.2.2.2.2.2.13 2009/05/25 01:18:00 pollita Exp $ */
 
 #ifndef ZEND_HASH_H
 #define ZEND_HASH_H
@@ -367,11 +367,14 @@
 	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 */