com php-src: fixes ext/opcache after too much replacement: ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_ module.c

Commit: 5f3e76dfe5497479d689a659a6e535cdc569ae46 Author: Anatol Belski <ab@php.net> Wed, 18 Dec 2013 15:21:34 -0800 Parents: ba5a1995bb7ca16da297f873a3578de27671bbf7 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5f3e76dfe5497479d689a659a6e535cdc569ae46 Log: fixes ext/opcache after too much replacement Changed paths: M ext/opcache/ZendAccelerator.c M ext/opcache/zend_accelerator_module.c Diff: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 348c4f9..9da1827 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -642,7 +642,7 @@ static int zend_get_stream_timestamp(const char *filename, zend_stat_t *statbuf php_stream_wrapper *wrapper; php_stream_statbuf stream_statbuf; int ret; - php_int_t er; + zend_size_t er; if (!filename) { return FAILURE; @@ -788,7 +788,7 @@ static accel_time_t zend_get_file_handle_timestamp(zend_file_handle *file_handle php_stream *stream = (php_stream *)file_handle->handle.stream.handle; php_stream_statbuf sb; int ret; - php_int_t er; + zend_size_t er; if (!stream || !stream->ops || diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index ba88e6b..1f30e3b 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -94,8 +94,8 @@ static int validate_api_restriction(TSRMLS_D) static ZEND_INI_MH(OnUpdateMemoryConsumption) { - php_int_t *p; - php_int_t memsize; + zend_size_t *p; + zend_size_t memsize; #ifndef ZTS char *base = (char *) mh_arg2; #else @@ -105,7 +105,7 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption) /* keep the compiler happy */ (void)entry; (void)new_value_length; (void)mh_arg2; (void)mh_arg3; (void)stage; - p = (php_int_t *) (base + (size_t)mh_arg1); + p = (zend_size_t *) (base + (size_t)mh_arg1); memsize = atoi(new_value); /* sanity check we must use at least 8 MB */ if (memsize < 8) { @@ -132,8 +132,8 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption) static ZEND_INI_MH(OnUpdateMaxAcceleratedFiles) { - php_int_t *p; - php_int_t size; + zend_size_t *p; + zend_size_t size; #ifndef ZTS char *base = (char *) mh_arg2; #else @@ -143,7 +143,7 @@ static ZEND_INI_MH(OnUpdateMaxAcceleratedFiles) /* keep the compiler happy */ (void)entry; (void)new_value_length; (void)mh_arg2; (void)mh_arg3; (void)stage; - p = (php_int_t *) (base + (size_t)mh_arg1); + p = (zend_size_t *) (base + (size_t)mh_arg1); size = atoi(new_value); /* sanity check we must use a value between MIN_ACCEL_FILES and MAX_ACCEL_FILES */ @@ -179,7 +179,7 @@ static ZEND_INI_MH(OnUpdateMaxAcceleratedFiles) static ZEND_INI_MH(OnUpdateMaxWastedPercentage) { double *p; - php_int_t percentage; + zend_size_t percentage; #ifndef ZTS char *base = (char *) mh_arg2; #else @@ -519,7 +519,7 @@ static zval* accelerator_get_scripts(TSRMLS_D) add_assoc_stringl(persistent_script_report, "last_used", str, len, 1); add_assoc_long(persistent_script_report, "last_used_timestamp", script->dynamic_members.last_used); if (ZCG(accel_directives).validate_timestamps) { - add_assoc_long(persistent_script_report, "timestamp", (php_int_t)script->timestamp); + add_assoc_long(persistent_script_report, "timestamp", (zend_size_t)script->timestamp); } timerclear(&exec_time); timerclear(&fetch_time); @@ -536,7 +536,7 @@ static zval* accelerator_get_scripts(TSRMLS_D) Obtain statistics information regarding code acceleration */ static ZEND_FUNCTION(opcache_get_status) { - php_int_t reqs; + zend_size_t reqs; zval *memory_usage,*statistics,*scripts; zend_bool fetch_scripts = 1;