@@ -998,15 +998,15 @@ static zend_always_inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht,
998
998
((zval*)(((char*)(_el)) - (_size)))
999
999
1000
1000
#define _ZEND_HASH_FOREACH_VAL (_ht ) do { \
1001
- HashTable *__ht = (_ht); \
1001
+ const HashTable *__ht = (_ht); \
1002
1002
uint32_t _count = __ht->nNumUsed; \
1003
1003
size_t _size = ZEND_HASH_ELEMENT_SIZE(__ht); \
1004
1004
zval *_z = __ht->arPacked; \
1005
1005
for (; _count > 0; _z = ZEND_HASH_NEXT_ELEMENT(_z, _size), _count--) { \
1006
1006
if (UNEXPECTED(Z_TYPE_P(_z) == IS_UNDEF)) continue;
1007
1007
1008
1008
#define _ZEND_HASH_REVERSE_FOREACH_VAL (_ht ) do { \
1009
- HashTable *__ht = (_ht); \
1009
+ const HashTable *__ht = (_ht); \
1010
1010
uint32_t _idx = __ht->nNumUsed; \
1011
1011
size_t _size = ZEND_HASH_ELEMENT_SIZE(__ht); \
1012
1012
zval *_z = ZEND_HASH_ELEMENT_EX(__ht, _idx, _size); \
@@ -1015,7 +1015,7 @@ static zend_always_inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht,
1015
1015
if (UNEXPECTED(Z_TYPE_P(_z) == IS_UNDEF)) continue;
1016
1016
1017
1017
#define ZEND_HASH_FOREACH_FROM (_ht , indirect , _from ) do { \
1018
- HashTable *__ht = (_ht); \
1018
+ const HashTable *__ht = (_ht); \
1019
1019
zend_ulong __h; \
1020
1020
zend_string *__key = NULL; \
1021
1021
uint32_t _idx = (_from); \
@@ -1043,7 +1043,7 @@ static zend_always_inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht,
1043
1043
#define ZEND_HASH_FOREACH (_ht , indirect ) ZEND_HASH_FOREACH_FROM(_ht, indirect, 0)
1044
1044
1045
1045
#define ZEND_HASH_REVERSE_FOREACH (_ht , indirect ) do { \
1046
- HashTable *__ht = (_ht); \
1046
+ const HashTable *__ht = (_ht); \
1047
1047
uint32_t _idx = __ht->nNumUsed; \
1048
1048
zval *_z; \
1049
1049
zend_ulong __h; \
@@ -1232,9 +1232,9 @@ static zend_always_inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht,
1232
1232
1233
1233
/* Hash array iterators */
1234
1234
#define ZEND_HASH_MAP_FOREACH_FROM (_ht , indirect , _from ) do { \
1235
- HashTable *__ht = (_ht); \
1235
+ const HashTable *__ht = (_ht); \
1236
1236
Bucket *_p = __ht->arData + (_from); \
1237
- Bucket *_end = __ht->arData + __ht->nNumUsed; \
1237
+ const Bucket *_end = __ht->arData + __ht->nNumUsed; \
1238
1238
ZEND_ASSERT(!HT_IS_PACKED(__ht)); \
1239
1239
for (; _p != _end; _p++) { \
1240
1240
zval *_z = &_p->val; \
@@ -1246,7 +1246,7 @@ static zend_always_inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht,
1246
1246
#define ZEND_HASH_MAP_FOREACH (_ht , indirect ) ZEND_HASH_MAP_FOREACH_FROM(_ht, indirect, 0)
1247
1247
1248
1248
#define ZEND_HASH_MAP_REVERSE_FOREACH (_ht , indirect ) do { \
1249
- HashTable *__ht = (_ht); \
1249
+ /* const */ HashTable * __ht = (_ht ); \
1250
1250
uint32_t _idx = __ht -> nNumUsed ; \
1251
1251
Bucket * _p = __ht -> arData + _idx ; \
1252
1252
zval * _z ; \
@@ -1440,7 +1440,7 @@ static zend_always_inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht,
1440
1440
1441
1441
/* Packed array iterators */
1442
1442
#define ZEND_HASH_PACKED_FOREACH_FROM (_ht , _from ) do { \
1443
- HashTable *__ht = (_ht); \
1443
+ const HashTable *__ht = (_ht); \
1444
1444
zend_ulong _idx = (_from); \
1445
1445
zval *_z = __ht->arPacked + (_from); \
1446
1446
zval *_end = __ht->arPacked + __ht->nNumUsed; \
@@ -1452,7 +1452,7 @@ static zend_always_inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht,
1452
1452
#define ZEND_HASH_PACKED_FOREACH (_ht ) ZEND_HASH_PACKED_FOREACH_FROM(_ht, 0)
1453
1453
1454
1454
#define ZEND_HASH_PACKED_REVERSE_FOREACH (_ht ) do { \
1455
- HashTable *__ht = (_ht); \
1455
+ const HashTable *__ht = (_ht); \
1456
1456
zend_ulong _idx = __ht->nNumUsed; \
1457
1457
zval *_z = __ht->arPacked + _idx; \
1458
1458
ZEND_ASSERT(HT_IS_PACKED(__ht)); \
0 commit comments