com php-src: after merge fix: ext/opcache/zend_accelerator_ module.c
| From: | Anatol Belski | Date: | Fri, 21 Feb 2014 16:09:29 +0000 |
| Subject: | com php-src: after merge fix: ext/opcache/zend_accelerator_ module.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76174@lists.php.net to get a copy of this message | ||
Commit: bb9b9d7d2951ee206bcfa632515fd4819cb46806
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 17:09:29 +0100
Parents: 93e8fb39df9d0af18bbaadfd793847ffb3845ce7
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bb9b9d7d2951ee206bcfa632515fd4819cb46806
Log:
after merge fix
Changed paths:
M ext/opcache/zend_accelerator_module.c
Diff:
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 6ef409a..bd0ce1e 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -591,10 +591,10 @@ static ZEND_FUNCTION(opcache_get_status)
MAKE_STD_ZVAL(interned_strings_usage);
array_init(interned_strings_usage);
- add_assoc_long(interned_strings_usage, "buffer_size", ZCSG(interned_strings_end) -
ZCSG(interned_strings_start));
- add_assoc_long(interned_strings_usage, "used_memory", ZCSG(interned_strings_top) -
ZCSG(interned_strings_start));
- add_assoc_long(interned_strings_usage, "free_memory", ZCSG(interned_strings_end) -
ZCSG(interned_strings_top));
- add_assoc_long(interned_strings_usage, "number_of_strings",
ZCSG(interned_strings).nNumOfElements);
+ add_assoc_int(interned_strings_usage, "buffer_size", ZCSG(interned_strings_end) -
ZCSG(interned_strings_start));
+ add_assoc_int(interned_strings_usage, "used_memory", ZCSG(interned_strings_top) -
ZCSG(interned_strings_start));
+ add_assoc_int(interned_strings_usage, "free_memory", ZCSG(interned_strings_end) -
ZCSG(interned_strings_top));
+ add_assoc_int(interned_strings_usage, "number_of_strings",
ZCSG(interned_strings).nNumOfElements);
add_assoc_zval(return_value, "interned_strings_usage", interned_strings_usage);
}
#endif
@@ -797,7 +797,7 @@ static ZEND_FUNCTION(opcache_compile_file)
static ZEND_FUNCTION(opcache_is_script_cached)
{
char *script_name;
- int script_name_len;
+ zend_size_t script_name_len;
if (!validate_api_restriction(TSRMLS_C)) {
RETURN_FALSE;
@@ -807,7 +807,7 @@ static ZEND_FUNCTION(opcache_is_script_cached)
RETURN_FALSE;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &script_name,
&script_name_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &script_name,
&script_name_len) == FAILURE) {
return;
}