diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-16 14:28:30 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-16 18:29:00 +0200 |
| commit | 311a67a2eddd48779b928dfec00d5810c6232862 (patch) | |
| tree | 4cf8e772958735626c18012f7c364802356851dd /Zend/zend_ts_hash.h | |
| parent | 0bf55b65d47ab74fef22f35361a955a0b6704bff (diff) | |
| download | php-git-311a67a2eddd48779b928dfec00d5810c6232862.tar.gz | |
Remove HASH_NEXT_INSERT flag
We already pass ht->nNextFreeElement and the rest is handled by
ZEND_HASH_ADD.
Diffstat (limited to 'Zend/zend_ts_hash.h')
| -rw-r--r-- | Zend/zend_ts_hash.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h index 0adedff437..3d05dd572d 100644 --- a/Zend/zend_ts_hash.h +++ b/Zend/zend_ts_hash.h @@ -55,11 +55,11 @@ ZEND_API zval *_zend_ts_hash_add_or_update(TsHashTable *ht, zend_string *key, zv #define zend_ts_hash_add(ht, key, pData) \ _zend_ts_hash_add_or_update(ht, key, pData, HASH_ADD ZEND_FILE_LINE_CC) -ZEND_API zval *_zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_ulong h, zval *pData, int flag ZEND_FILE_LINE_DC); +ZEND_API zval *_zend_ts_hash_index_add_or_update(TsHashTable *ht, zend_ulong h, zval *pData, int flag ZEND_FILE_LINE_DC); #define zend_ts_hash_index_update(ht, h, pData) \ - _zend_ts_hash_index_update_or_next_insert(ht, h, pData, HASH_UPDATE ZEND_FILE_LINE_CC) + _zend_ts_hash_index_add_or_update(ht, h, pData, HASH_UPDATE ZEND_FILE_LINE_CC) #define zend_ts_hash_next_index_insert(ht, pData) \ - _zend_ts_hash_index_update_or_next_insert(ht, 0, pData, HASH_NEXT_INSERT ZEND_FILE_LINE_CC) + _zend_ts_hash_index_add_or_update(ht, ht->nNextFreeElement, pData, HASH_ADD ZEND_FILE_LINE_CC) ZEND_API zval* zend_ts_hash_add_empty_element(TsHashTable *ht, zend_string *key); |