Skip to content
Browse files

Make it a macro

  • Loading branch information...
1 parent afdc3e9 commit 184118d9a94981c9aa0a3ed4140bfc06ca1da311 Marcus Boerger committed Jul 20, 2003
Showing with 2 additions and 15 deletions.
  1. +0 −14 Zend/zend_hash.c
  2. +2 −1 Zend/zend_hash.h
View
14 Zend/zend_hash.c
@@ -1005,20 +1005,6 @@ ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos
}
-ZEND_API int zend_hash_has_more_elements_ex(HashTable *ht, HashPosition *pos)
-{
- HashPosition *current = pos ? pos : &ht->pInternalPointer;
-
- IS_CONSISTENT(ht);
-
- if (*current) {
- return SUCCESS;
- } else {
- return FAILURE;
- }
-}
-
-
ZEND_API int zend_hash_move_forward_ex(HashTable *ht, HashPosition *pos)
{
HashPosition *current = pos ? pos : &ht->pInternalPointer;
View
3 Zend/zend_hash.h
@@ -164,7 +164,8 @@ ZEND_API int zend_hash_index_exists(HashTable *ht, ulong h);
ZEND_API ulong zend_hash_next_free_element(HashTable *ht);
/* traversing */
-ZEND_API int zend_hash_has_more_elements_ex(HashTable *ht, HashPosition *pos);
+#define zend_hash_has_more_elements_ex(ht, pos) \
+ (zend_hash_get_current_key_type_ex(ht, pos) == HASH_KEY_NON_EXISTANT ? FAILURE : SUCCESS)
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, uint *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos);

0 comments on commit 184118d

Please sign in to comment.
Something went wrong with that request. Please try again.