com php-src: revamp ext/opcache: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_accelerator_ blacklist.c
ext/opcache/zend_accelerator_module.c e xt/opcache/zend_accelerator_util_funcs.c

From: Date: Mon, 16 Dec 2013 11:56:32 +0000
Subject: com php-src: revamp ext/opcache: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_accelerator_ blacklist.c
ext/opcache/zend_accelerator_module.c e xt/opcache/zend_accelerator_util_funcs.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74455@lists.php.net to get a copy of this message
Commit: d51ff1322d8cfc0525c83caf09b4850d646d9407 Author: Anatol Belski <ab@php.net> Mon, 16 Dec 2013 12:56:32 +0100 Parents: ca25f3d8293b092b77e3b5417cb00250d691aa18 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d51ff1322d8cfc0525c83caf09b4850d646d9407 Log: revamp ext/opcache Changed paths: M ext/opcache/ZendAccelerator.c M ext/opcache/ZendAccelerator.h M ext/opcache/zend_accelerator_blacklist.c M ext/opcache/zend_accelerator_module.c M ext/opcache/zend_accelerator_util_funcs.c Diff: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 23f08f14..d309969 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -641,7 +641,8 @@ static int zend_get_stream_timestamp(const char *filename, zend_stat_t *statbuf { php_stream_wrapper *wrapper; php_stream_statbuf stream_statbuf; - int ret, er; + int ret; + php_int_t er; if (!filename) { return FAILURE; @@ -710,7 +711,7 @@ static accel_time_t zend_get_file_handle_timestamp_win(zend_file_handle *file_ha ftime /= 10000000L; if (size) { - *size = (size_t)(((unsigned __int64)fdata.nFileSizeHigh) << 32 + (unsigned __int64)fdata.nFileSizeLow); + *size = (size_t)((((unsigned __int64)fdata.nFileSizeHigh) << 32) + (unsigned __int64)fdata.nFileSizeLow); } return (accel_time_t)ftime; } @@ -786,7 +787,8 @@ 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, er; + int ret; + php_int_t er; if (!stream || !stream->ops || diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index c816ac1..c219cf4 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -355,7 +355,7 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type T #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO -const char *accel_new_interned_string(const char *arKey, int nKeyLength, int free_src TSRMLS_DC); +const char *accel_new_interned_string(const char *arKey, zend_str_size_int nKeyLength, int free_src TSRMLS_DC); # define interned_free(s) do { \ if (!IS_INTERNED(s)) { \ diff --git a/ext/opcache/zend_accelerator_blacklist..c b/ext/opcache/zend_accelerator_blacklist.c index eb0bc21..8fdf03c 100644 --- a/ext/opcache/zend_accelerator_blacklist.c +++ b/ext/opcache/zend_accelerator_blacklist.c @@ -245,7 +245,7 @@ void zend_accel_blacklist_load(zend_blacklist *blacklist, char *filename) { char buf[MAXPATHLEN + 1], real_path[MAXPATHLEN + 1], *blacklist_path = NULL; FILE *fp; - int path_length, blacklist_path_length; + zend_str_size_int path_length, blacklist_path_length; TSRMLS_FETCH(); if ((fp = fopen(filename, "r")) == NULL) { diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index fc1cb95...cdc1d1a 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -80,7 +80,7 @@ static zend_function_entry accel_functions[] = { static int validate_api_restriction(TSRMLS_D) { if (ZCG(accel_directives).restrict_api && *ZCG(accel_directives).restrict_api) { - int len = strlen(ZCG(accel_directives).restrict_api); + zend_str_size_int len = strlen(ZCG(accel_directives).restrict_api); if (!SG(request_info).path_translated || strlen(SG(request_info).path_translated) < len || diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index 0059b45..c32efcc 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -1017,7 +1017,7 @@ zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, char *name, *cfilename; char haltoff[] = "__COMPILER_HALT_OFFSET__"; zend_str_size_int len; - int clen; + zend_str_size_int clen; cfilename = persistent_script->full_path; clen = strlen(cfilename);

« previous php.cvs (#74455) next »