MFZE1

zsuraski · zsuraski · commit 9b3df86e8db7 · 2001-08-20T14:58:52.000Z
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
@@ -1023,7 +1023,7 @@ ZEND_API int zend_hash_move_backwards_ex(HashTable *ht, HashPosition *pos)
 
 
 /* This function should be made binary safe  */
-ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, ulong *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos)
+ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, uint *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos)
 {
 	Bucket *p;
    
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
@@ -154,7 +154,7 @@ ZEND_API ulong zend_hash_next_free_element(HashTable *ht);
 /* traversing */
 ZEND_API int zend_hash_move_forward_ex(HashTable *ht, HashPosition *pos);
 ZEND_API int zend_hash_move_backwards_ex(HashTable *ht, HashPosition *pos);
-ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, ulong *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos);
+ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, uint *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos);
 ZEND_API int zend_hash_get_current_key_type_ex(HashTable *ht, HashPosition *pos);
 ZEND_API int zend_hash_get_current_data_ex(HashTable *ht, void **pData, HashPosition *pos);
 ZEND_API void zend_hash_internal_pointer_reset_ex(HashTable *ht, HashPosition *pos);

Original file line number	Diff line number	Diff line change
`@@ -1023,7 +1023,7 @@ ZEND_API int zend_hash_move_backwards_ex(HashTable ht, HashPosition pos)`
`1023`	`1023`
`1024`	`1024`
`1025`	`1025`	`/* This function should be made binary safe */`
`1026`		`-ZEND_API int zend_hash_get_current_key_ex(HashTable ht, char str_index, ulong str_length, ulong num_index, zend_bool duplicate, HashPosition pos)`
	`1026`	`+ZEND_API int zend_hash_get_current_key_ex(HashTable ht, char str_index, uint str_length, ulong num_index, zend_bool duplicate, HashPosition pos)`
`1027`	`1027`	`{`
`1028`	`1028`	`Bucket *p;`
`1029`	`1029`