diff options
| author | Anatol Belski <ab@php.net> | 2014-08-20 17:49:52 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-20 17:49:52 +0200 |
| commit | 5eefbce083b48cc8281407fb64fdc4c985077483 (patch) | |
| tree | a9c08beb31f022507f71f929bdcea6b03376172b | |
| parent | e08fa78a54f7f1abf5b599bdcef5a7323fa5eb3a (diff) | |
| download | php-git-5eefbce083b48cc8281407fb64fdc4c985077483.tar.gz | |
fix types in virtual cwd
| -rw-r--r-- | Zend/zend_virtual_cwd.c | 12 | ||||
| -rw-r--r-- | Zend/zend_virtual_cwd.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c index 92613c7420..1d56cb95f5 100644 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@ -593,8 +593,8 @@ static inline zend_uint_t realpath_cache_key(const char *path, int path_len TSRM return 0; } - for (h = 2166136261U; bucket_key < e;) { - h *= 16777619; + for (h = Z_UI(2166136261); bucket_key < e;) { + h *= Z_UI(16777619); h ^= *bucket_key++; } HeapFree(GetProcessHeap(), 0, (LPVOID)bucket_key_start); @@ -607,8 +607,8 @@ static inline zend_uint_t realpath_cache_key(const char *path, int path_len) /* register zend_uint_t h; const char *e = path + path_len; - for (h = 2166136261U; path < e;) { - h *= 16777619; + for (h = Z_UI(2166136261); path < e;) { + h *= Z_UI(16777619); h ^= *path++; } @@ -756,12 +756,12 @@ CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_ } /* }}} */ -CWD_API int realpath_cache_size(TSRMLS_D) +CWD_API zend_int_t realpath_cache_size(TSRMLS_D) { return CWDG(realpath_cache_size); } -CWD_API int realpath_cache_max_buckets(TSRMLS_D) +CWD_API zend_int_t realpath_cache_max_buckets(TSRMLS_D) { return (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0])); } diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index 383b65db32..7c56686f2a 100644 --- a/Zend/zend_virtual_cwd.h +++ b/Zend/zend_virtual_cwd.h @@ -246,8 +246,8 @@ extern virtual_cwd_globals cwd_globals; CWD_API void realpath_cache_clean(TSRMLS_D); CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC); CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC); -CWD_API int realpath_cache_size(TSRMLS_D); -CWD_API int realpath_cache_max_buckets(TSRMLS_D); +CWD_API zend_int_t realpath_cache_size(TSRMLS_D); +CWD_API zend_int_t realpath_cache_max_buckets(TSRMLS_D); CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D); /* The actual macros to be used in programs using TSRM |