diff options
Diffstat (limited to 'Zend/zend_hash.h')
| -rw-r--r-- | Zend/zend_hash.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index ed0dbbd627..6f6d9f0ec7 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -35,11 +35,6 @@ #define HASH_NEXT_INSERT (1<<2) #define HASH_UPDATE_INDIRECT (1<<3) -#define HASH_UPDATE_KEY_IF_NONE 0 -#define HASH_UPDATE_KEY_IF_BEFORE 1 -#define HASH_UPDATE_KEY_IF_AFTER 2 -#define HASH_UPDATE_KEY_ANYWAY 3 - #define INVALID_IDX ((uint)-1) #define HASH_FLAG_PERSISTENT (1<<0) @@ -152,7 +147,6 @@ ZEND_API int zend_hash_get_current_key_type_ex(HashTable *ht, HashPosition *pos) ZEND_API zval *zend_hash_get_current_data_ex(HashTable *ht, HashPosition *pos); ZEND_API void zend_hash_internal_pointer_reset_ex(HashTable *ht, HashPosition *pos); ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos); -ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, zend_string *str_index, ulong num_index, int mode); typedef struct _HashPointer { HashPosition pos; @@ -181,8 +175,6 @@ ZEND_API int zend_hash_set_pointer(HashTable *ht, const HashPointer *ptr); zend_hash_internal_pointer_reset_ex(ht, &(ht)->nInternalPointer) #define zend_hash_internal_pointer_end(ht) \ zend_hash_internal_pointer_end_ex(ht, &(ht)->nInternalPointer) -#define zend_hash_update_current_key(ht, key_type, str_index, str_length, num_index) \ - zend_hash_update_current_key_ex(ht, key_type, str_index, str_length, num_index, HASH_UPDATE_KEY_ANYWAY) /* Copying, merging and sorting */ ZEND_API void zend_hash_copy(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor); @@ -373,12 +365,6 @@ static inline int zend_symtable_str_exists(HashTable *ht, const char *str, int l return zend_hash_str_exists(ht, str, len); } -static inline int zend_symtable_update_current_key_ex(HashTable *ht, zend_string *key, int mode) -{ -ZEND_HANDLE_NUMERIC(key->val, key->len+1, zend_hash_update_current_key_ex(ht, HASH_KEY_IS_LONG, NULL, idx, mode)); - return zend_hash_update_current_key_ex(ht, HASH_KEY_IS_STRING, key, 0, mode); -} - static inline void *zend_hash_add_ptr(HashTable *ht, zend_string *key, void *pData) { zval tmp, *zv; |