From c081ce628f0d76d44784d7bb8e06428b06142ac0 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:08:10 +0800 Subject: Bump year --- ext/xml/xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 1ef01c8864..a881d910b4 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From 050d7e38ad4163e7fa65e26724d3516ce7b33601 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 15 Apr 2014 15:40:40 +0400 Subject: Cleanup (1-st round) --- ext/xml/xml.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index a881d910b4..845cde426e 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -792,7 +792,9 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch att = _xml_decode_tag(parser, attributes[0]); val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); - add_assoc_stringl(args[2], att, val, val_len, 0); + // TODO: avoid reallocation ??? + add_assoc_stringl(args[2], att, val, val_len); + efree(val); attributes += 2; @@ -817,8 +819,8 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch _xml_add_to_info(parser,((char *) tag_name) + parser->toffset); - add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */ - add_assoc_string(tag,"type","open",1); + add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset); /* cast to avoid gcc-warning */ + add_assoc_string(tag,"type","open"); add_assoc_long(tag,"level",parser->level); parser->ltags[parser->level-1] = estrdup(tag_name); @@ -830,7 +832,9 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch att = _xml_decode_tag(parser, attributes[0]); val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); - add_assoc_stringl(atr,att,val,val_len,0); + // TODO: avoid reallocation ??? + add_assoc_stringl(atr,att,val,val_len); + efree(val); atcnt++; attributes += 2; @@ -880,7 +884,7 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) zval *tag; if (parser->lastwasopen) { - add_assoc_string(*(parser->ctag),"type","complete",1); + add_assoc_string(*(parser->ctag),"type","complete"); } else { MAKE_STD_ZVAL(tag); @@ -888,8 +892,8 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) _xml_add_to_info(parser,((char *) tag_name) + parser->toffset); - add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */ - add_assoc_string(tag,"type","close",1); + add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset); /* cast to avoid gcc-warning */ + add_assoc_string(tag,"type","close"); add_assoc_long(tag,"level",parser->level); zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL); @@ -959,7 +963,9 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) Z_STRLEN_PP(myval) += decoded_len; efree(decoded_value); } else { - add_assoc_string(*(parser->ctag),"value",decoded_value,0); + // TODO: avoid reallocation ??? + add_assoc_string(*(parser->ctag),"value",decoded_value); + efree(decoded_value); } } else { @@ -991,9 +997,11 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) _xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset); - add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset,1); - add_assoc_string(tag,"value",decoded_value,0); - add_assoc_string(tag,"type","cdata",1); + add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset); + // TODO: avoid reallocation ??? + add_assoc_string(tag,"value",decoded_value); + efree(decoded_value); + add_assoc_string(tag,"type","cdata"); add_assoc_long(tag,"level",parser->level); zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL); -- cgit v1.2.1 From 5984f95d8f8d75007fff4963d67ebe65e572efea Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sat, 3 May 2014 15:58:09 +0800 Subject: Refactor XML (incompleted) --- ext/xml/xml.c | 704 ++++++++++++++++++++++++++-------------------------------- 1 file changed, 318 insertions(+), 386 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 845cde426e..76b6dd2146 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -71,17 +71,17 @@ PHP_MINIT_FUNCTION(xml); PHP_MINFO_FUNCTION(xml); static PHP_GINIT_FUNCTION(xml); -static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); -static void xml_set_handler(zval **, zval **); +static void xml_parser_dtor(zend_resource *rsrc TSRMLS_DC); +static void xml_set_handler(zval *, zval *); inline static unsigned short xml_encode_iso_8859_1(unsigned char); inline static char xml_decode_iso_8859_1(unsigned short); inline static unsigned short xml_encode_us_ascii(unsigned char); inline static char xml_decode_us_ascii(unsigned short); -static zval *xml_call_handler(xml_parser *, zval *, zend_function *, int, zval **); -static zval *_xml_xmlchar_zval(const XML_Char *, int, const XML_Char *); +static void xml_call_handler(xml_parser *, zval *, zend_function *, int, zval *, zval *); +static void _xml_xmlchar_zval(const XML_Char *, int, const XML_Char *, zval *); static int _xml_xmlcharlen(const XML_Char *); static void _xml_add_to_info(xml_parser *parser,char *name); -inline static char *_xml_decode_tag(xml_parser *parser, const char *tag); +inline static zend_string *_xml_decode_tag(xml_parser *parser, const char *tag); void _xml_startElementHandler(void *, const XML_Char *, const XML_Char **); void _xml_endElementHandler(void *, const XML_Char *); @@ -373,53 +373,21 @@ PHP_MINFO_FUNCTION(xml) /* }}} */ /* {{{ extension-internal functions */ -static zval *_xml_resource_zval(long value) -{ - zval *ret; - TSRMLS_FETCH(); - - MAKE_STD_ZVAL(ret); - - Z_TYPE_P(ret) = IS_RESOURCE; - Z_LVAL_P(ret) = value; - - zend_list_addref(value); - - return ret; -} - -static zval *_xml_string_zval(const char *str) -{ - zval *ret; - int len = strlen(str); - MAKE_STD_ZVAL(ret); - - Z_TYPE_P(ret) = IS_STRING; - Z_STRLEN_P(ret) = len; - Z_STRVAL_P(ret) = estrndup(str, len); - return ret; -} -static zval *_xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encoding) +static void _xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encoding, zval *ret) { - zval *ret; - MAKE_STD_ZVAL(ret); - if (s == NULL) { ZVAL_FALSE(ret); - return ret; } if (len == 0) { len = _xml_xmlcharlen(s); } - Z_TYPE_P(ret) = IS_STRING; - Z_STRVAL_P(ret) = xml_utf8_decode(s, len, &Z_STRLEN_P(ret), encoding); - return ret; + ZVAL_STRINGL(ret, (char *)s, len); } /* }}} */ /* {{{ xml_parser_dtor() */ -static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) +static void xml_parser_dtor(zend_resource *rsrc TSRMLS_DC) { xml_parser *parser = (xml_parser *)rsrc->ptr; @@ -432,43 +400,43 @@ static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) efree(parser->ltags[ inx ]); efree(parser->ltags); } - if (parser->startElementHandler) { + if (!ZVAL_IS_UNDEF(&parser->startElementHandler)) { zval_ptr_dtor(&parser->startElementHandler); } - if (parser->endElementHandler) { + if (!ZVAL_IS_UNDEF(&parser->endElementHandler)) { zval_ptr_dtor(&parser->endElementHandler); } - if (parser->characterDataHandler) { + if (!ZVAL_IS_UNDEF(&parser->characterDataHandler)) { zval_ptr_dtor(&parser->characterDataHandler); } - if (parser->processingInstructionHandler) { + if (!ZVAL_IS_UNDEF(&parser->processingInstructionHandler)) { zval_ptr_dtor(&parser->processingInstructionHandler); } - if (parser->defaultHandler) { + if (!ZVAL_IS_UNDEF(&parser->defaultHandler)) { zval_ptr_dtor(&parser->defaultHandler); } - if (parser->unparsedEntityDeclHandler) { + if (!ZVAL_IS_UNDEF(&parser->unparsedEntityDeclHandler)) { zval_ptr_dtor(&parser->unparsedEntityDeclHandler); } - if (parser->notationDeclHandler) { + if (!ZVAL_IS_UNDEF(&parser->notationDeclHandler)) { zval_ptr_dtor(&parser->notationDeclHandler); } - if (parser->externalEntityRefHandler) { + if (!ZVAL_IS_UNDEF(&parser->externalEntityRefHandler)) { zval_ptr_dtor(&parser->externalEntityRefHandler); } - if (parser->unknownEncodingHandler) { + if (!ZVAL_IS_UNDEF(&parser->unknownEncodingHandler)) { zval_ptr_dtor(&parser->unknownEncodingHandler); } - if (parser->startNamespaceDeclHandler) { + if (!ZVAL_IS_UNDEF(&parser->startNamespaceDeclHandler)) { zval_ptr_dtor(&parser->startNamespaceDeclHandler); } - if (parser->endNamespaceDeclHandler) { + if (!ZVAL_IS_UNDEF(&parser->endNamespaceDeclHandler)) { zval_ptr_dtor(&parser->endNamespaceDeclHandler); } if (parser->baseURI) { efree(parser->baseURI); } - if (parser->object) { + if (!ZVAL_IS_UNDEF(&parser->object)) { zval_ptr_dtor(&parser->object); } @@ -477,88 +445,65 @@ static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* }}} */ /* {{{ xml_set_handler() */ -static void xml_set_handler(zval **handler, zval **data) +static void xml_set_handler(zval *handler, zval *data) { /* If we have already a handler, release it */ - if (*handler) { + if (handler) { zval_ptr_dtor(handler); } /* IS_ARRAY might indicate that we're using array($obj, 'method') syntax */ - if (Z_TYPE_PP(data) != IS_ARRAY && Z_TYPE_PP(data) != IS_OBJECT) { - + if (Z_TYPE_P(data) != IS_ARRAY && Z_TYPE_P(data) != IS_OBJECT) { convert_to_string_ex(data); - if (Z_STRLEN_PP(data) == 0) { - *handler = NULL; + if (Z_STRLEN_P(data) == 0) { + ZVAL_UNDEF(handler); return; } } - zval_add_ref(data); - - *handler = *data; + ZVAL_COPY(handler, data); } /* }}} */ /* {{{ xml_call_handler() */ -static zval *xml_call_handler(xml_parser *parser, zval *handler, zend_function *function_ptr, int argc, zval **argv) +static void xml_call_handler(xml_parser *parser, zval *handler, zend_function *function_ptr, int argc, zval *argv, zval *retval) { int i; TSRMLS_FETCH(); if (parser && handler && !EG(exception)) { - zval ***args; - zval *retval; int result; zend_fcall_info fci; - args = safe_emalloc(sizeof(zval **), argc, 0); - for (i = 0; i < argc; i++) { - args[i] = &argv[i]; - } - fci.size = sizeof(fci); fci.function_table = EG(function_table); - fci.function_name = handler; + ZVAL_COPY_VALUE(&fci.function_name, handler); fci.symbol_table = NULL; - fci.object_ptr = parser->object; - fci.retval_ptr_ptr = &retval; + fci.object = Z_OBJ(parser->object); + fci.retval = retval; fci.param_count = argc; - fci.params = args; + fci.params = argv; fci.no_separation = 0; /*fci.function_handler_cache = &function_ptr;*/ result = zend_call_function(&fci, NULL TSRMLS_CC); if (result == FAILURE) { - zval **method; - zval **obj; + zval *method; + zval *obj; if (Z_TYPE_P(handler) == IS_STRING) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(handler)); - } else if (zend_hash_index_find(Z_ARRVAL_P(handler), 0, (void **) &obj) == SUCCESS && - zend_hash_index_find(Z_ARRVAL_P(handler), 1, (void **) &method) == SUCCESS && - Z_TYPE_PP(obj) == IS_OBJECT && - Z_TYPE_PP(method) == IS_STRING) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s::%s()", Z_OBJCE_PP(obj)->name, Z_STRVAL_PP(method)); + } else if ((obj = zend_hash_index_find(Z_ARRVAL_P(handler), 0)) != NULL && + (method = zend_hash_index_find(Z_ARRVAL_P(handler), 1)) != NULL && + Z_TYPE_P(obj) == IS_OBJECT && + Z_TYPE_P(method) == IS_STRING) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s::%s()", Z_OBJCE_P(obj)->name->val, Z_STRVAL_P(method)); } else php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler"); } - - for (i = 0; i < argc; i++) { - zval_ptr_dtor(args[i]); - } - efree(args); - - if (result == FAILURE) { - return NULL; - } else { - return EG(exception) ? NULL : retval; - } - } else { - for (i = 0; i < argc; i++) { - zval_ptr_dtor(&argv[i]); - } - return NULL; + } + for (i = 0; i < argc; i++) { + zval_ptr_dtor(&argv[i]); } } /* }}} */ @@ -597,7 +542,7 @@ static xml_encoding *xml_get_encoding(const XML_Char *name) xml_encoding *enc = &xml_encodings[0]; while (enc && enc->name) { - if (strcasecmp(name, enc->name) == 0) { + if (strcasecmp((char *)name, (char *)enc->name) == 0) { return enc; } enc++; @@ -606,16 +551,15 @@ static xml_encoding *xml_get_encoding(const XML_Char *name) } /* }}} */ -/* {{{ xml_utf8_encode */ -PHPAPI char *xml_utf8_encode(const char *s, int len, int *newlen, const XML_Char *encoding) +/* {{{ xml_utf8_encode() */ +PHPAPI zend_string *xml_utf8_encode(const char *s, int len, const XML_Char *encoding) { int pos = len; - char *newbuf; + zend_string *str; unsigned int c; unsigned short (*encoder)(unsigned char) = NULL; xml_encoding *enc = xml_get_encoding(encoding); - *newlen = 0; if (enc) { encoder = enc->encoding_function; } else { @@ -625,64 +569,62 @@ PHPAPI char *xml_utf8_encode(const char *s, int len, int *newlen, const XML_Char if (encoder == NULL) { /* If no encoder function was specified, return the data as-is. */ - newbuf = emalloc(len + 1); - memcpy(newbuf, s, len); - *newlen = len; - newbuf[*newlen] = '\0'; - return newbuf; + str = STR_INIT(s, len, 0); + return str; } /* This is the theoretical max (will never get beyond len * 2 as long * as we are converting from single-byte characters, though) */ - newbuf = safe_emalloc(len, 4, 1); + str = STR_ALLOC(len * 4, 0); + str->len = 0; while (pos > 0) { c = encoder ? encoder((unsigned char)(*s)) : (unsigned short)(*s); if (c < 0x80) { - newbuf[(*newlen)++] = (char) c; + str->val[str->len++] = (char) c; } else if (c < 0x800) { - newbuf[(*newlen)++] = (0xc0 | (c >> 6)); - newbuf[(*newlen)++] = (0x80 | (c & 0x3f)); + str->val[str->len++] = (0xc0 | (c >> 6)); + str->val[str->len++] = (0x80 | (c & 0x3f)); } else if (c < 0x10000) { - newbuf[(*newlen)++] = (0xe0 | (c >> 12)); - newbuf[(*newlen)++] = (0xc0 | ((c >> 6) & 0x3f)); - newbuf[(*newlen)++] = (0x80 | (c & 0x3f)); + str->val[str->len++] = (0xe0 | (c >> 12)); + str->val[str->len++] = (0xc0 | ((c >> 6) & 0x3f)); + str->val[str->len++] = (0x80 | (c & 0x3f)); } else if (c < 0x200000) { - newbuf[(*newlen)++] = (0xf0 | (c >> 18)); - newbuf[(*newlen)++] = (0xe0 | ((c >> 12) & 0x3f)); - newbuf[(*newlen)++] = (0xc0 | ((c >> 6) & 0x3f)); - newbuf[(*newlen)++] = (0x80 | (c & 0x3f)); + str->val[str->len++] = (0xf0 | (c >> 18)); + str->val[str->len++] = (0xe0 | ((c >> 12) & 0x3f)); + str->val[str->len++] = (0xc0 | ((c >> 6) & 0x3f)); + str->val[str->len++] = (0x80 | (c & 0x3f)); } pos--; s++; } - newbuf[*newlen] = 0; - newbuf = erealloc(newbuf, (*newlen)+1); - return newbuf; + str->val[str->len] = '\0'; + str = STR_REALLOC(str, str->len, 0); + return str; } /* }}} */ -/* {{{ xml_utf8_decode */ -PHPAPI char *xml_utf8_decode(const XML_Char *s, int len, int *newlen, const XML_Char *encoding) +/* {{{ xml_utf8_decode() */ +PHPAPI zend_string *xml_utf8_decode(const XML_Char *s, int len, const XML_Char *encoding) { size_t pos = 0; - char *newbuf = emalloc(len + 1); unsigned int c; char (*decoder)(unsigned short) = NULL; xml_encoding *enc = xml_get_encoding(encoding); + zend_string *str; - *newlen = 0; if (enc) { decoder = enc->decoding_function; } + if (decoder == NULL) { /* If the target encoding was unknown, or no decoder function * was specified, return the UTF-8-encoded data as-is. */ - memcpy(newbuf, s, len); - *newlen = len; - newbuf[*newlen] = '\0'; - return newbuf; + str = STR_INIT((char *)s, len, 0); + return str; } + str = STR_ALLOC(len, 0); + str->len = 0; while (pos < (size_t)len) { int status = FAILURE; c = php_next_utf8_char((const unsigned char*)s, (size_t) len, &pos, &status); @@ -691,14 +633,14 @@ PHPAPI char *xml_utf8_decode(const XML_Char *s, int len, int *newlen, const XML_ c = '?'; } - newbuf[*newlen] = decoder ? decoder(c) : c; - ++*newlen; + str->val[str->len++] = decoder ? decoder(c) : c; } - if (*newlen < len) { - newbuf = erealloc(newbuf, *newlen + 1); + str->val[str->len] = '\0'; + if (str->len < len) { + str = STR_REALLOC(str, str->len, 0); } - newbuf[*newlen] = '\0'; - return newbuf; + + return str; } /* }}} */ @@ -728,42 +670,39 @@ PHPAPI char *_xml_zval_strdup(zval *val) } /* }}} */ -/* {{{ _xml_add_to_info */ +/* {{{ _xml_add_to_info() */ static void _xml_add_to_info(xml_parser *parser,char *name) { - zval **element, *values; + zval *element; - if (! parser->info) { + if (ZVAL_IS_UNDEF(&parser->info)) { return; } - if (zend_hash_find(Z_ARRVAL_P(parser->info),name,strlen(name) + 1,(void **) &element) == FAILURE) { - MAKE_STD_ZVAL(values); - - array_init(values); - - zend_hash_update(Z_ARRVAL_P(parser->info), name, strlen(name)+1, (void *) &values, sizeof(zval*), (void **) &element); + if ((element = zend_hash_str_find(Z_ARRVAL(parser->info),name, strlen(name))) == NULL) { + zval values; + array_init(&values); + element = zend_hash_str_update(Z_ARRVAL(parser->info), name, strlen(name), &values); } - add_next_index_long(*element,parser->curtag); + add_next_index_long(element, parser->curtag); parser->curtag++; } /* }}} */ /* {{{ _xml_decode_tag() */ -static char *_xml_decode_tag(xml_parser *parser, const char *tag) +static zend_string *_xml_decode_tag(xml_parser *parser, const char *tag) { - char *newstr; - int out_len; + zend_string *str; - newstr = xml_utf8_decode(tag, strlen(tag), &out_len, parser->target_encoding); + str = xml_utf8_decode((const XML_Char *)tag, strlen(tag), parser->target_encoding); if (parser->case_folding) { - php_strtoupper(newstr, out_len); + php_strtoupper(str->val, str->len); } - return newstr; + return str; } /* }}} */ @@ -772,90 +711,83 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch { xml_parser *parser = (xml_parser *)userData; const char **attrs = (const char **) attributes; - char *tag_name; - char *att, *val; - int val_len; - zval *retval, *args[3]; + zend_string *att, *tag_name, *val; + zval retval, args[3]; if (parser) { parser->level++; - tag_name = _xml_decode_tag(parser, name); + tag_name = _xml_decode_tag(parser, (const char *)name); - if (parser->startElementHandler) { - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_string_zval(((char *) tag_name) + parser->toffset); - MAKE_STD_ZVAL(args[2]); - array_init(args[2]); + if (!ZVAL_IS_UNDEF(&parser->startElementHandler)) { + ZVAL_COPY(&args[0], &parser->index); + ZVAL_STRING(&args[1], tag_name->val + parser->toffset); + array_init(&args[2]); while (attributes && *attributes) { - att = _xml_decode_tag(parser, attributes[0]); - val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); + att = _xml_decode_tag(parser, (const char *)attributes[0]); + val = xml_utf8_decode(attributes[1], strlen((char *)attributes[1]), parser->target_encoding); // TODO: avoid reallocation ??? - add_assoc_stringl(args[2], att, val, val_len); - efree(val); + add_assoc_str(&args[2], att->val, val); attributes += 2; - efree(att); + STR_RELEASE(att); } - if ((retval = xml_call_handler(parser, parser->startElementHandler, parser->startElementPtr, 3, args))) { + xml_call_handler(parser, &parser->startElementHandler, parser->startElementPtr, 3, args, &retval); + if (!ZVAL_IS_UNDEF(&retval)) { zval_ptr_dtor(&retval); } } - if (parser->data) { + if (!ZVAL_IS_UNDEF(&parser->data)) { if (parser->level <= XML_MAXLEVEL) { - zval *tag, *atr; + zval tag, atr; int atcnt = 0; - MAKE_STD_ZVAL(tag); - MAKE_STD_ZVAL(atr); + array_init(&tag); + array_init(&atr); - array_init(tag); - array_init(atr); + _xml_add_to_info(parser, tag_name->val + parser->toffset); - _xml_add_to_info(parser,((char *) tag_name) + parser->toffset); + add_assoc_string(&tag, "tag", tag_name->val + parser->toffset); /* cast to avoid gcc-warning */ + add_assoc_string(&tag, "type", "open"); + add_assoc_long(&tag, "level", parser->level); - add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset); /* cast to avoid gcc-warning */ - add_assoc_string(tag,"type","open"); - add_assoc_long(tag,"level",parser->level); - - parser->ltags[parser->level-1] = estrdup(tag_name); + parser->ltags[parser->level-1] = estrdup(tag_name->val); parser->lastwasopen = 1; attributes = (const XML_Char **) attrs; while (attributes && *attributes) { - att = _xml_decode_tag(parser, attributes[0]); - val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); + att = _xml_decode_tag(parser, (const char *)attributes[0]); + val = xml_utf8_decode(attributes[1], strlen((char *)attributes[1]), parser->target_encoding); // TODO: avoid reallocation ??? - add_assoc_stringl(atr,att,val,val_len); - efree(val); + add_assoc_str(&atr, att->val, val); atcnt++; attributes += 2; - efree(att); + STR_RELEASE(att); } if (atcnt) { - zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL); + zend_hash_str_add(Z_ARRVAL(tag), "attributes", sizeof("attributes") - 1, &atr); } else { zval_ptr_dtor(&atr); } - zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->ctag); + parser->ctag = zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } else if (parser->level == (XML_MAXLEVEL + 1)) { TSRMLS_FETCH(); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated"); } } - efree(tag_name); + STR_RELEASE(tag_name); } } /* }}} */ @@ -864,45 +796,44 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch void _xml_endElementHandler(void *userData, const XML_Char *name) { xml_parser *parser = (xml_parser *)userData; - char *tag_name; + zend_string *tag_name; if (parser) { - zval *retval, *args[2]; + zval retval, args[2]; - tag_name = _xml_decode_tag(parser, name); + tag_name = _xml_decode_tag(parser, (const char *)name); - if (parser->endElementHandler) { - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_string_zval(((char *) tag_name) + parser->toffset); + if (!ZVAL_IS_UNDEF(&parser->endElementHandler)) { + ZVAL_COPY(&args[0], &parser->index); + ZVAL_STRING(&args[1], (tag_name->val) + parser->toffset); - if ((retval = xml_call_handler(parser, parser->endElementHandler, parser->endElementPtr, 2, args))) { + xml_call_handler(parser, &parser->endElementHandler, parser->endElementPtr, 2, args, &retval); + if (ZVAL_IS_UNDEF(&retval)) { zval_ptr_dtor(&retval); } } - if (parser->data) { - zval *tag; + if (!ZVAL_IS_UNDEF(&parser->data)) { + zval tag; if (parser->lastwasopen) { - add_assoc_string(*(parser->ctag),"type","complete"); + add_assoc_string(parser->ctag, "type", "complete"); } else { - MAKE_STD_ZVAL(tag); - - array_init(tag); + array_init(&tag); - _xml_add_to_info(parser,((char *) tag_name) + parser->toffset); + _xml_add_to_info(parser, tag_name->val + parser->toffset); - add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset); /* cast to avoid gcc-warning */ - add_assoc_string(tag,"type","close"); - add_assoc_long(tag,"level",parser->level); + add_assoc_string(&tag, "tag", tag_name->val + parser->toffset); /* cast to avoid gcc-warning */ + add_assoc_string(&tag, "type", "close"); + add_assoc_long(&tag, "level", parser->level); - zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL); + zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } parser->lastwasopen = 0; } - efree(tag_name); + STR_RELEASE(tag_name); if ((parser->ltags) && (parser->level <= XML_MAXLEVEL)) { efree(parser->ltags[parser->level-1]); @@ -919,33 +850,32 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) xml_parser *parser = (xml_parser *)userData; if (parser) { - zval *retval, *args[2]; + zval retval, args[2]; - if (parser->characterDataHandler) { - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(s, len, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->characterDataHandler, parser->characterDataPtr, 2, args))) { + if (!ZVAL_IS_UNDEF(&parser->characterDataHandler)) { + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(s, len, parser->target_encoding, &args[1]); + xml_call_handler(parser, &parser->characterDataHandler, parser->characterDataPtr, 2, args, &retval); + if (!ZVAL_IS_UNDEF(&retval)) { zval_ptr_dtor(&retval); } } - if (parser->data) { + if (!ZVAL_IS_UNDEF(&parser->data)) { int i; int doprint = 0; - - char *decoded_value; - int decoded_len; - - decoded_value = xml_utf8_decode(s,len,&decoded_len,parser->target_encoding); - for (i = 0; i < decoded_len; i++) { - switch (decoded_value[i]) { - case ' ': - case '\t': - case '\n': - continue; - default: - doprint = 1; - break; + zend_string *decoded_value; + + decoded_value = xml_utf8_decode(s, len, parser->target_encoding); + for (i = 0; i < decoded_value->len; i++) { + switch (decoded_value->val[i]) { + case ' ': + case '\t': + case '\n': + continue; + default: + doprint = 1; + break; } if (doprint) { break; @@ -953,65 +883,58 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) } if (doprint || (! parser->skipwhite)) { if (parser->lastwasopen) { - zval **myval; + zval *myval; /* check if the current tag already has a value - if yes append to that! */ - if (zend_hash_find(Z_ARRVAL_PP(parser->ctag),"value",sizeof("value"),(void **) &myval) == SUCCESS) { - int newlen = Z_STRLEN_PP(myval) + decoded_len; - Z_STRVAL_PP(myval) = erealloc(Z_STRVAL_PP(myval),newlen+1); - strncpy(Z_STRVAL_PP(myval) + Z_STRLEN_PP(myval), decoded_value, decoded_len + 1); - Z_STRLEN_PP(myval) += decoded_len; - efree(decoded_value); + if ((myval = zend_hash_str_find(Z_ARRVAL_P(parser->ctag), "value", sizeof("value") - 1))) { + int newlen = Z_STRLEN_P(myval) + decoded_value->len; + Z_STR_P(myval) = STR_REALLOC(Z_STR_P(myval), newlen, 0); + strncpy(Z_STRVAL_P(myval) + Z_STRLEN_P(myval) - decoded_value->len, + decoded_value->val, decoded_value->len + 1); + STR_RELEASE(decoded_value); } else { // TODO: avoid reallocation ??? - add_assoc_string(*(parser->ctag),"value",decoded_value); - efree(decoded_value); + add_assoc_str(parser->ctag, "value", decoded_value); } } else { - zval *tag; - zval **curtag, **mytype, **myval; - HashPosition hpos=NULL; - - zend_hash_internal_pointer_end_ex(Z_ARRVAL_P(parser->data), &hpos); - - if (hpos && (zend_hash_get_current_data_ex(Z_ARRVAL_P(parser->data), (void **) &curtag, &hpos) == SUCCESS)) { - if (zend_hash_find(Z_ARRVAL_PP(curtag),"type",sizeof("type"),(void **) &mytype) == SUCCESS) { - if (!strcmp(Z_STRVAL_PP(mytype), "cdata")) { - if (zend_hash_find(Z_ARRVAL_PP(curtag),"value",sizeof("value"),(void **) &myval) == SUCCESS) { - int newlen = Z_STRLEN_PP(myval) + decoded_len; - Z_STRVAL_PP(myval) = erealloc(Z_STRVAL_PP(myval),newlen+1); - strncpy(Z_STRVAL_PP(myval) + Z_STRLEN_PP(myval), decoded_value, decoded_len + 1); - Z_STRLEN_PP(myval) += decoded_len; - efree(decoded_value); + zval tag; + zval *curtag, *mytype, *myval; + + ZEND_HASH_FOREACH_VAL(Z_ARRVAL(parser->data), curtag) { + if ((mytype = zend_hash_str_find(Z_ARRVAL_P(curtag),"type", sizeof("type") - 1))) { + if (!strcmp(Z_STRVAL_P(mytype), "cdata")) { + if ((myval = zend_hash_str_find(Z_ARRVAL_P(curtag), "value", sizeof("value") - 1))) { + int newlen = Z_STRLEN_P(myval) + decoded_value->len; + Z_STR_P(myval) = STR_REALLOC(Z_STR_P(myval), newlen, 0); + strncpy(Z_STRVAL_P(myval) + Z_STRLEN_P(myval) - decoded_value->len, + decoded_value->val, decoded_value->len + 1); + STR_RELEASE(decoded_value); return; } } } - } + } ZEND_HASH_FOREACH_END(); if (parser->level <= XML_MAXLEVEL) { - MAKE_STD_ZVAL(tag); - - array_init(tag); + array_init(&tag); _xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset); - add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset); + add_assoc_string(&tag, "tag", parser->ltags[parser->level-1] + parser->toffset); // TODO: avoid reallocation ??? - add_assoc_string(tag,"value",decoded_value); - efree(decoded_value); - add_assoc_string(tag,"type","cdata"); - add_assoc_long(tag,"level",parser->level); + add_assoc_str(&tag, "value", decoded_value); + add_assoc_string(&tag, "type", "cdata"); + add_assoc_long(&tag, "level", parser->level); - zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL); + zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } else if (parser->level == (XML_MAXLEVEL + 1)) { TSRMLS_FETCH(); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated"); } } } else { - efree(decoded_value); + STR_RELEASE(decoded_value); } } } @@ -1023,13 +946,14 @@ void _xml_processingInstructionHandler(void *userData, const XML_Char *target, c { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->processingInstructionHandler) { - zval *retval, *args[3]; + if (parser && !ZVAL_IS_UNDEF(&parser->processingInstructionHandler)) { + zval retval, args[3]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(target, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(data, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->processingInstructionHandler, parser->processingInstructionPtr, 3, args))) { + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(target, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(data, 0, parser->target_encoding, &args[2]); + xml_call_handler(parser, &parser->processingInstructionHandler, parser->processingInstructionPtr, 3, args, &retval); + if (!ZVAL_IS_UNDEF(&retval)) { zval_ptr_dtor(&retval); } } @@ -1041,12 +965,13 @@ void _xml_defaultHandler(void *userData, const XML_Char *s, int len) { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->defaultHandler) { - zval *retval, *args[2]; + if (parser && !ZVAL_IS_UNDEF(&parser->defaultHandler)) { + zval retval, args[2]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(s, len, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->defaultHandler, parser->defaultPtr, 2, args))) { + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(s, len, parser->target_encoding, &args[1]); + xml_call_handler(parser, &parser->defaultHandler, parser->defaultPtr, 2, args, &retval); + if (!ZVAL_IS_UNDEF(&retval)) { zval_ptr_dtor(&retval); } } @@ -1063,16 +988,17 @@ void _xml_unparsedEntityDeclHandler(void *userData, { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->unparsedEntityDeclHandler) { - zval *retval, *args[6]; - - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(entityName, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(base, 0, parser->target_encoding); - args[3] = _xml_xmlchar_zval(systemId, 0, parser->target_encoding); - args[4] = _xml_xmlchar_zval(publicId, 0, parser->target_encoding); - args[5] = _xml_xmlchar_zval(notationName, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->unparsedEntityDeclHandler, parser->unparsedEntityDeclPtr, 6, args))) { + if (parser && !ZVAL_IS_UNDEF(&parser->unparsedEntityDeclHandler)) { + zval retval, args[6]; + + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(entityName, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(base, 0, parser->target_encoding, &args[2]); + _xml_xmlchar_zval(systemId, 0, parser->target_encoding, &args[3]); + _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); + _xml_xmlchar_zval(notationName, 0, parser->target_encoding, &args[5]); + xml_call_handler(parser, &parser->unparsedEntityDeclHandler, parser->unparsedEntityDeclPtr, 6, args, &retval); + if (!ZVAL_IS_UNDEF(&retval)) { zval_ptr_dtor(&retval); } } @@ -1088,15 +1014,16 @@ void _xml_notationDeclHandler(void *userData, { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->notationDeclHandler) { - zval *retval, *args[5]; + if (parser && !ZVAL_IS_UNDEF(&parser->notationDeclHandler)) { + zval retval, args[5]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(notationName, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(base, 0, parser->target_encoding); - args[3] = _xml_xmlchar_zval(systemId, 0, parser->target_encoding); - args[4] = _xml_xmlchar_zval(publicId, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->notationDeclHandler, parser->notationDeclPtr, 5, args))) { + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(notationName, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(base, 0, parser->target_encoding, &args[2]); + _xml_xmlchar_zval(systemId, 0, parser->target_encoding, &args[3]); + _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); + xml_call_handler(parser, &parser->notationDeclHandler, parser->notationDeclPtr, 5, args, &retval); + if (!ZVAL_IS_UNDEF(&retval)) { zval_ptr_dtor(&retval); } } @@ -1113,18 +1040,18 @@ int _xml_externalEntityRefHandler(XML_Parser parserPtr, xml_parser *parser = XML_GetUserData(parserPtr); int ret = 0; /* abort if no handler is set (should be configurable?) */ - if (parser && parser->externalEntityRefHandler) { - zval *retval, *args[5]; - - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(openEntityNames, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(base, 0, parser->target_encoding); - args[3] = _xml_xmlchar_zval(systemId, 0, parser->target_encoding); - args[4] = _xml_xmlchar_zval(publicId, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->externalEntityRefHandler, parser->externalEntityRefPtr, 5, args))) { - convert_to_long(retval); - ret = Z_LVAL_P(retval); - efree(retval); + if (parser && !ZVAL_IS_UNDEF(&parser->externalEntityRefHandler)) { + zval retval, args[5]; + + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(openEntityNames, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(base, 0, parser->target_encoding, &args[2]); + _xml_xmlchar_zval(systemId, 0, parser->target_encoding, &args[3]); + _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); + xml_call_handler(parser, &parser->externalEntityRefHandler, parser->externalEntityRefPtr, 5, args, &retval); + if (!ZVAL_IS_UNDEF(&retval)) { + convert_to_long(&retval); + ret = Z_LVAL(retval); } else { ret = 0; } @@ -1138,13 +1065,14 @@ void _xml_startNamespaceDeclHandler(void *userData,const XML_Char *prefix, const { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->startNamespaceDeclHandler) { - zval *retval, *args[3]; + if (parser && !ZVAL_IS_UNDEF(&parser->startNamespaceDeclHandler)) { + zval retval, args[3]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(prefix, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(uri, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->startNamespaceDeclHandler, parser->startNamespaceDeclPtr, 3, args))) { + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(prefix, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(uri, 0, parser->target_encoding, &args[2]); + xml_call_handler(parser, &parser->startNamespaceDeclHandler, parser->startNamespaceDeclPtr, 3, args, &retval); + if (!ZVAL_IS_UNDEF(&retval)) { zval_ptr_dtor(&retval); } } @@ -1156,12 +1084,13 @@ void _xml_endNamespaceDeclHandler(void *userData, const XML_Char *prefix) { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->endNamespaceDeclHandler) { - zval *retval, *args[2]; + if (parser && !ZVAL_IS_UNDEF(&parser->endNamespaceDeclHandler)) { + zval retval, args[2]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(prefix, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->endNamespaceDeclHandler, parser->endNamespaceDeclPtr, 2, args))) { + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(prefix, 0, parser->target_encoding, &args[1]); + xml_call_handler(parser, &parser->endNamespaceDeclHandler, parser->endNamespaceDeclPtr, 2, args, &retval); + if (!ZVAL_IS_UNDEF(&retval)) { zval_ptr_dtor(&retval); } } @@ -1218,13 +1147,12 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp parser->target_encoding = encoding; parser->case_folding = 1; - parser->object = NULL; parser->isparsing = 0; XML_SetUserData(parser->parser, parser); - ZEND_REGISTER_RESOURCE(return_value, parser,le_xml_parser); - parser->index = Z_LVAL_P(return_value); + ZEND_REGISTER_RESOURCE(return_value, parser, le_xml_parser); + ZVAL_COPY(&parser->index, return_value); } /* }}} */ @@ -1255,10 +1183,10 @@ PHP_FUNCTION(xml_set_object) return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); /* please leave this commented - or ask thies@thieso.net before doing it (again) */ - if (parser->object) { + if (!ZVAL_IS_UNDEF(&parser->object)) { zval_ptr_dtor(&parser->object); } @@ -1267,8 +1195,7 @@ PHP_FUNCTION(xml_set_object) zval_add_ref(&parser->object); #endif */ - ALLOC_ZVAL(parser->object); - MAKE_COPY_ZVAL(&mythis, parser->object); + ZVAL_COPY(&parser->object, mythis); RETVAL_TRUE; } @@ -1279,13 +1206,13 @@ PHP_FUNCTION(xml_set_object) PHP_FUNCTION(xml_set_element_handler) { xml_parser *parser; - zval *pind, **shdl, **ehdl; + zval *pind, *shdl, *ehdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZZ", &pind, &shdl, &ehdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzz", &pind, &shdl, &ehdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); xml_set_handler(&parser->startElementHandler, shdl); xml_set_handler(&parser->endElementHandler, ehdl); @@ -1299,13 +1226,13 @@ PHP_FUNCTION(xml_set_element_handler) PHP_FUNCTION(xml_set_character_data_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); xml_set_handler(&parser->characterDataHandler, hdl); XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler); @@ -1318,13 +1245,13 @@ PHP_FUNCTION(xml_set_character_data_handler) PHP_FUNCTION(xml_set_processing_instruction_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); xml_set_handler(&parser->processingInstructionHandler, hdl); XML_SetProcessingInstructionHandler(parser->parser, _xml_processingInstructionHandler); @@ -1337,12 +1264,13 @@ PHP_FUNCTION(xml_set_processing_instruction_handler) PHP_FUNCTION(xml_set_default_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); xml_set_handler(&parser->defaultHandler, hdl); XML_SetDefaultHandler(parser->parser, _xml_defaultHandler); @@ -1355,13 +1283,13 @@ PHP_FUNCTION(xml_set_default_handler) PHP_FUNCTION(xml_set_unparsed_entity_decl_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); xml_set_handler(&parser->unparsedEntityDeclHandler, hdl); XML_SetUnparsedEntityDeclHandler(parser->parser, _xml_unparsedEntityDeclHandler); @@ -1374,12 +1302,12 @@ PHP_FUNCTION(xml_set_unparsed_entity_decl_handler) PHP_FUNCTION(xml_set_notation_decl_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); xml_set_handler(&parser->notationDeclHandler, hdl); XML_SetNotationDeclHandler(parser->parser, _xml_notationDeclHandler); @@ -1392,12 +1320,12 @@ PHP_FUNCTION(xml_set_notation_decl_handler) PHP_FUNCTION(xml_set_external_entity_ref_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); xml_set_handler(&parser->externalEntityRefHandler, hdl); XML_SetExternalEntityRefHandler(parser->parser, (void *) _xml_externalEntityRefHandler); @@ -1410,13 +1338,13 @@ PHP_FUNCTION(xml_set_external_entity_ref_handler) PHP_FUNCTION(xml_set_start_namespace_decl_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); xml_set_handler(&parser->startNamespaceDeclHandler, hdl); XML_SetStartNamespaceDeclHandler(parser->parser, _xml_startNamespaceDeclHandler); @@ -1429,13 +1357,13 @@ PHP_FUNCTION(xml_set_start_namespace_decl_handler) PHP_FUNCTION(xml_set_end_namespace_decl_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); xml_set_handler(&parser->endNamespaceDeclHandler, hdl); XML_SetEndNamespaceDeclHandler(parser->parser, _xml_endNamespaceDeclHandler); @@ -1456,7 +1384,7 @@ PHP_FUNCTION(xml_parse) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &pind, &data, &data_len, &isFinal) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); parser->isparsing = 1; ret = XML_Parse(parser->parser, data, data_len, isFinal); @@ -1472,28 +1400,29 @@ PHP_FUNCTION(xml_parse) PHP_FUNCTION(xml_parse_into_struct) { xml_parser *parser; - zval *pind, **xdata, **info = NULL; + zval *pind, *xdata, *info = NULL; char *data; int data_len, ret; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsZ|Z", &pind, &data, &data_len, &xdata, &info) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz|z", &pind, &data, &data_len, &xdata, &info) == FAILURE) { return; } if (info) { - zval_dtor(*info); - array_init(*info); + zval_ptr_dtor(info); + array_init(info); } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); - zval_dtor(*xdata); - array_init(*xdata); + ZVAL_DEREF(xdata); + zval_ptr_dtor(xdata); + array_init(xdata); - parser->data = *xdata; + ZVAL_COPY_VALUE(&parser->data, xdata); if (info) { - parser->info = *info; + ZVAL_COPY_VALUE(&parser->info, info); } parser->level = 0; @@ -1521,9 +1450,10 @@ PHP_FUNCTION(xml_get_error_code) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); - RETVAL_LONG((long)XML_GetErrorCode(parser->parser)); + ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); + + RETURN_LONG((long)XML_GetErrorCode(parser->parser)); } /* }}} */ @@ -1540,7 +1470,7 @@ PHP_FUNCTION(xml_error_string) str = (char *)XML_ErrorString((int)code); if (str) { - RETVAL_STRING(str, 1); + RETVAL_STRING(str); } } /* }}} */ @@ -1555,7 +1485,8 @@ PHP_FUNCTION(xml_get_current_line_number) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); RETVAL_LONG(XML_GetCurrentLineNumber(parser->parser)); } @@ -1571,7 +1502,8 @@ PHP_FUNCTION(xml_get_current_column_number) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); RETVAL_LONG(XML_GetCurrentColumnNumber(parser->parser)); } @@ -1587,7 +1519,8 @@ PHP_FUNCTION(xml_get_current_byte_index) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); RETVAL_LONG(XML_GetCurrentByteIndex(parser->parser)); } @@ -1604,18 +1537,16 @@ PHP_FUNCTION(xml_parser_free) return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); if (parser->isparsing == 1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parser cannot be freed while it is parsing."); RETURN_FALSE; } - if (zend_list_delete(parser->index) == FAILURE) { - RETURN_FALSE; - } - - RETVAL_TRUE; + zend_list_close(Z_RES(parser->index)); + ZVAL_UNDEF(&parser->index); + RETURN_TRUE; } /* }}} */ @@ -1624,33 +1555,34 @@ PHP_FUNCTION(xml_parser_free) PHP_FUNCTION(xml_parser_set_option) { xml_parser *parser; - zval *pind, **val; + zval *pind, *val; long opt; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlZ", &pind, &opt, &val) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &pind, &opt, &val) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: convert_to_long_ex(val); - parser->case_folding = Z_LVAL_PP(val); + parser->case_folding = Z_LVAL_P(val); break; case PHP_XML_OPTION_SKIP_TAGSTART: convert_to_long_ex(val); - parser->toffset = Z_LVAL_PP(val); + parser->toffset = Z_LVAL_P(val); break; case PHP_XML_OPTION_SKIP_WHITE: convert_to_long_ex(val); - parser->skipwhite = Z_LVAL_PP(val); + parser->skipwhite = Z_LVAL_P(val); break; case PHP_XML_OPTION_TARGET_ENCODING: { xml_encoding *enc; convert_to_string_ex(val); - enc = xml_get_encoding(Z_STRVAL_PP(val)); + enc = xml_get_encoding(Z_STRVAL_P(val)); if (enc == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported target encoding \"%s\"", Z_STRVAL_PP(val)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported target encoding \"%s\"", Z_STRVAL_P(val)); RETURN_FALSE; } parser->target_encoding = enc->name; @@ -1676,14 +1608,14 @@ PHP_FUNCTION(xml_parser_get_option) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &pind, &opt) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: RETURN_LONG(parser->case_folding); break; case PHP_XML_OPTION_TARGET_ENCODING: - RETURN_STRING(parser->target_encoding, 1); + RETURN_STRING((char *)parser->target_encoding); break; default: php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option"); @@ -1700,18 +1632,18 @@ PHP_FUNCTION(xml_parser_get_option) PHP_FUNCTION(utf8_encode) { char *arg; - XML_Char *encoded; - int arg_len, len; + int arg_len; + zend_string *encoded; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { return; } - encoded = xml_utf8_encode(arg, arg_len, &len, "ISO-8859-1"); + encoded = xml_utf8_encode(arg, arg_len, "ISO-8859-1"); if (encoded == NULL) { RETURN_FALSE; } - RETVAL_STRINGL(encoded, len, 0); + RETURN_STR(encoded); } /* }}} */ @@ -1720,18 +1652,18 @@ PHP_FUNCTION(utf8_encode) PHP_FUNCTION(utf8_decode) { char *arg; - XML_Char *decoded; - int arg_len, len; + int arg_len; + zend_string *decoded; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { return; } - decoded = xml_utf8_decode(arg, arg_len, &len, "ISO-8859-1"); + decoded = xml_utf8_decode(arg, arg_len, "ISO-8859-1"); if (decoded == NULL) { RETURN_FALSE; } - RETVAL_STRINGL(decoded, len, 0); + RETURN_STR(decoded); } /* }}} */ -- cgit v1.2.1 From d8651fbe1c4caaaedc42cef1dee0dd3b3f1e447e Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sat, 3 May 2014 16:06:27 +0800 Subject: Make they are in the same style of Z_ISREF --- ext/xml/xml.c | 74 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 76b6dd2146..146ff004f7 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -400,43 +400,43 @@ static void xml_parser_dtor(zend_resource *rsrc TSRMLS_DC) efree(parser->ltags[ inx ]); efree(parser->ltags); } - if (!ZVAL_IS_UNDEF(&parser->startElementHandler)) { + if (!Z_ISUNDEF(parser->startElementHandler)) { zval_ptr_dtor(&parser->startElementHandler); } - if (!ZVAL_IS_UNDEF(&parser->endElementHandler)) { + if (!Z_ISUNDEF(parser->endElementHandler)) { zval_ptr_dtor(&parser->endElementHandler); } - if (!ZVAL_IS_UNDEF(&parser->characterDataHandler)) { + if (!Z_ISUNDEF(parser->characterDataHandler)) { zval_ptr_dtor(&parser->characterDataHandler); } - if (!ZVAL_IS_UNDEF(&parser->processingInstructionHandler)) { + if (!Z_ISUNDEF(parser->processingInstructionHandler)) { zval_ptr_dtor(&parser->processingInstructionHandler); } - if (!ZVAL_IS_UNDEF(&parser->defaultHandler)) { + if (!Z_ISUNDEF(parser->defaultHandler)) { zval_ptr_dtor(&parser->defaultHandler); } - if (!ZVAL_IS_UNDEF(&parser->unparsedEntityDeclHandler)) { + if (!Z_ISUNDEF(parser->unparsedEntityDeclHandler)) { zval_ptr_dtor(&parser->unparsedEntityDeclHandler); } - if (!ZVAL_IS_UNDEF(&parser->notationDeclHandler)) { + if (!Z_ISUNDEF(parser->notationDeclHandler)) { zval_ptr_dtor(&parser->notationDeclHandler); } - if (!ZVAL_IS_UNDEF(&parser->externalEntityRefHandler)) { + if (!Z_ISUNDEF(parser->externalEntityRefHandler)) { zval_ptr_dtor(&parser->externalEntityRefHandler); } - if (!ZVAL_IS_UNDEF(&parser->unknownEncodingHandler)) { + if (!Z_ISUNDEF(parser->unknownEncodingHandler)) { zval_ptr_dtor(&parser->unknownEncodingHandler); } - if (!ZVAL_IS_UNDEF(&parser->startNamespaceDeclHandler)) { + if (!Z_ISUNDEF(parser->startNamespaceDeclHandler)) { zval_ptr_dtor(&parser->startNamespaceDeclHandler); } - if (!ZVAL_IS_UNDEF(&parser->endNamespaceDeclHandler)) { + if (!Z_ISUNDEF(parser->endNamespaceDeclHandler)) { zval_ptr_dtor(&parser->endNamespaceDeclHandler); } if (parser->baseURI) { efree(parser->baseURI); } - if (!ZVAL_IS_UNDEF(&parser->object)) { + if (!Z_ISUNDEF(parser->object)) { zval_ptr_dtor(&parser->object); } @@ -675,7 +675,7 @@ static void _xml_add_to_info(xml_parser *parser,char *name) { zval *element; - if (ZVAL_IS_UNDEF(&parser->info)) { + if (Z_ISUNDEF(parser->info)) { return; } @@ -719,7 +719,7 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch tag_name = _xml_decode_tag(parser, (const char *)name); - if (!ZVAL_IS_UNDEF(&parser->startElementHandler)) { + if (!Z_ISUNDEF(parser->startElementHandler)) { ZVAL_COPY(&args[0], &parser->index); ZVAL_STRING(&args[1], tag_name->val + parser->toffset); array_init(&args[2]); @@ -737,12 +737,12 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch } xml_call_handler(parser, &parser->startElementHandler, parser->startElementPtr, 3, args, &retval); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } } - if (!ZVAL_IS_UNDEF(&parser->data)) { + if (!Z_ISUNDEF(parser->data)) { if (parser->level <= XML_MAXLEVEL) { zval tag, atr; int atcnt = 0; @@ -803,17 +803,17 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) tag_name = _xml_decode_tag(parser, (const char *)name); - if (!ZVAL_IS_UNDEF(&parser->endElementHandler)) { + if (!Z_ISUNDEF(parser->endElementHandler)) { ZVAL_COPY(&args[0], &parser->index); ZVAL_STRING(&args[1], (tag_name->val) + parser->toffset); xml_call_handler(parser, &parser->endElementHandler, parser->endElementPtr, 2, args, &retval); - if (ZVAL_IS_UNDEF(&retval)) { + if (Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } } - if (!ZVAL_IS_UNDEF(&parser->data)) { + if (!Z_ISUNDEF(parser->data)) { zval tag; if (parser->lastwasopen) { @@ -852,16 +852,16 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) if (parser) { zval retval, args[2]; - if (!ZVAL_IS_UNDEF(&parser->characterDataHandler)) { + if (!Z_ISUNDEF(parser->characterDataHandler)) { ZVAL_COPY(&args[0], &parser->index); _xml_xmlchar_zval(s, len, parser->target_encoding, &args[1]); xml_call_handler(parser, &parser->characterDataHandler, parser->characterDataPtr, 2, args, &retval); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } } - if (!ZVAL_IS_UNDEF(&parser->data)) { + if (!Z_ISUNDEF(parser->data)) { int i; int doprint = 0; zend_string *decoded_value; @@ -946,14 +946,14 @@ void _xml_processingInstructionHandler(void *userData, const XML_Char *target, c { xml_parser *parser = (xml_parser *)userData; - if (parser && !ZVAL_IS_UNDEF(&parser->processingInstructionHandler)) { + if (parser && !Z_ISUNDEF(parser->processingInstructionHandler)) { zval retval, args[3]; ZVAL_COPY(&args[0], &parser->index); _xml_xmlchar_zval(target, 0, parser->target_encoding, &args[1]); _xml_xmlchar_zval(data, 0, parser->target_encoding, &args[2]); xml_call_handler(parser, &parser->processingInstructionHandler, parser->processingInstructionPtr, 3, args, &retval); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } } @@ -965,13 +965,13 @@ void _xml_defaultHandler(void *userData, const XML_Char *s, int len) { xml_parser *parser = (xml_parser *)userData; - if (parser && !ZVAL_IS_UNDEF(&parser->defaultHandler)) { + if (parser && !Z_ISUNDEF(parser->defaultHandler)) { zval retval, args[2]; ZVAL_COPY(&args[0], &parser->index); _xml_xmlchar_zval(s, len, parser->target_encoding, &args[1]); xml_call_handler(parser, &parser->defaultHandler, parser->defaultPtr, 2, args, &retval); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } } @@ -988,7 +988,7 @@ void _xml_unparsedEntityDeclHandler(void *userData, { xml_parser *parser = (xml_parser *)userData; - if (parser && !ZVAL_IS_UNDEF(&parser->unparsedEntityDeclHandler)) { + if (parser && !Z_ISUNDEF(parser->unparsedEntityDeclHandler)) { zval retval, args[6]; ZVAL_COPY(&args[0], &parser->index); @@ -998,7 +998,7 @@ void _xml_unparsedEntityDeclHandler(void *userData, _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); _xml_xmlchar_zval(notationName, 0, parser->target_encoding, &args[5]); xml_call_handler(parser, &parser->unparsedEntityDeclHandler, parser->unparsedEntityDeclPtr, 6, args, &retval); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } } @@ -1014,7 +1014,7 @@ void _xml_notationDeclHandler(void *userData, { xml_parser *parser = (xml_parser *)userData; - if (parser && !ZVAL_IS_UNDEF(&parser->notationDeclHandler)) { + if (parser && !Z_ISUNDEF(parser->notationDeclHandler)) { zval retval, args[5]; ZVAL_COPY(&args[0], &parser->index); @@ -1023,7 +1023,7 @@ void _xml_notationDeclHandler(void *userData, _xml_xmlchar_zval(systemId, 0, parser->target_encoding, &args[3]); _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); xml_call_handler(parser, &parser->notationDeclHandler, parser->notationDeclPtr, 5, args, &retval); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } } @@ -1040,7 +1040,7 @@ int _xml_externalEntityRefHandler(XML_Parser parserPtr, xml_parser *parser = XML_GetUserData(parserPtr); int ret = 0; /* abort if no handler is set (should be configurable?) */ - if (parser && !ZVAL_IS_UNDEF(&parser->externalEntityRefHandler)) { + if (parser && !Z_ISUNDEF(parser->externalEntityRefHandler)) { zval retval, args[5]; ZVAL_COPY(&args[0], &parser->index); @@ -1049,7 +1049,7 @@ int _xml_externalEntityRefHandler(XML_Parser parserPtr, _xml_xmlchar_zval(systemId, 0, parser->target_encoding, &args[3]); _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); xml_call_handler(parser, &parser->externalEntityRefHandler, parser->externalEntityRefPtr, 5, args, &retval); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { convert_to_long(&retval); ret = Z_LVAL(retval); } else { @@ -1065,14 +1065,14 @@ void _xml_startNamespaceDeclHandler(void *userData,const XML_Char *prefix, const { xml_parser *parser = (xml_parser *)userData; - if (parser && !ZVAL_IS_UNDEF(&parser->startNamespaceDeclHandler)) { + if (parser && !Z_ISUNDEF(parser->startNamespaceDeclHandler)) { zval retval, args[3]; ZVAL_COPY(&args[0], &parser->index); _xml_xmlchar_zval(prefix, 0, parser->target_encoding, &args[1]); _xml_xmlchar_zval(uri, 0, parser->target_encoding, &args[2]); xml_call_handler(parser, &parser->startNamespaceDeclHandler, parser->startNamespaceDeclPtr, 3, args, &retval); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } } @@ -1084,13 +1084,13 @@ void _xml_endNamespaceDeclHandler(void *userData, const XML_Char *prefix) { xml_parser *parser = (xml_parser *)userData; - if (parser && !ZVAL_IS_UNDEF(&parser->endNamespaceDeclHandler)) { + if (parser && !Z_ISUNDEF(parser->endNamespaceDeclHandler)) { zval retval, args[2]; ZVAL_COPY(&args[0], &parser->index); _xml_xmlchar_zval(prefix, 0, parser->target_encoding, &args[1]); xml_call_handler(parser, &parser->endNamespaceDeclHandler, parser->endNamespaceDeclPtr, 2, args, &retval); - if (!ZVAL_IS_UNDEF(&retval)) { + if (!Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } } @@ -1186,7 +1186,7 @@ PHP_FUNCTION(xml_set_object) ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); /* please leave this commented - or ask thies@thieso.net before doing it (again) */ - if (!ZVAL_IS_UNDEF(&parser->object)) { + if (!Z_ISUNDEF(parser->object)) { zval_ptr_dtor(&parser->object); } -- cgit v1.2.1 From fa6f6c880741ae9696a9c21707fd3a844dd8d5ee Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 5 May 2014 19:45:50 +0800 Subject: Fixed Reference handling in xml_parse_into_struct --- ext/xml/xml.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 146ff004f7..169be95981 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -679,7 +679,7 @@ static void _xml_add_to_info(xml_parser *parser,char *name) return; } - if ((element = zend_hash_str_find(Z_ARRVAL(parser->info),name, strlen(name))) == NULL) { + if ((element = zend_hash_str_find(Z_ARRVAL(parser->info), name, strlen(name))) == NULL) { zval values; array_init(&values); element = zend_hash_str_update(Z_ARRVAL(parser->info), name, strlen(name), &values); @@ -1407,8 +1407,9 @@ PHP_FUNCTION(xml_parse_into_struct) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz|z", &pind, &data, &data_len, &xdata, &info) == FAILURE) { return; } - + if (info) { + ZVAL_DEREF(info); zval_ptr_dtor(info); array_init(info); } -- cgit v1.2.1 From a636c4c03f89e626f6b778a3e3ab40e989ad225d Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 5 May 2014 19:52:42 +0800 Subject: Fixed segfault in _xml_xmlchar_zval --- ext/xml/xml.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 169be95981..bbb1223f8b 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -378,6 +378,7 @@ static void _xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encodi { if (s == NULL) { ZVAL_FALSE(ret); + return; } if (len == 0) { len = _xml_xmlcharlen(s); @@ -1195,7 +1196,7 @@ PHP_FUNCTION(xml_set_object) zval_add_ref(&parser->object); #endif */ - ZVAL_COPY(&parser->object, mythis); + ZVAL_DUP_DEREF(&parser->object, mythis); RETVAL_TRUE; } -- cgit v1.2.1 From 592aa37f67921c92bc8d882c431d443e24fc1e52 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 5 May 2014 17:43:13 +0200 Subject: Fix memory error in ext/xml --- ext/xml/xml.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index bbb1223f8b..0236dd062a 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1534,6 +1534,7 @@ PHP_FUNCTION(xml_parser_free) { zval *pind; xml_parser *parser; + zend_resource *res; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { return; @@ -1546,8 +1547,9 @@ PHP_FUNCTION(xml_parser_free) RETURN_FALSE; } - zend_list_close(Z_RES(parser->index)); + res = Z_RES(parser->index); ZVAL_UNDEF(&parser->index); + zend_list_close(res); RETURN_TRUE; } /* }}} */ -- cgit v1.2.1 From b54dcab37768bc8c5902c99d0e2ea9012149907a Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 7 May 2014 15:36:01 +0400 Subject: Initialize "retval" --- ext/xml/xml.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 0236dd062a..d8eed905f3 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -472,6 +472,7 @@ static void xml_call_handler(xml_parser *parser, zval *handler, zend_function *f int i; TSRMLS_FETCH(); + ZVAL_UNDEF(retval); if (parser && handler && !EG(exception)) { int result; zend_fcall_info fci; @@ -738,9 +739,7 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch } xml_call_handler(parser, &parser->startElementHandler, parser->startElementPtr, 3, args, &retval); - if (!Z_ISUNDEF(retval)) { - zval_ptr_dtor(&retval); - } + zval_ptr_dtor(&retval); } if (!Z_ISUNDEF(parser->data)) { @@ -809,9 +808,7 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) ZVAL_STRING(&args[1], (tag_name->val) + parser->toffset); xml_call_handler(parser, &parser->endElementHandler, parser->endElementPtr, 2, args, &retval); - if (Z_ISUNDEF(retval)) { - zval_ptr_dtor(&retval); - } + zval_ptr_dtor(&retval); } if (!Z_ISUNDEF(parser->data)) { @@ -857,9 +854,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) ZVAL_COPY(&args[0], &parser->index); _xml_xmlchar_zval(s, len, parser->target_encoding, &args[1]); xml_call_handler(parser, &parser->characterDataHandler, parser->characterDataPtr, 2, args, &retval); - if (!Z_ISUNDEF(retval)) { - zval_ptr_dtor(&retval); - } + zval_ptr_dtor(&retval); } if (!Z_ISUNDEF(parser->data)) { @@ -954,9 +949,7 @@ void _xml_processingInstructionHandler(void *userData, const XML_Char *target, c _xml_xmlchar_zval(target, 0, parser->target_encoding, &args[1]); _xml_xmlchar_zval(data, 0, parser->target_encoding, &args[2]); xml_call_handler(parser, &parser->processingInstructionHandler, parser->processingInstructionPtr, 3, args, &retval); - if (!Z_ISUNDEF(retval)) { - zval_ptr_dtor(&retval); - } + zval_ptr_dtor(&retval); } } /* }}} */ @@ -972,9 +965,7 @@ void _xml_defaultHandler(void *userData, const XML_Char *s, int len) ZVAL_COPY(&args[0], &parser->index); _xml_xmlchar_zval(s, len, parser->target_encoding, &args[1]); xml_call_handler(parser, &parser->defaultHandler, parser->defaultPtr, 2, args, &retval); - if (!Z_ISUNDEF(retval)) { - zval_ptr_dtor(&retval); - } + zval_ptr_dtor(&retval); } } /* }}} */ @@ -999,9 +990,7 @@ void _xml_unparsedEntityDeclHandler(void *userData, _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); _xml_xmlchar_zval(notationName, 0, parser->target_encoding, &args[5]); xml_call_handler(parser, &parser->unparsedEntityDeclHandler, parser->unparsedEntityDeclPtr, 6, args, &retval); - if (!Z_ISUNDEF(retval)) { - zval_ptr_dtor(&retval); - } + zval_ptr_dtor(&retval); } } /* }}} */ @@ -1024,9 +1013,7 @@ void _xml_notationDeclHandler(void *userData, _xml_xmlchar_zval(systemId, 0, parser->target_encoding, &args[3]); _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); xml_call_handler(parser, &parser->notationDeclHandler, parser->notationDeclPtr, 5, args, &retval); - if (!Z_ISUNDEF(retval)) { - zval_ptr_dtor(&retval); - } + zval_ptr_dtor(&retval); } } /* }}} */ @@ -1073,9 +1060,7 @@ void _xml_startNamespaceDeclHandler(void *userData,const XML_Char *prefix, const _xml_xmlchar_zval(prefix, 0, parser->target_encoding, &args[1]); _xml_xmlchar_zval(uri, 0, parser->target_encoding, &args[2]); xml_call_handler(parser, &parser->startNamespaceDeclHandler, parser->startNamespaceDeclPtr, 3, args, &retval); - if (!Z_ISUNDEF(retval)) { - zval_ptr_dtor(&retval); - } + zval_ptr_dtor(&retval); } } /* }}} */ @@ -1091,9 +1076,7 @@ void _xml_endNamespaceDeclHandler(void *userData, const XML_Char *prefix) ZVAL_COPY(&args[0], &parser->index); _xml_xmlchar_zval(prefix, 0, parser->target_encoding, &args[1]); xml_call_handler(parser, &parser->endNamespaceDeclHandler, parser->endNamespaceDeclPtr, 2, args, &retval); - if (!Z_ISUNDEF(retval)) { - zval_ptr_dtor(&retval); - } + zval_ptr_dtor(&retval); } } /* }}} */ -- cgit v1.2.1 From e75f2d1f763ad84d4450c646466066960720fc91 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 7 May 2014 16:15:29 +0400 Subject: Fixed bug introduced during conversion to "phpng" --- ext/xml/xml.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index d8eed905f3..6bc6acbb1e 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -897,7 +897,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) zval tag; zval *curtag, *mytype, *myval; - ZEND_HASH_FOREACH_VAL(Z_ARRVAL(parser->data), curtag) { + ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL(parser->data), curtag) { if ((mytype = zend_hash_str_find(Z_ARRVAL_P(curtag),"type", sizeof("type") - 1))) { if (!strcmp(Z_STRVAL_P(mytype), "cdata")) { if ((myval = zend_hash_str_find(Z_ARRVAL_P(curtag), "value", sizeof("value") - 1))) { @@ -910,6 +910,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) } } } + break; } ZEND_HASH_FOREACH_END(); if (parser->level <= XML_MAXLEVEL) { -- cgit v1.2.1 From 0427ae08fb8dde00993277c3e7f9d98abfa159a8 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 3 Jun 2014 00:36:31 +0400 Subject: cleanup --- ext/xml/xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 6bc6acbb1e..0e9f19a199 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1180,7 +1180,7 @@ PHP_FUNCTION(xml_set_object) zval_add_ref(&parser->object); #endif */ - ZVAL_DUP_DEREF(&parser->object, mythis); + ZVAL_COPY(&parser->object, mythis); RETVAL_TRUE; } -- cgit v1.2.1 From c1965f58d4dd3970912dcd6a63ccd5860bae1a97 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 5 Jun 2014 16:04:11 +0400 Subject: Use reference counting instead of zval duplication --- ext/xml/xml.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 0e9f19a199..bbceb6dcf2 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1164,7 +1164,7 @@ PHP_FUNCTION(xml_set_object) xml_parser *parser; zval *pind, *mythis; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ro", &pind, &mythis) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ro/", &pind, &mythis) == FAILURE) { return; } @@ -1389,19 +1389,17 @@ PHP_FUNCTION(xml_parse_into_struct) char *data; int data_len, ret; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz|z", &pind, &data, &data_len, &xdata, &info) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz/|z/", &pind, &data, &data_len, &xdata, &info) == FAILURE) { return; } if (info) { - ZVAL_DEREF(info); zval_ptr_dtor(info); array_init(info); } ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); - ZVAL_DEREF(xdata); zval_ptr_dtor(xdata); array_init(xdata); -- cgit v1.2.1 From a08b7b7701d2669a8e242cdb015f81d21a0ccb52 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 13 Aug 2014 19:43:34 +0400 Subject: cleanup --- ext/xml/xml.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index bbceb6dcf2..2886d6c686 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -290,7 +290,7 @@ static int le_xml_parser; /* {{{ startup, shutdown and info functions */ static PHP_GINIT_FUNCTION(xml) { - xml_globals->default_encoding = "UTF-8"; + xml_globals->default_encoding = (XML_Char*)"UTF-8"; } static void *php_xml_malloc_wrapper(size_t sz) @@ -727,11 +727,13 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch array_init(&args[2]); while (attributes && *attributes) { + zval tmp; + att = _xml_decode_tag(parser, (const char *)attributes[0]); val = xml_utf8_decode(attributes[1], strlen((char *)attributes[1]), parser->target_encoding); - // TODO: avoid reallocation ??? - add_assoc_str(&args[2], att->val, val); + ZVAL_STR(&tmp, val); + zend_symtable_update(Z_ARRVAL(args[2]), att, &tmp); attributes += 2; @@ -762,11 +764,13 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch attributes = (const XML_Char **) attrs; while (attributes && *attributes) { + zval tmp; + att = _xml_decode_tag(parser, (const char *)attributes[0]); val = xml_utf8_decode(attributes[1], strlen((char *)attributes[1]), parser->target_encoding); - // TODO: avoid reallocation ??? - add_assoc_str(&atr, att->val, val); + ZVAL_STR(&tmp, val); + zend_symtable_update(Z_ARRVAL(atr), att, &tmp); atcnt++; attributes += 2; @@ -889,7 +893,6 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) decoded_value->val, decoded_value->len + 1); STR_RELEASE(decoded_value); } else { - // TODO: avoid reallocation ??? add_assoc_str(parser->ctag, "value", decoded_value); } @@ -919,7 +922,6 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) _xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset); add_assoc_string(&tag, "tag", parser->ltags[parser->level-1] + parser->toffset); - // TODO: avoid reallocation ??? add_assoc_str(&tag, "value", decoded_value); add_assoc_string(&tag, "type", "cdata"); add_assoc_long(&tag, "level", parser->level); @@ -1109,11 +1111,11 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp encoding = XML(default_encoding); auto_detect = 1; } else if (strcasecmp(encoding_param, "ISO-8859-1") == 0) { - encoding = "ISO-8859-1"; + encoding = (XML_Char*)"ISO-8859-1"; } else if (strcasecmp(encoding_param, "UTF-8") == 0) { - encoding = "UTF-8"; + encoding = (XML_Char*)"UTF-8"; } else if (strcasecmp(encoding_param, "US-ASCII") == 0) { - encoding = "US-ASCII"; + encoding = (XML_Char*)"US-ASCII"; } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "unsupported source encoding \"%s\"", encoding_param); RETURN_FALSE; @@ -1128,7 +1130,7 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp parser = ecalloc(1, sizeof(xml_parser)); parser->parser = XML_ParserCreate_MM((auto_detect ? NULL : encoding), - &php_xml_mem_hdlrs, ns_param); + &php_xml_mem_hdlrs, (XML_Char*)ns_param); parser->target_encoding = encoding; parser->case_folding = 1; @@ -1372,7 +1374,7 @@ PHP_FUNCTION(xml_parse) ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); parser->isparsing = 1; - ret = XML_Parse(parser->parser, data, data_len, isFinal); + ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, isFinal); parser->isparsing = 0; RETVAL_LONG(ret); } @@ -1417,7 +1419,7 @@ PHP_FUNCTION(xml_parse_into_struct) XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler); parser->isparsing = 1; - ret = XML_Parse(parser->parser, data, data_len, 1); + ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, 1); parser->isparsing = 0; RETVAL_LONG(ret); @@ -1566,7 +1568,7 @@ PHP_FUNCTION(xml_parser_set_option) case PHP_XML_OPTION_TARGET_ENCODING: { xml_encoding *enc; convert_to_string_ex(val); - enc = xml_get_encoding(Z_STRVAL_P(val)); + enc = xml_get_encoding((XML_Char*)Z_STRVAL_P(val)); if (enc == NULL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported target encoding \"%s\"", Z_STRVAL_P(val)); RETURN_FALSE; @@ -1625,7 +1627,7 @@ PHP_FUNCTION(utf8_encode) return; } - encoded = xml_utf8_encode(arg, arg_len, "ISO-8859-1"); + encoded = xml_utf8_encode(arg, arg_len, (XML_Char*)"ISO-8859-1"); if (encoded == NULL) { RETURN_FALSE; } @@ -1645,7 +1647,7 @@ PHP_FUNCTION(utf8_decode) return; } - decoded = xml_utf8_decode(arg, arg_len, "ISO-8859-1"); + decoded = xml_utf8_decode((XML_Char*)arg, arg_len, (XML_Char*)"ISO-8859-1"); if (decoded == NULL) { RETURN_FALSE; } -- cgit v1.2.1 From 7dbb8117e4eb5477f5c4cb0bc320445476e55ecd Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 19 Aug 2014 09:28:13 +0400 Subject: Fixed encoding support --- ext/xml/xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 2886d6c686..28b5fc2e0e 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -383,7 +383,7 @@ static void _xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encodi if (len == 0) { len = _xml_xmlcharlen(s); } - ZVAL_STRINGL(ret, (char *)s, len); + ZVAL_STR(ret, xml_utf8_decode(s, len, encoding)); } /* }}} */ -- cgit v1.2.1 From 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 08:07:31 +0200 Subject: basic macro replacements, all at once --- ext/xml/xml.c | 108 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 2886d6c686..dd88f4b226 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -314,33 +314,33 @@ PHP_MINIT_FUNCTION(xml) { le_xml_parser = zend_register_list_destructors_ex(xml_parser_dtor, NULL, "xml", module_number); - REGISTER_LONG_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_NO_MEMORY", XML_ERROR_NO_MEMORY, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_SYNTAX", XML_ERROR_SYNTAX, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_NO_ELEMENTS", XML_ERROR_NO_ELEMENTS, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_INVALID_TOKEN", XML_ERROR_INVALID_TOKEN, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_UNCLOSED_TOKEN", XML_ERROR_UNCLOSED_TOKEN, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_PARTIAL_CHAR", XML_ERROR_PARTIAL_CHAR, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_TAG_MISMATCH", XML_ERROR_TAG_MISMATCH, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_DUPLICATE_ATTRIBUTE", XML_ERROR_DUPLICATE_ATTRIBUTE, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_JUNK_AFTER_DOC_ELEMENT", XML_ERROR_JUNK_AFTER_DOC_ELEMENT, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_PARAM_ENTITY_REF", XML_ERROR_PARAM_ENTITY_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_UNDEFINED_ENTITY", XML_ERROR_UNDEFINED_ENTITY, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_RECURSIVE_ENTITY_REF", XML_ERROR_RECURSIVE_ENTITY_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_ASYNC_ENTITY", XML_ERROR_ASYNC_ENTITY, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_BAD_CHAR_REF", XML_ERROR_BAD_CHAR_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_BINARY_ENTITY_REF", XML_ERROR_BINARY_ENTITY_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF", XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_MISPLACED_XML_PI", XML_ERROR_MISPLACED_XML_PI, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_UNKNOWN_ENCODING", XML_ERROR_UNKNOWN_ENCODING, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_INCORRECT_ENCODING", XML_ERROR_INCORRECT_ENCODING, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_UNCLOSED_CDATA_SECTION", XML_ERROR_UNCLOSED_CDATA_SECTION, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ERROR_EXTERNAL_ENTITY_HANDLING", XML_ERROR_EXTERNAL_ENTITY_HANDLING, CONST_CS|CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("XML_OPTION_CASE_FOLDING", PHP_XML_OPTION_CASE_FOLDING, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_OPTION_TARGET_ENCODING", PHP_XML_OPTION_TARGET_ENCODING, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_TAGSTART", PHP_XML_OPTION_SKIP_TAGSTART, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_WHITE", PHP_XML_OPTION_SKIP_WHITE, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_NO_MEMORY", XML_ERROR_NO_MEMORY, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_SYNTAX", XML_ERROR_SYNTAX, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_NO_ELEMENTS", XML_ERROR_NO_ELEMENTS, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_INVALID_TOKEN", XML_ERROR_INVALID_TOKEN, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_UNCLOSED_TOKEN", XML_ERROR_UNCLOSED_TOKEN, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_PARTIAL_CHAR", XML_ERROR_PARTIAL_CHAR, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_TAG_MISMATCH", XML_ERROR_TAG_MISMATCH, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_DUPLICATE_ATTRIBUTE", XML_ERROR_DUPLICATE_ATTRIBUTE, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_JUNK_AFTER_DOC_ELEMENT", XML_ERROR_JUNK_AFTER_DOC_ELEMENT, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_PARAM_ENTITY_REF", XML_ERROR_PARAM_ENTITY_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_UNDEFINED_ENTITY", XML_ERROR_UNDEFINED_ENTITY, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_RECURSIVE_ENTITY_REF", XML_ERROR_RECURSIVE_ENTITY_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_ASYNC_ENTITY", XML_ERROR_ASYNC_ENTITY, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_BAD_CHAR_REF", XML_ERROR_BAD_CHAR_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_BINARY_ENTITY_REF", XML_ERROR_BINARY_ENTITY_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF", XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_MISPLACED_XML_PI", XML_ERROR_MISPLACED_XML_PI, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_UNKNOWN_ENCODING", XML_ERROR_UNKNOWN_ENCODING, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_INCORRECT_ENCODING", XML_ERROR_INCORRECT_ENCODING, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_UNCLOSED_CDATA_SECTION", XML_ERROR_UNCLOSED_CDATA_SECTION, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_ERROR_EXTERNAL_ENTITY_HANDLING", XML_ERROR_EXTERNAL_ENTITY_HANDLING, CONST_CS|CONST_PERSISTENT); + + REGISTER_INT_CONSTANT("XML_OPTION_CASE_FOLDING", PHP_XML_OPTION_CASE_FOLDING, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_OPTION_TARGET_ENCODING", PHP_XML_OPTION_TARGET_ENCODING, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_OPTION_SKIP_TAGSTART", PHP_XML_OPTION_SKIP_TAGSTART, CONST_CS|CONST_PERSISTENT); + REGISTER_INT_CONSTANT("XML_OPTION_SKIP_WHITE", PHP_XML_OPTION_SKIP_WHITE, CONST_CS|CONST_PERSISTENT); /* this object should not be pre-initialised at compile time, as the order of members may vary */ @@ -456,7 +456,7 @@ static void xml_set_handler(zval *handler, zval *data) /* IS_ARRAY might indicate that we're using array($obj, 'method') syntax */ if (Z_TYPE_P(data) != IS_ARRAY && Z_TYPE_P(data) != IS_OBJECT) { convert_to_string_ex(data); - if (Z_STRLEN_P(data) == 0) { + if (Z_STRSIZE_P(data) == 0) { ZVAL_UNDEF(handler); return; } @@ -663,9 +663,9 @@ static int _xml_xmlcharlen(const XML_Char *s) PHPAPI char *_xml_zval_strdup(zval *val) { if (Z_TYPE_P(val) == IS_STRING) { - char *buf = emalloc(Z_STRLEN_P(val) + 1); - memcpy(buf, Z_STRVAL_P(val), Z_STRLEN_P(val)); - buf[Z_STRLEN_P(val)] = '\0'; + char *buf = emalloc(Z_STRSIZE_P(val) + 1); + memcpy(buf, Z_STRVAL_P(val), Z_STRSIZE_P(val)); + buf[Z_STRSIZE_P(val)] = '\0'; return buf; } return NULL; @@ -687,7 +687,7 @@ static void _xml_add_to_info(xml_parser *parser,char *name) element = zend_hash_str_update(Z_ARRVAL(parser->info), name, strlen(name), &values); } - add_next_index_long(element, parser->curtag); + add_next_index_int(element, parser->curtag); parser->curtag++; } @@ -756,7 +756,7 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch add_assoc_string(&tag, "tag", tag_name->val + parser->toffset); /* cast to avoid gcc-warning */ add_assoc_string(&tag, "type", "open"); - add_assoc_long(&tag, "level", parser->level); + add_assoc_int(&tag, "level", parser->level); parser->ltags[parser->level-1] = estrdup(tag_name->val); parser->lastwasopen = 1; @@ -827,7 +827,7 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) add_assoc_string(&tag, "tag", tag_name->val + parser->toffset); /* cast to avoid gcc-warning */ add_assoc_string(&tag, "type", "close"); - add_assoc_long(&tag, "level", parser->level); + add_assoc_int(&tag, "level", parser->level); zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } @@ -887,9 +887,9 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) /* check if the current tag already has a value - if yes append to that! */ if ((myval = zend_hash_str_find(Z_ARRVAL_P(parser->ctag), "value", sizeof("value") - 1))) { - int newlen = Z_STRLEN_P(myval) + decoded_value->len; + int newlen = Z_STRSIZE_P(myval) + decoded_value->len; Z_STR_P(myval) = STR_REALLOC(Z_STR_P(myval), newlen, 0); - strncpy(Z_STRVAL_P(myval) + Z_STRLEN_P(myval) - decoded_value->len, + strncpy(Z_STRVAL_P(myval) + Z_STRSIZE_P(myval) - decoded_value->len, decoded_value->val, decoded_value->len + 1); STR_RELEASE(decoded_value); } else { @@ -904,9 +904,9 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) if ((mytype = zend_hash_str_find(Z_ARRVAL_P(curtag),"type", sizeof("type") - 1))) { if (!strcmp(Z_STRVAL_P(mytype), "cdata")) { if ((myval = zend_hash_str_find(Z_ARRVAL_P(curtag), "value", sizeof("value") - 1))) { - int newlen = Z_STRLEN_P(myval) + decoded_value->len; + int newlen = Z_STRSIZE_P(myval) + decoded_value->len; Z_STR_P(myval) = STR_REALLOC(Z_STR_P(myval), newlen, 0); - strncpy(Z_STRVAL_P(myval) + Z_STRLEN_P(myval) - decoded_value->len, + strncpy(Z_STRVAL_P(myval) + Z_STRSIZE_P(myval) - decoded_value->len, decoded_value->val, decoded_value->len + 1); STR_RELEASE(decoded_value); return; @@ -924,7 +924,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) add_assoc_string(&tag, "tag", parser->ltags[parser->level-1] + parser->toffset); add_assoc_str(&tag, "value", decoded_value); add_assoc_string(&tag, "type", "cdata"); - add_assoc_long(&tag, "level", parser->level); + add_assoc_int(&tag, "level", parser->level); zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } else if (parser->level == (XML_MAXLEVEL + 1)) { @@ -1041,8 +1041,8 @@ int _xml_externalEntityRefHandler(XML_Parser parserPtr, _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); xml_call_handler(parser, &parser->externalEntityRefHandler, parser->externalEntityRefPtr, 5, args, &retval); if (!Z_ISUNDEF(retval)) { - convert_to_long(&retval); - ret = Z_LVAL(retval); + convert_to_int(&retval); + ret = Z_IVAL(retval); } else { ret = 0; } @@ -1376,7 +1376,7 @@ PHP_FUNCTION(xml_parse) parser->isparsing = 1; ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, isFinal); parser->isparsing = 0; - RETVAL_LONG(ret); + RETVAL_INT(ret); } /* }}} */ @@ -1422,7 +1422,7 @@ PHP_FUNCTION(xml_parse_into_struct) ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, 1); parser->isparsing = 0; - RETVAL_LONG(ret); + RETVAL_INT(ret); } /* }}} */ @@ -1439,7 +1439,7 @@ PHP_FUNCTION(xml_get_error_code) ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); - RETURN_LONG((long)XML_GetErrorCode(parser->parser)); + RETURN_INT((long)XML_GetErrorCode(parser->parser)); } /* }}} */ @@ -1474,7 +1474,7 @@ PHP_FUNCTION(xml_get_current_line_number) ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); - RETVAL_LONG(XML_GetCurrentLineNumber(parser->parser)); + RETVAL_INT(XML_GetCurrentLineNumber(parser->parser)); } /* }}} */ @@ -1491,7 +1491,7 @@ PHP_FUNCTION(xml_get_current_column_number) ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); - RETVAL_LONG(XML_GetCurrentColumnNumber(parser->parser)); + RETVAL_INT(XML_GetCurrentColumnNumber(parser->parser)); } /* }}} */ @@ -1508,7 +1508,7 @@ PHP_FUNCTION(xml_get_current_byte_index) ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); - RETVAL_LONG(XML_GetCurrentByteIndex(parser->parser)); + RETVAL_INT(XML_GetCurrentByteIndex(parser->parser)); } /* }}} */ @@ -1554,16 +1554,16 @@ PHP_FUNCTION(xml_parser_set_option) switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: - convert_to_long_ex(val); - parser->case_folding = Z_LVAL_P(val); + convert_to_int_ex(val); + parser->case_folding = Z_IVAL_P(val); break; case PHP_XML_OPTION_SKIP_TAGSTART: - convert_to_long_ex(val); - parser->toffset = Z_LVAL_P(val); + convert_to_int_ex(val); + parser->toffset = Z_IVAL_P(val); break; case PHP_XML_OPTION_SKIP_WHITE: - convert_to_long_ex(val); - parser->skipwhite = Z_LVAL_P(val); + convert_to_int_ex(val); + parser->skipwhite = Z_IVAL_P(val); break; case PHP_XML_OPTION_TARGET_ENCODING: { xml_encoding *enc; @@ -1600,7 +1600,7 @@ PHP_FUNCTION(xml_parser_get_option) switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: - RETURN_LONG(parser->case_folding); + RETURN_INT(parser->case_folding); break; case PHP_XML_OPTION_TARGET_ENCODING: RETURN_STRING((char *)parser->target_encoding); -- cgit v1.2.1 From ff853d2fe0ef57568d7574221ea2f823d8360b70 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 21 Aug 2014 15:47:52 +0200 Subject: fix zpp --- ext/xml/xml.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 0bde50a24d..1ae1f02889 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1366,9 +1366,9 @@ PHP_FUNCTION(xml_parse) zval *pind; char *data; int data_len, ret; - long isFinal = 0; + php_int_t isFinal = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &pind, &data, &data_len, &isFinal) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|i", &pind, &data, &data_len, &isFinal) == FAILURE) { return; } ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1447,10 +1447,10 @@ PHP_FUNCTION(xml_get_error_code) Get XML parser error string */ PHP_FUNCTION(xml_error_string) { - long code; + php_int_t code; char *str; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &code) == FAILURE) { return; } @@ -1544,9 +1544,9 @@ PHP_FUNCTION(xml_parser_set_option) { xml_parser *parser; zval *pind, *val; - long opt; + php_int_t opt; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &pind, &opt, &val) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "riz", &pind, &opt, &val) == FAILURE) { return; } @@ -1591,9 +1591,9 @@ PHP_FUNCTION(xml_parser_get_option) { xml_parser *parser; zval *pind; - long opt; + php_int_t opt; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &pind, &opt) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &pind, &opt) == FAILURE) { return; } ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); -- cgit v1.2.1 From c3e3c98ec666812daaaca896cf5ef758a8a6df14 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:24:55 +0200 Subject: master renames phase 1 --- ext/xml/xml.c | 146 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 73 insertions(+), 73 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 1ae1f02889..a2bcb105f9 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -314,33 +314,33 @@ PHP_MINIT_FUNCTION(xml) { le_xml_parser = zend_register_list_destructors_ex(xml_parser_dtor, NULL, "xml", module_number); - REGISTER_INT_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_NO_MEMORY", XML_ERROR_NO_MEMORY, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_SYNTAX", XML_ERROR_SYNTAX, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_NO_ELEMENTS", XML_ERROR_NO_ELEMENTS, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_INVALID_TOKEN", XML_ERROR_INVALID_TOKEN, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_UNCLOSED_TOKEN", XML_ERROR_UNCLOSED_TOKEN, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_PARTIAL_CHAR", XML_ERROR_PARTIAL_CHAR, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_TAG_MISMATCH", XML_ERROR_TAG_MISMATCH, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_DUPLICATE_ATTRIBUTE", XML_ERROR_DUPLICATE_ATTRIBUTE, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_JUNK_AFTER_DOC_ELEMENT", XML_ERROR_JUNK_AFTER_DOC_ELEMENT, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_PARAM_ENTITY_REF", XML_ERROR_PARAM_ENTITY_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_UNDEFINED_ENTITY", XML_ERROR_UNDEFINED_ENTITY, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_RECURSIVE_ENTITY_REF", XML_ERROR_RECURSIVE_ENTITY_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_ASYNC_ENTITY", XML_ERROR_ASYNC_ENTITY, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_BAD_CHAR_REF", XML_ERROR_BAD_CHAR_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_BINARY_ENTITY_REF", XML_ERROR_BINARY_ENTITY_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF", XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_MISPLACED_XML_PI", XML_ERROR_MISPLACED_XML_PI, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_UNKNOWN_ENCODING", XML_ERROR_UNKNOWN_ENCODING, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_INCORRECT_ENCODING", XML_ERROR_INCORRECT_ENCODING, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_UNCLOSED_CDATA_SECTION", XML_ERROR_UNCLOSED_CDATA_SECTION, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_ERROR_EXTERNAL_ENTITY_HANDLING", XML_ERROR_EXTERNAL_ENTITY_HANDLING, CONST_CS|CONST_PERSISTENT); - - REGISTER_INT_CONSTANT("XML_OPTION_CASE_FOLDING", PHP_XML_OPTION_CASE_FOLDING, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_OPTION_TARGET_ENCODING", PHP_XML_OPTION_TARGET_ENCODING, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_OPTION_SKIP_TAGSTART", PHP_XML_OPTION_SKIP_TAGSTART, CONST_CS|CONST_PERSISTENT); - REGISTER_INT_CONSTANT("XML_OPTION_SKIP_WHITE", PHP_XML_OPTION_SKIP_WHITE, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_NO_MEMORY", XML_ERROR_NO_MEMORY, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_SYNTAX", XML_ERROR_SYNTAX, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_NO_ELEMENTS", XML_ERROR_NO_ELEMENTS, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_INVALID_TOKEN", XML_ERROR_INVALID_TOKEN, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_UNCLOSED_TOKEN", XML_ERROR_UNCLOSED_TOKEN, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_PARTIAL_CHAR", XML_ERROR_PARTIAL_CHAR, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_TAG_MISMATCH", XML_ERROR_TAG_MISMATCH, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_DUPLICATE_ATTRIBUTE", XML_ERROR_DUPLICATE_ATTRIBUTE, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_JUNK_AFTER_DOC_ELEMENT", XML_ERROR_JUNK_AFTER_DOC_ELEMENT, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_PARAM_ENTITY_REF", XML_ERROR_PARAM_ENTITY_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_UNDEFINED_ENTITY", XML_ERROR_UNDEFINED_ENTITY, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_RECURSIVE_ENTITY_REF", XML_ERROR_RECURSIVE_ENTITY_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_ASYNC_ENTITY", XML_ERROR_ASYNC_ENTITY, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_BAD_CHAR_REF", XML_ERROR_BAD_CHAR_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_BINARY_ENTITY_REF", XML_ERROR_BINARY_ENTITY_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF", XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_MISPLACED_XML_PI", XML_ERROR_MISPLACED_XML_PI, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_UNKNOWN_ENCODING", XML_ERROR_UNKNOWN_ENCODING, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_INCORRECT_ENCODING", XML_ERROR_INCORRECT_ENCODING, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_UNCLOSED_CDATA_SECTION", XML_ERROR_UNCLOSED_CDATA_SECTION, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_ERROR_EXTERNAL_ENTITY_HANDLING", XML_ERROR_EXTERNAL_ENTITY_HANDLING, CONST_CS|CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("XML_OPTION_CASE_FOLDING", PHP_XML_OPTION_CASE_FOLDING, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_OPTION_TARGET_ENCODING", PHP_XML_OPTION_TARGET_ENCODING, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_TAGSTART", PHP_XML_OPTION_SKIP_TAGSTART, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_WHITE", PHP_XML_OPTION_SKIP_WHITE, CONST_CS|CONST_PERSISTENT); /* this object should not be pre-initialised at compile time, as the order of members may vary */ @@ -456,7 +456,7 @@ static void xml_set_handler(zval *handler, zval *data) /* IS_ARRAY might indicate that we're using array($obj, 'method') syntax */ if (Z_TYPE_P(data) != IS_ARRAY && Z_TYPE_P(data) != IS_OBJECT) { convert_to_string_ex(data); - if (Z_STRSIZE_P(data) == 0) { + if (Z_STRLEN_P(data) == 0) { ZVAL_UNDEF(handler); return; } @@ -571,12 +571,12 @@ PHPAPI zend_string *xml_utf8_encode(const char *s, int len, const XML_Char *enco if (encoder == NULL) { /* If no encoder function was specified, return the data as-is. */ - str = STR_INIT(s, len, 0); + str = zend_string_init(s, len, 0); return str; } /* This is the theoretical max (will never get beyond len * 2 as long * as we are converting from single-byte characters, though) */ - str = STR_ALLOC(len * 4, 0); + str = zend_string_alloc(len * 4, 0); str->len = 0; while (pos > 0) { c = encoder ? encoder((unsigned char)(*s)) : (unsigned short)(*s); @@ -599,7 +599,7 @@ PHPAPI zend_string *xml_utf8_encode(const char *s, int len, const XML_Char *enco s++; } str->val[str->len] = '\0'; - str = STR_REALLOC(str, str->len, 0); + str = zend_string_realloc(str, str->len, 0); return str; } /* }}} */ @@ -621,11 +621,11 @@ PHPAPI zend_string *xml_utf8_decode(const XML_Char *s, int len, const XML_Char * /* If the target encoding was unknown, or no decoder function * was specified, return the UTF-8-encoded data as-is. */ - str = STR_INIT((char *)s, len, 0); + str = zend_string_init((char *)s, len, 0); return str; } - str = STR_ALLOC(len, 0); + str = zend_string_alloc(len, 0); str->len = 0; while (pos < (size_t)len) { int status = FAILURE; @@ -639,7 +639,7 @@ PHPAPI zend_string *xml_utf8_decode(const XML_Char *s, int len, const XML_Char * } str->val[str->len] = '\0'; if (str->len < len) { - str = STR_REALLOC(str, str->len, 0); + str = zend_string_realloc(str, str->len, 0); } return str; @@ -663,9 +663,9 @@ static int _xml_xmlcharlen(const XML_Char *s) PHPAPI char *_xml_zval_strdup(zval *val) { if (Z_TYPE_P(val) == IS_STRING) { - char *buf = emalloc(Z_STRSIZE_P(val) + 1); - memcpy(buf, Z_STRVAL_P(val), Z_STRSIZE_P(val)); - buf[Z_STRSIZE_P(val)] = '\0'; + char *buf = emalloc(Z_STRLEN_P(val) + 1); + memcpy(buf, Z_STRVAL_P(val), Z_STRLEN_P(val)); + buf[Z_STRLEN_P(val)] = '\0'; return buf; } return NULL; @@ -687,7 +687,7 @@ static void _xml_add_to_info(xml_parser *parser,char *name) element = zend_hash_str_update(Z_ARRVAL(parser->info), name, strlen(name), &values); } - add_next_index_int(element, parser->curtag); + add_next_index_long(element, parser->curtag); parser->curtag++; } @@ -737,7 +737,7 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch attributes += 2; - STR_RELEASE(att); + zend_string_release(att); } xml_call_handler(parser, &parser->startElementHandler, parser->startElementPtr, 3, args, &retval); @@ -756,7 +756,7 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch add_assoc_string(&tag, "tag", tag_name->val + parser->toffset); /* cast to avoid gcc-warning */ add_assoc_string(&tag, "type", "open"); - add_assoc_int(&tag, "level", parser->level); + add_assoc_long(&tag, "level", parser->level); parser->ltags[parser->level-1] = estrdup(tag_name->val); parser->lastwasopen = 1; @@ -775,7 +775,7 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch atcnt++; attributes += 2; - STR_RELEASE(att); + zend_string_release(att); } if (atcnt) { @@ -791,7 +791,7 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch } } - STR_RELEASE(tag_name); + zend_string_release(tag_name); } } /* }}} */ @@ -827,7 +827,7 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) add_assoc_string(&tag, "tag", tag_name->val + parser->toffset); /* cast to avoid gcc-warning */ add_assoc_string(&tag, "type", "close"); - add_assoc_int(&tag, "level", parser->level); + add_assoc_long(&tag, "level", parser->level); zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } @@ -835,7 +835,7 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) parser->lastwasopen = 0; } - STR_RELEASE(tag_name); + zend_string_release(tag_name); if ((parser->ltags) && (parser->level <= XML_MAXLEVEL)) { efree(parser->ltags[parser->level-1]); @@ -887,11 +887,11 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) /* check if the current tag already has a value - if yes append to that! */ if ((myval = zend_hash_str_find(Z_ARRVAL_P(parser->ctag), "value", sizeof("value") - 1))) { - int newlen = Z_STRSIZE_P(myval) + decoded_value->len; - Z_STR_P(myval) = STR_REALLOC(Z_STR_P(myval), newlen, 0); - strncpy(Z_STRVAL_P(myval) + Z_STRSIZE_P(myval) - decoded_value->len, + int newlen = Z_STRLEN_P(myval) + decoded_value->len; + Z_STR_P(myval) = zend_string_realloc(Z_STR_P(myval), newlen, 0); + strncpy(Z_STRVAL_P(myval) + Z_STRLEN_P(myval) - decoded_value->len, decoded_value->val, decoded_value->len + 1); - STR_RELEASE(decoded_value); + zend_string_release(decoded_value); } else { add_assoc_str(parser->ctag, "value", decoded_value); } @@ -904,11 +904,11 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) if ((mytype = zend_hash_str_find(Z_ARRVAL_P(curtag),"type", sizeof("type") - 1))) { if (!strcmp(Z_STRVAL_P(mytype), "cdata")) { if ((myval = zend_hash_str_find(Z_ARRVAL_P(curtag), "value", sizeof("value") - 1))) { - int newlen = Z_STRSIZE_P(myval) + decoded_value->len; - Z_STR_P(myval) = STR_REALLOC(Z_STR_P(myval), newlen, 0); - strncpy(Z_STRVAL_P(myval) + Z_STRSIZE_P(myval) - decoded_value->len, + int newlen = Z_STRLEN_P(myval) + decoded_value->len; + Z_STR_P(myval) = zend_string_realloc(Z_STR_P(myval), newlen, 0); + strncpy(Z_STRVAL_P(myval) + Z_STRLEN_P(myval) - decoded_value->len, decoded_value->val, decoded_value->len + 1); - STR_RELEASE(decoded_value); + zend_string_release(decoded_value); return; } } @@ -924,7 +924,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) add_assoc_string(&tag, "tag", parser->ltags[parser->level-1] + parser->toffset); add_assoc_str(&tag, "value", decoded_value); add_assoc_string(&tag, "type", "cdata"); - add_assoc_int(&tag, "level", parser->level); + add_assoc_long(&tag, "level", parser->level); zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } else if (parser->level == (XML_MAXLEVEL + 1)) { @@ -933,7 +933,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) } } } else { - STR_RELEASE(decoded_value); + zend_string_release(decoded_value); } } } @@ -1042,7 +1042,7 @@ int _xml_externalEntityRefHandler(XML_Parser parserPtr, xml_call_handler(parser, &parser->externalEntityRefHandler, parser->externalEntityRefPtr, 5, args, &retval); if (!Z_ISUNDEF(retval)) { convert_to_int(&retval); - ret = Z_IVAL(retval); + ret = Z_LVAL(retval); } else { ret = 0; } @@ -1366,9 +1366,9 @@ PHP_FUNCTION(xml_parse) zval *pind; char *data; int data_len, ret; - php_int_t isFinal = 0; + zend_long isFinal = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|i", &pind, &data, &data_len, &isFinal) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &pind, &data, &data_len, &isFinal) == FAILURE) { return; } ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); @@ -1376,7 +1376,7 @@ PHP_FUNCTION(xml_parse) parser->isparsing = 1; ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, isFinal); parser->isparsing = 0; - RETVAL_INT(ret); + RETVAL_LONG(ret); } /* }}} */ @@ -1422,7 +1422,7 @@ PHP_FUNCTION(xml_parse_into_struct) ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, 1); parser->isparsing = 0; - RETVAL_INT(ret); + RETVAL_LONG(ret); } /* }}} */ @@ -1439,7 +1439,7 @@ PHP_FUNCTION(xml_get_error_code) ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); - RETURN_INT((long)XML_GetErrorCode(parser->parser)); + RETURN_LONG((long)XML_GetErrorCode(parser->parser)); } /* }}} */ @@ -1447,10 +1447,10 @@ PHP_FUNCTION(xml_get_error_code) Get XML parser error string */ PHP_FUNCTION(xml_error_string) { - php_int_t code; + zend_long code; char *str; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &code) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code) == FAILURE) { return; } @@ -1474,7 +1474,7 @@ PHP_FUNCTION(xml_get_current_line_number) ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); - RETVAL_INT(XML_GetCurrentLineNumber(parser->parser)); + RETVAL_LONG(XML_GetCurrentLineNumber(parser->parser)); } /* }}} */ @@ -1491,7 +1491,7 @@ PHP_FUNCTION(xml_get_current_column_number) ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); - RETVAL_INT(XML_GetCurrentColumnNumber(parser->parser)); + RETVAL_LONG(XML_GetCurrentColumnNumber(parser->parser)); } /* }}} */ @@ -1508,7 +1508,7 @@ PHP_FUNCTION(xml_get_current_byte_index) ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); - RETVAL_INT(XML_GetCurrentByteIndex(parser->parser)); + RETVAL_LONG(XML_GetCurrentByteIndex(parser->parser)); } /* }}} */ @@ -1544,9 +1544,9 @@ PHP_FUNCTION(xml_parser_set_option) { xml_parser *parser; zval *pind, *val; - php_int_t opt; + zend_long opt; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "riz", &pind, &opt, &val) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &pind, &opt, &val) == FAILURE) { return; } @@ -1555,15 +1555,15 @@ PHP_FUNCTION(xml_parser_set_option) switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: convert_to_int_ex(val); - parser->case_folding = Z_IVAL_P(val); + parser->case_folding = Z_LVAL_P(val); break; case PHP_XML_OPTION_SKIP_TAGSTART: convert_to_int_ex(val); - parser->toffset = Z_IVAL_P(val); + parser->toffset = Z_LVAL_P(val); break; case PHP_XML_OPTION_SKIP_WHITE: convert_to_int_ex(val); - parser->skipwhite = Z_IVAL_P(val); + parser->skipwhite = Z_LVAL_P(val); break; case PHP_XML_OPTION_TARGET_ENCODING: { xml_encoding *enc; @@ -1591,16 +1591,16 @@ PHP_FUNCTION(xml_parser_get_option) { xml_parser *parser; zval *pind; - php_int_t opt; + zend_long opt; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &pind, &opt) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &pind, &opt) == FAILURE) { return; } ZEND_FETCH_RESOURCE(parser, xml_parser *, pind, -1, "XML Parser", le_xml_parser); switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: - RETURN_INT(parser->case_folding); + RETURN_LONG(parser->case_folding); break; case PHP_XML_OPTION_TARGET_ENCODING: RETURN_STRING((char *)parser->target_encoding); -- cgit v1.2.1 From af59e92b24c8f624672720d47ef65bd8457728b9 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 21:51:49 +0200 Subject: master renames phase 7 --- ext/xml/xml.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index a2bcb105f9..6581d4c585 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1041,7 +1041,7 @@ int _xml_externalEntityRefHandler(XML_Parser parserPtr, _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); xml_call_handler(parser, &parser->externalEntityRefHandler, parser->externalEntityRefPtr, 5, args, &retval); if (!Z_ISUNDEF(retval)) { - convert_to_int(&retval); + convert_to_long(&retval); ret = Z_LVAL(retval); } else { ret = 0; @@ -1554,15 +1554,15 @@ PHP_FUNCTION(xml_parser_set_option) switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: - convert_to_int_ex(val); + convert_to_long_ex(val); parser->case_folding = Z_LVAL_P(val); break; case PHP_XML_OPTION_SKIP_TAGSTART: - convert_to_int_ex(val); + convert_to_long_ex(val); parser->toffset = Z_LVAL_P(val); break; case PHP_XML_OPTION_SKIP_WHITE: - convert_to_int_ex(val); + convert_to_long_ex(val); parser->skipwhite = Z_LVAL_P(val); break; case PHP_XML_OPTION_TARGET_ENCODING: { -- cgit v1.2.1 From 202e8db1dc8e1203039327d81ce6fd82c1c2d909 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 26 Aug 2014 11:23:25 +0200 Subject: fixed several long vs zend_long casts --- ext/xml/xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 6581d4c585..5dea203bca 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1439,7 +1439,7 @@ PHP_FUNCTION(xml_get_error_code) ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); - RETURN_LONG((long)XML_GetErrorCode(parser->parser)); + RETURN_LONG((zend_long)XML_GetErrorCode(parser->parser)); } /* }}} */ -- cgit v1.2.1 From 3234480827b27ff5d3469a732167afd289632a96 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 27 Aug 2014 15:31:48 +0200 Subject: first show to make 's' work with size_t --- ext/xml/xml.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 5dea203bca..1a2859c887 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1365,7 +1365,7 @@ PHP_FUNCTION(xml_parse) xml_parser *parser; zval *pind; char *data; - int data_len, ret; + size_t data_len, ret; zend_long isFinal = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &pind, &data, &data_len, &isFinal) == FAILURE) { @@ -1389,7 +1389,7 @@ PHP_FUNCTION(xml_parse_into_struct) xml_parser *parser; zval *pind, *xdata, *info = NULL; char *data; - int data_len, ret; + size_t data_len, ret; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz/|z/", &pind, &data, &data_len, &xdata, &info) == FAILURE) { return; @@ -1620,7 +1620,7 @@ PHP_FUNCTION(xml_parser_get_option) PHP_FUNCTION(utf8_encode) { char *arg; - int arg_len; + size_t arg_len; zend_string *encoded; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { @@ -1640,7 +1640,7 @@ PHP_FUNCTION(utf8_encode) PHP_FUNCTION(utf8_decode) { char *arg; - int arg_len; + size_t arg_len; zend_string *decoded; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { -- cgit v1.2.1 From 6db8d4f829553f61822a794f94c55270e5478a13 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 27 Aug 2014 19:25:28 +0200 Subject: 's' works with size_t round 3 --- ext/xml/xml.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 1a2859c887..2ad53e77e9 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1092,10 +1092,10 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp int auto_detect = 0; char *encoding_param = NULL; - int encoding_param_len = 0; + size_t encoding_param_len = 0; char *ns_param = NULL; - int ns_param_len = 0; + size_t ns_param_len = 0; XML_Char *encoding; @@ -1365,7 +1365,8 @@ PHP_FUNCTION(xml_parse) xml_parser *parser; zval *pind; char *data; - size_t data_len, ret; + size_t data_len; + int ret; zend_long isFinal = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &pind, &data, &data_len, &isFinal) == FAILURE) { @@ -1389,7 +1390,8 @@ PHP_FUNCTION(xml_parse_into_struct) xml_parser *parser; zval *pind, *xdata, *info = NULL; char *data; - size_t data_len, ret; + size_t data_len; + int ret; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz/|z/", &pind, &data, &data_len, &xdata, &info) == FAILURE) { return; -- cgit v1.2.1 From a7482fd2bf340e03b5c5c5ac4f94aacdabccb1ce Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 14 Sep 2014 21:38:46 +0200 Subject: make xml_utf8_ encode/decode work with size_t --- ext/xml/xml.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 2ad53e77e9..ee2d7dad5e 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -554,9 +554,9 @@ static xml_encoding *xml_get_encoding(const XML_Char *name) /* }}} */ /* {{{ xml_utf8_encode() */ -PHPAPI zend_string *xml_utf8_encode(const char *s, int len, const XML_Char *encoding) +PHPAPI zend_string *xml_utf8_encode(const char *s, size_t len, const XML_Char *encoding) { - int pos = len; + size_t pos = len; zend_string *str; unsigned int c; unsigned short (*encoder)(unsigned char) = NULL; @@ -605,7 +605,7 @@ PHPAPI zend_string *xml_utf8_encode(const char *s, int len, const XML_Char *enco /* }}} */ /* {{{ xml_utf8_decode() */ -PHPAPI zend_string *xml_utf8_decode(const XML_Char *s, int len, const XML_Char *encoding) +PHPAPI zend_string *xml_utf8_decode(const XML_Char *s, size_t len, const XML_Char *encoding) { size_t pos = 0; unsigned int c; @@ -627,7 +627,7 @@ PHPAPI zend_string *xml_utf8_decode(const XML_Char *s, int len, const XML_Char * str = zend_string_alloc(len, 0); str->len = 0; - while (pos < (size_t)len) { + while (pos < len) { int status = FAILURE; c = php_next_utf8_char((const unsigned char*)s, (size_t) len, &pos, &status); -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/xml/xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index ee2d7dad5e..f1a3442b6d 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1