diff options
| author | Anatol Belski <ab@php.net> | 2014-10-28 10:43:10 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-28 17:24:59 +0100 |
| commit | e4464a8e85cde188e4361c14580adee85b1e7df3 (patch) | |
| tree | 66a73c173578d9efa6c58d481b75b06a2c239978 | |
| parent | 36b64b44d57f3043ebdaf5bd0c3aa4168f96bd69 (diff) | |
| download | php-git-e4464a8e85cde188e4361c14580adee85b1e7df3.tar.gz | |
convert API for size_t where zend_string is used under the hood
| -rw-r--r-- | Zend/zend_ts_hash.c | 6 | ||||
| -rw-r--r-- | Zend/zend_ts_hash.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Zend/zend_ts_hash.c b/Zend/zend_ts_hash.c index 43f02b48f8..dd7aaeb9a7 100644 --- a/Zend/zend_ts_hash.c +++ b/Zend/zend_ts_hash.c @@ -333,7 +333,7 @@ ZEND_API int zend_ts_hash_rehash(TsHashTable *ht) return retval; } -ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, int len) +ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, size_t len) { zval *retval; @@ -344,7 +344,7 @@ ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, int len) return retval; } -ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, int len, zval *pData ZEND_FILE_LINE_DC) +ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, size_t len, zval *pData ZEND_FILE_LINE_DC) { zval *retval; @@ -355,7 +355,7 @@ ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, int le return retval; } -ZEND_API zval *_zend_ts_hash_str_add(TsHashTable *ht, const char *key, int len, zval *pData ZEND_FILE_LINE_DC) +ZEND_API zval *_zend_ts_hash_str_add(TsHashTable *ht, const char *key, size_t len, zval *pData ZEND_FILE_LINE_DC) { zval *retval; diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h index 6cb36410b8..4bac7db205 100644 --- a/Zend/zend_ts_hash.h +++ b/Zend/zend_ts_hash.h @@ -102,16 +102,16 @@ void zend_ts_hash_display_pListTail(TsHashTable *ht); void zend_ts_hash_display(TsHashTable *ht); #endif -ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, int len); -ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, int len, zval *pData ZEND_FILE_LINE_DC); -ZEND_API zval *_zend_ts_hash_str_add(TsHashTable *ht, const char *key, int len, zval *pData ZEND_FILE_LINE_DC); +ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, size_t len); +ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, size_t len, zval *pData ZEND_FILE_LINE_DC); +ZEND_API zval *_zend_ts_hash_str_add(TsHashTable *ht, const char *key, size_t len, zval *pData ZEND_FILE_LINE_DC); #define zend_ts_hash_str_update(ht, key, len, pData) \ _zend_ts_hash_str_update(ht, key, len, pData ZEND_FILE_LINE_CC) #define zend_ts_hash_str_add(ht, key, len, pData) \ _zend_ts_hash_str_add(ht, key, len, pData ZEND_FILE_LINE_CC) -static zend_always_inline void *zend_ts_hash_str_find_ptr(TsHashTable *ht, const char *str, int len) +static zend_always_inline void *zend_ts_hash_str_find_ptr(TsHashTable *ht, const char *str, size_t len) { zval *zv; @@ -119,7 +119,7 @@ static zend_always_inline void *zend_ts_hash_str_find_ptr(TsHashTable *ht, const return zv ? Z_PTR_P(zv) : NULL; } -static zend_always_inline void *zend_ts_hash_str_update_ptr(TsHashTable *ht, const char *str, int len, void *pData) +static zend_always_inline void *zend_ts_hash_str_update_ptr(TsHashTable *ht, const char *str, size_t len, void *pData) { zval tmp, *zv; @@ -128,7 +128,7 @@ static zend_always_inline void *zend_ts_hash_str_update_ptr(TsHashTable *ht, con return zv ? Z_PTR_P(zv) : NULL; } -static zend_always_inline void *zend_ts_hash_str_add_ptr(TsHashTable *ht, const char *str, int len, void *pData) +static zend_always_inline void *zend_ts_hash_str_add_ptr(TsHashTable *ht, const char *str, size_t len, void *pData) { zval tmp, *zv; |