Skip to content

Commit 3ea59f0

Browse files
weltlingweltling
committed
fix size types in zend_ts_hash.*
1 parent da452e3 commit 3ea59f0

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎Zend/zend_ts_hash.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ZEND_API void zend_ts_hash_clean(TsHashTable *ht)
9999
end_write(ht);
100100
}
101101

102-
ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC)
102+
ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC)
103103
{
104104
int retval;
105105

@@ -110,7 +110,7 @@ ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, uint nKey
110110
return retval;
111111
}
112112

113-
ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC)
113+
ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC)
114114
{
115115
int retval;
116116

@@ -121,7 +121,7 @@ ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uin
121121
return retval;
122122
}
123123

124-
ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC)
124+
ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC)
125125
{
126126
int retval;
127127

@@ -132,7 +132,7 @@ ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uin
132132
return retval;
133133
}
134134

135-
ZEND_API int zend_ts_hash_add_empty_element(TsHashTable *ht, char *arKey, uint nKeyLength)
135+
ZEND_API int zend_ts_hash_add_empty_element(TsHashTable *ht, char *arKey, zend_size_t nKeyLength)
136136
{
137137
int retval;
138138

@@ -187,7 +187,7 @@ ZEND_API void zend_ts_hash_reverse_apply(TsHashTable *ht, apply_func_t apply_fun
187187
end_write(ht);
188188
}
189189

190-
ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, int flag)
190+
ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, int flag)
191191
{
192192
int retval;
193193

@@ -198,7 +198,7 @@ ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nK
198198
return retval;
199199
}
200200

201-
ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint nKeyLength)
201+
ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, zend_size_t nKeyLength)
202202
{
203203
zend_uint_t retval;
204204

@@ -209,7 +209,7 @@ ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint n
209209
return retval;
210210
}
211211

212-
ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, uint nKeyLength, void **pData)
212+
ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, void **pData)
213213
{
214214
int retval;
215215

@@ -220,7 +220,7 @@ ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, uint nKeyLength, vo
220220
return retval;
221221
}
222222

223-
ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void **pData)
223+
ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, void **pData)
224224
{
225225
int retval;
226226

@@ -242,7 +242,7 @@ ZEND_API int zend_ts_hash_index_find(TsHashTable *ht, zend_uint_t h, void **pDat
242242
return retval;
243243
}
244244

245-
ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, uint nKeyLength)
245+
ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, zend_size_t nKeyLength)
246246
{
247247
int retval;
248248

‎Zend/zend_ts_hash.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,25 @@ ZEND_API void zend_ts_hash_clean(TsHashTable *ht);
4949

5050

5151
/* additions/updates/changes */
52-
ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC);
52+
ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC);
5353
#define zend_ts_hash_update(ht, arKey, nKeyLength, pData, nDataSize, pDest) \
5454
_zend_ts_hash_add_or_update(ht, arKey, nKeyLength, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC)
5555
#define zend_ts_hash_add(ht, arKey, nKeyLength, pData, nDataSize, pDest) \
5656
_zend_ts_hash_add_or_update(ht, arKey, nKeyLength, pData, nDataSize, pDest, HASH_ADD ZEND_FILE_LINE_CC)
5757

58-
ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC);
58+
ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC);
5959
#define zend_ts_hash_quick_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) \
6060
_zend_ts_hash_quick_add_or_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC)
6161
#define zend_ts_hash_quick_add(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) \
6262
_zend_ts_hash_quick_add_or_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest, HASH_ADD ZEND_FILE_LINE_CC)
6363

64-
ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC);
64+
ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC);
6565
#define zend_ts_hash_index_update(ht, h, pData, nDataSize, pDest) \
6666
_zend_ts_hash_index_update_or_next_insert(ht, h, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC)
6767
#define zend_ts_hash_next_index_insert(ht, pData, nDataSize, pDest) \
6868
_zend_ts_hash_index_update_or_next_insert(ht, 0, pData, nDataSize, pDest, HASH_NEXT_INSERT ZEND_FILE_LINE_CC)
6969

70-
ZEND_API int zend_ts_hash_add_empty_element(TsHashTable *ht, char *arKey, uint nKeyLength);
70+
ZEND_API int zend_ts_hash_add_empty_element(TsHashTable *ht, char *arKey, zend_size_t nKeyLength);
7171

7272
ZEND_API void zend_ts_hash_graceful_destroy(TsHashTable *ht);
7373
ZEND_API void zend_ts_hash_apply(TsHashTable *ht, apply_func_t apply_func TSRMLS_DC);
@@ -78,21 +78,21 @@ ZEND_API void zend_ts_hash_reverse_apply(TsHashTable *ht, apply_func_t apply_fun
7878

7979

8080
/* Deletes */
81-
ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, int flag);
81+
ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, int flag);
8282
#define zend_ts_hash_del(ht, arKey, nKeyLength) \
8383
zend_ts_hash_del_key_or_index(ht, arKey, nKeyLength, 0, HASH_DEL_KEY)
8484
#define zend_ts_hash_index_del(ht, h) \
8585
zend_ts_hash_del_key_or_index(ht, NULL, 0, h, HASH_DEL_INDEX)
8686

87-
ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint nKeyLength);
87+
ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, zend_size_t nKeyLength);
8888

8989
/* Data retreival */
90-
ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, uint nKeyLength, void **pData);
91-
ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void **pData);
90+
ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, void **pData);
91+
ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, void **pData);
9292
ZEND_API int zend_ts_hash_index_find(TsHashTable *ht, zend_uint_t h, void **pData);
9393

9494
/* Misc */
95-
ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, uint nKeyLength);
95+
ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, zend_size_t nKeyLength);
9696
ZEND_API int zend_ts_hash_index_exists(TsHashTable *ht, zend_uint_t h);
9797

9898
/* Copying, merging and sorting */

0 commit comments

Comments
 (0)