Commit: 27a86a4402022bf5ba180a6dbb46cf86c9a05b72 Author: Anatol Belski <a...@php.net> Sat, 9 Nov 2013 02:09:14 +0100 Parents: 5615326e1f216ee1d8884bdab89f0b79dfb76218 Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=27a86a4402022bf5ba180a6dbb46cf86c9a05b72 Log: fixed 64 bit pass by ref Changed paths: M Zend/zend_object_handlers.h M main/php_variables.c M main/streams/memory.c M win32/registry.c M win32/sendmail.c Diff: diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h index be30af2..7fb6a92 100644 --- a/Zend/zend_object_handlers.h +++ b/Zend/zend_object_handlers.h @@ -108,7 +108,7 @@ typedef int (*zend_object_cast_t)(zval *readobj, zval *retval, int type TSRMLS_D /* updates *count to hold the number of elements present and returns SUCCESS. * Returns FAILURE if the object does not have any sense of overloaded dimensions */ -typedef int (*zend_object_count_elements_t)(zval *object, long *count TSRMLS_DC); +typedef int (*zend_object_count_elements_t)(zval *object, zend_int_t *count TSRMLS_DC); typedef int (*zend_object_get_closure_t)(zval *obj, zend_class_entry **ce_ptr, union _zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC); diff --git a/main/php_variables.c b/main/php_variables.c index 97d5ea1..22eae39 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -243,8 +243,7 @@ static zend_bool add_post_var(zval *arr, post_var_data_t *var, zend_bool eof TSR { char *ksep, *vsep; size_t klen, vlen; - /* FIXME: string-size_t */ - unsigned int new_vlen; + zend_str_size_uint new_vlen; if (var->ptr >= var->end) { return 0; diff --git a/main/streams/memory.c b/main/streams/memory.c index ac6e1ee..ba51136 100644 --- a/main/streams/memory.c +++ b/main/streams/memory.c @@ -22,7 +22,7 @@ #include "php.h" PHPAPI int php_url_decode(char *str, int len); -PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length, int *ret_length); +PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length, zend_str_size_int *ret_length); /* Memory streams use a dynamic memory buffer to emulate a stream. * You can use php_stream_memory_open to create a readonly stream diff --git a/win32/registry.c b/win32/registry.c index e13a0fc..66ee096 100644 --- a/win32/registry.c +++ b/win32/registry.c @@ -100,7 +100,7 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_ if (parent_ht) { HashPosition pos; char *index; - uint index_len; + zend_str_size_uint index_len; zend_uint_t num; zval **tmpdata; @@ -172,7 +172,7 @@ static void delete_internal_hashtable(void *data) void UpdateIniFromRegistry(char *path TSRMLS_DC) { char *p, *orig_path; - int path_len; + zend_str_size_int path_len; HashTable **pht; if(!path) { @@ -253,7 +253,7 @@ void UpdateIniFromRegistry(char *path TSRMLS_DC) HashTable *ht = *pht; HashPosition pos; char *index; - uint index_len; + zend_str_size_uint index_len; zend_uint_t num; zval **data; diff --git a/win32/sendmail.c b/win32/sendmail.c index 93e68f4..da33651 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -157,7 +157,7 @@ static char *php_win32_mail_trim_header(char *header TSRMLS_DC) #if HAVE_PCRE || HAVE_BUNDLED_PCRE char *result, *result2; - int result_len; + zend_str_size_int result_len; zval *replace; if (!header) { @@ -388,7 +388,7 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char char *server_response = NULL; char *stripped_header = NULL; char *data_cln; - int data_cln_len; + zend_str_size_int data_cln_len; /* check for NULL parameters */ if (data == NULL) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
