com php-src: fix types in virtual cwd: Zend/zend_virtual_cw d.c Zend/zend_virtual_cwd.h
| From: | Anatol Belski | Date: | Wed, 20 Aug 2014 15:49:52 +0000 |
| Subject: | com php-src: fix types in virtual cwd: Zend/zend_virtual_cw d.c Zend/zend_virtual_cwd.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80725@lists.php.net to get a copy of this message | ||
Commit: 5eefbce083b48cc8281407fb64fdc4c985077483
Author: Anatol Belski <ab@php.net> Wed, 20 Aug 2014 17:49:52 +0200
Parents: e08fa78a54f7f1abf5b599bdcef5a7323fa5eb3a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5eefbce083b48cc8281407fb64fdc4c985077483
Log:
fix types in virtual cwd
Changed paths:
M Zend/zend_virtual_cwd.c
M Zend/zend_virtual_cwd.h
Diff:
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index 92613c7..1d56cb9 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 383b65d..7c56686 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