com php-src: fixed ext/xmlwriter: ext/xmlreader/php_xmlreader .c

From: Date: Tue, 26 Nov 2013 21:36:35 +0000
Subject: com php-src: fixed ext/xmlwriter: ext/xmlreader/php_xmlreader .c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74076@lists.php.net to get a copy of this message
Commit: def89811902ad0f946363b0b2131a06df22a22c6 Author: Anatol Belski <ab@php.net> Tue, 26 Nov 2013 22:36:35 +0100 Parents: 74f9e6309c5a6cda72fdf9279dcccb7b45ef21bf Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=def89811902ad0f946363b0b2131a06df22a22c6 Log: fixed ext/xmlwriter Changed paths: M ext/xmlreader/php_xmlreader.c

diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 76cd56f..c41c196 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -132,7 +132,7 @@ zval **xmlreader_get_property_ptr_ptr(zval *object, zval *member, int type, cons obj = (xmlreader_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } if (ret == FAILURE) { std_hnd = zend_get_std_object_handlers(); @@ -167,7 +167,7 @@ zval *xmlreader_read_property(zval *object, zval *member, int type, const zend_l obj = (xmlreader_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } if (ret == SUCCESS) { ret = xmlreader_property_reader(obj, hnd, &retval TSRMLS_CC); @@ -209,7 +209,7 @@ void xmlreader_write_property(zval *object, zval *member, zval *value, const zen obj = (xmlreader_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } if (ret == SUCCESS) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot write to read-only property"); @@ -412,12 +412,12 @@ zend_object_value xmlreader_objects_new(zend_class_entry *class_type TSRMLS_DC) /* {{{ php_xmlreader_string_arg */ static void php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlreader_read_one_char_t internal_function) { zval *id; - int name_len = 0; + zend_str_size_int name_len = 0; char *retchar = NULL; xmlreader_object *intern; char *name; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &name, &name_len) == FAILURE) { return; } @@ -490,12 +490,13 @@ static void php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAMETERS, xmlreader_ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int type) { #ifdef LIBXML_SCHEMAS_ENABLED zval *id; - int source_len = 0, retval = -1; + zend_str_size_int source_len = 0; + int retval = -1; xmlreader_object *intern; xmlRelaxNGPtr schema = NULL; char *source; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p!", &source, &source_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "P!", &source, &source_len) == FAILURE) { return; } @@ -571,11 +572,11 @@ Get value of an attribute at index from current element */ PHP_METHOD(xmlreader, getAttributeNo) { zval *id; - long attr_pos; + php_int_t attr_pos; char *retchar = NULL; xmlreader_object *intern; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &attr_pos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &attr_pos) == FAILURE) { return; } @@ -597,11 +598,11 @@ Get value of a attribute via name and namespace from current element */ PHP_METHOD(xmlreader, getAttributeNs) { zval *id; - int name_len = 0, ns_uri_len = 0; + zend_str_size_int name_len = 0, ns_uri_len = 0; xmlreader_object *intern; char *name, *ns_uri, *retchar = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) { return; } @@ -628,11 +629,11 @@ Indicates whether given property (one of the parser option constants) is set or PHP_METHOD(xmlreader, getParserProperty) { zval *id; - long property; + php_int_t property; int retval = -1; xmlreader_object *intern; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &property) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &property) == FAILURE) { return; } @@ -674,11 +675,12 @@ Positions reader at specified attribute - Returns TRUE on success and FALSE on f PHP_METHOD(xmlreader, moveToAttribute) { zval *id; - int name_len = 0, retval; + zend_str_size_int name_len = 0; + int retval; xmlreader_object *intern; char *name; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &name, &name_len) == FAILURE) { return; } @@ -707,11 +709,11 @@ Returns TRUE on success and FALSE on failure */ PHP_METHOD(xmlreader, moveToAttributeNo) { zval *id; - long attr_pos; + php_int_t attr_pos; int retval; xmlreader_object *intern; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &attr_pos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &attr_pos) == FAILURE) { return; } @@ -735,11 +737,12 @@ Returns TRUE on success and FALSE on failure */ PHP_METHOD(xmlreader, moveToAttributeNs) { zval *id; - int name_len=0, ns_uri_len=0, retval; + zend_str_size_int name_len=0, ns_uri_len=0; + int retval; xmlreader_object *intern; char *name, *ns_uri; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) { return; } @@ -815,11 +818,12 @@ Moves the position of the current instance to the next node in the stream. */ PHP_METHOD(xmlreader, next) { zval *id; - int retval, name_len=0; + int retval; + zend_str_size_int name_len=0; xmlreader_object *intern; char *name = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name, &name_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|S", &name, &name_len) == FAILURE) { return; } @@ -856,15 +860,15 @@ Sets the URI that the XMLReader will parse. */ PHP_METHOD(xmlreader, open) { zval *id; - int source_len = 0, encoding_len = 0; - long options = 0; + zend_str_size_int source_len = 0, encoding_len = 0; + php_int_t options = 0; xmlreader_object *intern = NULL; char *source, *valid_file = NULL; char *encoding = NULL; char resolved_path[MAXPATHLEN + 1]; xmlTextReaderPtr reader = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|s!l", &source, &source_len, &encoding, &encoding_len, &options) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "P|S!i", &source, &source_len, &encoding, &encoding_len, &options) == FAILURE) { return; } @@ -946,11 +950,12 @@ PHP_METHOD(xmlreader, setSchema) { #ifdef LIBXML_SCHEMAS_ENABLED zval *id; - int source_len = 0, retval = -1; + zend_str_size_int source_len = 0; + int retval = -1; xmlreader_object *intern; char *source; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p!", &source, &source_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "P!", &source, &source_len) == FAILURE) { return; } @@ -988,12 +993,12 @@ Properties must be set after open() or XML() and before the first read() is call PHP_METHOD(xmlreader, setParserProperty) { zval *id; - long property; + php_int_t property; int retval = -1; zend_bool value; xmlreader_object *intern; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lb", &property, &value) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ib", &property, &value) == FAILURE) { return; } @@ -1039,16 +1044,17 @@ Sets the string that the XMLReader will parse. */ PHP_METHOD(xmlreader, XML) { zval *id; - int source_len = 0, encoding_len = 0; - long options = 0; + zend_str_size_int source_len = 0, encoding_len = 0; + php_int_t options = 0; xmlreader_object *intern = NULL; char *source, *uri = NULL, *encoding = NULL; - int resolved_path_len, ret = 0; + zend_str_size_int resolved_path_len; + int ret = 0; char *directory=NULL, resolved_path[MAXPATHLEN]; xmlParserInputBufferPtr inputbfr; xmlTextReaderPtr reader; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!l", &source, &source_len, &encoding, &encoding_len, &options) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|S!i", &source, &source_len, &encoding, &encoding_len, &options) == FAILURE) { return; }
« previous php.cvs (#74076) next »