com php-src: more fixes to spl: ext/spl/spl_directory.c e xt/spl/spl_directory.h ext/spl/spl_dllist.c ext/spl /spl_engine.c ext/spl/spl_engine.h
ext/spl/spl_fu nctions.h ext/spl/spl_heap.c ext/spl/spl_observer .c ext/spl/tests/bug64782.phpt

From: Date: Tue, 12 Nov 2013 09:56:01 +0000
Subject: com php-src: more fixes to spl: ext/spl/spl_directory.c e xt/spl/spl_directory.h ext/spl/spl_dllist.c ext/spl /spl_engine.c ext/spl/spl_engine.h
ext/spl/spl_fu nctions.h ext/spl/spl_heap.c ext/spl/spl_observer .c ext/spl/tests/bug64782.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73939@lists.php.net to get a copy of this message
Commit: ef1c2ffaf0f68a0779fc88ad46486de59d67bf6a Author: Anatol Belski <ab@php.net> Tue, 12 Nov 2013 10:56:01 +0100 Parents: ae1fb8dc4b49cf40642181e08180ad81c0607484 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ef1c2ffaf0f68a0779fc88ad46486de59d67bf6a Log: more fixes to spl Changed paths: M ext/spl/spl_directory.c M ext/spl/spl_directory.h M ext/spl/spl_dllist.c M ext/spl/spl_engine.c M ext/spl/spl_engine.h M ext/spl/spl_functions.h M ext/spl/spl_heap.c M ext/spl/spl_observer.c M ext/spl/tests/bug64782.phpt

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index d79c504..019ec44 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -676,7 +676,7 @@ zend_function *spl_filesystem_object_get_method_check(zval **object_ptr, char *m #define DIT_CTOR_FLAGS 0x00000001 #define DIT_CTOR_GLOB 0x00000002 -void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, long ctor_flags) /* {{{ */ +void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, php_int_t ctor_flags) /* {{{ */ { spl_filesystem_object *intern; char *path; @@ -2052,7 +2052,7 @@ static int spl_filesystem_file_read(spl_filesystem_object *intern, int silent TS { char *buf; size_t line_len = 0; - long line_add = (intern->u.file.current_line || intern->u.file.current_zval) ? 1 : 0; + php_int_t line_add = (intern->u.file.current_line || intern->u.file.current_zval) ? 1 : 0; spl_filesystem_file_free_line(intern TSRMLS_CC); @@ -2541,7 +2541,7 @@ SPL_METHOD(SplFileObject, getMaxLineLen) return; } - RETURN_LONG((long)intern->u.file.max_line_len); + RETURN_LONG((php_int_t)intern->u.file.max_line_len); } /* }}} */ /* {{{ proto bool SplFileObject::hasChildren() @@ -2734,7 +2734,7 @@ SPL_METHOD(SplFileObject, fflush) SPL_METHOD(SplFileObject, ftell) { spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC); - long ret = php_stream_tell(intern->u.file.stream); + php_int_t ret = php_stream_tell(intern->u.file.stream); if (ret == -1) { RETURN_FALSE; diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h index 48e0d87..d4cd940 100644 --- a/ext/spl/spl_directory.h +++ b/ext/spl/spl_directory.h @@ -69,7 +69,7 @@ struct _spl_filesystem_object { char *file_name; zend_str_size_int file_name_len; SPL_FS_OBJ_TYPE type; - long flags; + php_int_t flags; zend_class_entry *file_class; zend_class_entry *info_class; union { @@ -94,7 +94,7 @@ struct _spl_filesystem_object { char *current_line; size_t current_line_len; size_t max_line_len; - long current_line_num; + php_int_t current_line_num; zval zresource; zend_function *func_getCurr; char delimiter; diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index 315cc9e..0681aba 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -136,9 +136,9 @@ static spl_ptr_llist *spl_ptr_llist_init(spl_ptr_llist_ctor_func ctor, spl_ptr_l } /* }}} */ -static long spl_ptr_llist_count(spl_ptr_llist *llist) /* {{{ */ +static php_int_t spl_ptr_llist_count(spl_ptr_llist *llist) /* {{{ */ { - return (long)llist->count; + return (php_int_t)llist->count; } /* }}} */ @@ -160,7 +160,7 @@ static void spl_ptr_llist_destroy(spl_ptr_llist *llist TSRMLS_DC) /* {{{ */ } /* }}} */ -static spl_ptr_llist_element *spl_ptr_llist_offset(spl_ptr_llist *llist, long offset, int backward) /* {{{ */ +static spl_ptr_llist_element *spl_ptr_llist_offset(spl_ptr_llist *llist, php_int_t offset, int backward) /* {{{ */ { spl_ptr_llist_element *current; @@ -481,7 +481,7 @@ static zend_object_value spl_dllist_object_clone(zval *zobject TSRMLS_DC) /* {{{ } /* }}} */ -static int spl_dllist_object_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */ +static int spl_dllist_object_count_elements(zval *object, php_int_t *count TSRMLS_DC) /* {{{ */ { spl_dllist_object *intern = (spl_dllist_object*)zend_object_store_get_object(object TSRMLS_CC); @@ -493,7 +493,7 @@ static int spl_dllist_object_count_elements(zval *object, long *count TSRMLS_DC) MAKE_STD_ZVAL(intern->retval); ZVAL_ZVAL(intern->retval, rv, 1, 1); convert_to_long(intern->retval); - *count = (long) Z_LVAL_P(intern->retval); + *count = (php_int_t) Z_LVAL_P(intern->retval); return SUCCESS; } *count = 0; @@ -692,7 +692,7 @@ SPL_METHOD(SplDoublyLinkedList, bottom) Return the number of elements in the datastructure. */ SPL_METHOD(SplDoublyLinkedList, count) { - long count; + php_int_t count; spl_dllist_object *intern = (spl_dllist_object*)zend_object_store_get_object(getThis() TSRMLS_CC); if (zend_parse_parameters_none() == FAILURE) { @@ -708,7 +708,7 @@ SPL_METHOD(SplDoublyLinkedList, count) Return true if the SplDoublyLinkedList is empty. */ SPL_METHOD(SplDoublyLinkedList, isEmpty) { - long count; + php_int_t count; if (zend_parse_parameters_none() == FAILURE) { return; @@ -766,7 +766,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetExists) { zval *zindex; spl_dllist_object *intern; - long index; + php_int_t index; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zindex) == FAILURE) { return; @@ -783,7 +783,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetExists) SPL_METHOD(SplDoublyLinkedList, offsetGet) { zval *zindex, *value; - long index; + php_int_t index; spl_dllist_object *intern; spl_ptr_llist_element *element; @@ -829,7 +829,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetSet) spl_ptr_llist_push(intern->llist, value TSRMLS_CC); } else { /* $obj[$foo] = ... */ - long index; + php_int_t index; spl_ptr_llist_element *element; index = spl_offset_convert_to_long(zindex TSRMLS_CC); @@ -870,7 +870,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetSet) SPL_METHOD(SplDoublyLinkedList, offsetUnset) { zval *zindex; - long index; + php_int_t index; spl_dllist_object *intern; spl_ptr_llist_element *element; spl_ptr_llist *llist; @@ -1229,7 +1229,7 @@ SPL_METHOD(SplDoublyLinkedList, unserialize) error: PHP_VAR_UNSERIALIZE_DESTROY(var_hash); - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset %ld of %d bytes", (long)((char*)p - buf), buf_len); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset " ZEND_INT_FMT " of " ZEND_UINT_FMT " bytes", (php_int_t)((char*)p - buf), buf_len); return; } /* }}} */ @@ -1241,7 +1241,7 @@ SPL_METHOD(SplDoublyLinkedList, add) zval *zindex, *value; spl_dllist_object *intern; spl_ptr_llist_element *element; - long index; + php_int_t index; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &zindex, &value) == FAILURE) { return; diff --git a/ext/spl/spl_engine.c b/ext/spl/spl_engine.c index 5cec256..79a2f82 100644 --- a/ext/spl/spl_engine.c +++ b/ext/spl/spl_engine.c @@ -43,14 +43,14 @@ PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc TSRM } /* }}} */ -PHPAPI long spl_offset_convert_to_long(zval *offset TSRMLS_DC) /* {{{ */ +PHPAPI php_int_t spl_offset_convert_to_long(zval *offset TSRMLS_DC) /* {{{ */ { switch (Z_TYPE_P(offset)) { case IS_STRING: ZEND_HANDLE_NUMERIC(Z_STRVAL_P(offset), Z_STRSIZE_P(offset)+1, idx); break; case IS_DOUBLE: - return (long)Z_DVAL_P(offset); + return (php_int_t)Z_DVAL_P(offset); case IS_RESOURCE: case IS_BOOL: case IS_LONG: diff --git a/ext/spl/spl_engine.h b/ext/spl/spl_engine.h index 103a5c4..138d7fb 100644 --- a/ext/spl/spl_engine.h +++ b/ext/spl/spl_engine.h @@ -27,7 +27,7 @@ PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc TSRMLS_DC); -PHPAPI long spl_offset_convert_to_long(zval *offset TSRMLS_DC); +PHPAPI php_int_t spl_offset_convert_to_long(zval *offset TSRMLS_DC); /* {{{ spl_instantiate_arg_ex1 */ static inline int spl_instantiate_arg_ex1(zend_class_entry *pce, zval **retval, int alloc, zval *arg1 TSRMLS_DC) diff --git a/ext/spl/spl_functions.h b/ext/spl/spl_functions.h index 119eb54..caccec2 100644 --- a/ext/spl/spl_functions.h +++ b/ext/spl/spl_functions.h @@ -47,7 +47,7 @@ typedef zend_object_value (*create_object_func_t)(zend_class_entry *class_type T spl_register_property(spl_ce_ ## class_name, prop_name, sizeof(prop_name)-1, prop_flags TSRMLS_CC); #define REGISTER_SPL_CLASS_CONST_LONG(class_name, const_name, value) \ - zend_declare_class_constant_long(spl_ce_ ## class_name, const_name, sizeof(const_name)-1, (long)value TSRMLS_CC); + zend_declare_class_constant_long(spl_ce_ ## class_name, const_name, sizeof(const_name)-1, (php_int_t)value TSRMLS_CC); void spl_register_std_class(zend_class_entry ** ppce, char * class_name, create_object_func_t ctor, const zend_function_entry * function_list TSRMLS_DC); void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, create_object_func_t ctor, const zend_function_entry * function_list TSRMLS_DC); diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index b094b95..0cea9d4 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -99,7 +99,7 @@ static void spl_ptr_heap_zval_ctor(spl_ptr_heap_element elem TSRMLS_DC) { /* {{{ } /* }}} */ -static int spl_ptr_heap_cmp_cb_helper(zval *object, spl_heap_object *heap_object, zval *a, zval *b, long *result TSRMLS_DC) { /* {{{ */ +static int spl_ptr_heap_cmp_cb_helper(zval *object, spl_heap_object *heap_object, zval *a, zval *b, php_int_t *result TSRMLS_DC) { /* {{{ */ zval *result_p = NULL; zend_call_method_with_2_params(&object, heap_object->std.ce, &heap_object->fptr_cmp, "compare", &result_p, a, b); @@ -150,7 +150,7 @@ static int spl_ptr_heap_zval_max_cmp(spl_ptr_heap_element a, spl_ptr_heap_elemen if (object) { spl_heap_object *heap_object = (spl_heap_object*)zend_object_store_get_object((zval *)object TSRMLS_CC); if (heap_object->fptr_cmp) { - long lval = 0; + php_int_t lval = 0; if (spl_ptr_heap_cmp_cb_helper((zval *)object, heap_object, (zval *)a, (zval *)b, &lval TSRMLS_CC) == FAILURE) { /* exception or call failure */ return 0; @@ -175,7 +175,7 @@ static int spl_ptr_heap_zval_min_cmp(spl_ptr_heap_element a, spl_ptr_heap_elemen if (object) { spl_heap_object *heap_object = (spl_heap_object*)zend_object_store_get_object((zval *)object TSRMLS_CC); if (heap_object->fptr_cmp) { - long lval = 0; + php_int_t lval = 0; if (spl_ptr_heap_cmp_cb_helper((zval *)object, heap_object, (zval *)a, (zval *)b, &lval TSRMLS_CC) == FAILURE) { /* exception or call failure */ return 0; @@ -206,7 +206,7 @@ static int spl_ptr_pqueue_zval_cmp(spl_ptr_heap_element a, spl_ptr_heap_element if (object) { spl_heap_object *heap_object = (spl_heap_object*)zend_object_store_get_object(object TSRMLS_CC); if (heap_object->fptr_cmp) { - long lval = 0; + php_int_t lval = 0; if (spl_ptr_heap_cmp_cb_helper((zval *)object, heap_object, *a_priority_pp, *b_priority_pp, &lval TSRMLS_CC) == FAILURE) { /* exception or call failure */ return 0; @@ -494,7 +494,7 @@ static zend_object_value spl_heap_object_clone(zval *zobject TSRMLS_DC) /* {{{ * } /* }}} */ -static int spl_heap_object_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */ +static int spl_heap_object_count_elements(zval *object, php_int_t *count TSRMLS_DC) /* {{{ */ { spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(object TSRMLS_CC); @@ -506,7 +506,7 @@ static int spl_heap_object_count_elements(zval *object, long *count TSRMLS_DC) / MAKE_STD_ZVAL(intern->retval); ZVAL_ZVAL(intern->retval, rv, 1, 1); convert_to_long(intern->retval); - *count = (long) Z_LVAL_P(intern->retval); + *count = (php_int_t) Z_LVAL_P(intern->retval); return SUCCESS; } *count = 0; @@ -584,7 +584,7 @@ static HashTable* spl_pqueue_object_get_debug_info(zval *obj, int *is_temp TSRML Return the number of elements in the heap. */ SPL_METHOD(SplHeap, count) { - long count; + php_int_t count; spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC); if (zend_parse_parameters_none() == FAILURE) { diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index 04ec28b..cd1b771 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -809,7 +809,7 @@ SPL_METHOD(SplObjectStorage, unserialize) const unsigned char *p, *s; php_unserialize_data_t var_hash; zval *pentry, *pmembers, *pcount = NULL, *pinf; - long count; + php_int_t count; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &buf, &buf_len) == FAILURE) { return; @@ -924,7 +924,7 @@ outexcept: zval_ptr_dtor(&pcount); } PHP_VAR_UNSERIALIZE_DESTROY(var_hash); - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset %ld of %d bytes", (long)((char*)p - buf), buf_len); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Error at offset " ZEND_INT_FMT " of " ZEND_UINT_FMT " bytes", (php_int_t)((char*)p - buf), buf_len); return; } /* }}} */ @@ -1133,7 +1133,7 @@ SPL_METHOD(MultipleIterator, valid) spl_SplObjectStorage *intern; spl_SplObjectStorageElement *element; zval *it, *retval = NULL; - long expect, valid; + php_int_t expect, valid; intern = (spl_SplObjectStorage*)zend_object_store_get_object(getThis() TSRMLS_CC); diff --git a/ext/spl/tests/bug64782.phpt b/ext/spl/tests/bug64782.phpt index ac5d08d..ffe8a30 100644 --- a/ext/spl/tests/bug64782.phpt +++ b/ext/spl/tests/bug64782.phpt @@ -9,7 +9,7 @@ var_dump(new SplFileObject(__FILE__, "r", false, null)); --EXPECTF-- object(SplFileObject)#1 (%d) { ["pathName":"SplFileInfo":private]=> - string(%d) "%s/bug64782.php" + string(%d) "%sbug64782.php" ["fileName":"SplFileInfo":private]=> string(12) "bug64782.php" ["openMode":"SplFileObject":private]=>
« previous php.cvs (#73939) next »