diff options
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 7f1bb30571..e16f3f4bbb 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -70,7 +70,7 @@ ZEND_GET_MODULE(xml) /* }}} */ -#define SKIP_TAGSTART(str) ((str) + (parser->toffset > strlen(str) ? strlen(str) : parser->toffset)) +#define SKIP_TAGSTART(str) ((str) + (parser->toffset > (int)strlen(str) ? strlen(str) : parser->toffset)) /* {{{ function prototypes */ @@ -212,7 +212,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_get_option, 0, 0, 2) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() -const zend_function_entry xml_functions[] = { +static const zend_function_entry xml_functions[] = { PHP_FE(xml_parser_create, arginfo_xml_parser_create) PHP_FE(xml_parser_create_ns, arginfo_xml_parser_create_ns) PHP_FE(xml_set_object, arginfo_xml_set_object) @@ -270,7 +270,7 @@ zend_module_entry xml_module_entry = { /* All the encoding functions are set to NULL right now, since all * the encoding is currently done internally by expat/xmltok. */ -xml_encoding xml_encodings[] = { +const xml_encoding xml_encodings[] = { { (XML_Char *)"ISO-8859-1", xml_decode_iso_8859_1, xml_encode_iso_8859_1 }, { (XML_Char *)"US-ASCII", xml_decode_us_ascii, xml_encode_us_ascii }, { (XML_Char *)"UTF-8", NULL, NULL }, @@ -537,9 +537,9 @@ inline static char xml_decode_us_ascii(unsigned short c) /* }}} */ /* {{{ xml_get_encoding() */ -static xml_encoding *xml_get_encoding(const XML_Char *name) +static const xml_encoding *xml_get_encoding(const XML_Char *name) { - xml_encoding *enc = &xml_encodings[0]; + const xml_encoding *enc = &xml_encodings[0]; while (enc && enc->name) { if (strcasecmp((char *)name, (char *)enc->name) == 0) { @@ -558,7 +558,7 @@ PHP_XML_API zend_string *xml_utf8_encode(const char *s, size_t len, const XML_Ch zend_string *str; unsigned int c; unsigned short (*encoder)(unsigned char) = NULL; - xml_encoding *enc = xml_get_encoding(encoding); + const xml_encoding *enc = xml_get_encoding(encoding); if (enc) { encoder = enc->encoding_function; @@ -608,7 +608,7 @@ PHP_XML_API zend_string *xml_utf8_decode(const XML_Char *s, size_t len, const XM size_t pos = 0; unsigned int c; char (*decoder)(unsigned short) = NULL; - xml_encoding *enc = xml_get_encoding(encoding); + const xml_encoding *enc = xml_get_encoding(encoding); zend_string *str; if (enc) { @@ -1589,23 +1589,20 @@ 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); + parser->case_folding = zval_get_long(val); break; case PHP_XML_OPTION_SKIP_TAGSTART: - convert_to_long_ex(val); - parser->toffset = Z_LVAL_P(val); + parser->toffset = zval_get_long(val); if (parser->toffset < 0) { php_error_docref(NULL, E_NOTICE, "tagstart ignored, because it is out of range"); parser->toffset = 0; } break; case PHP_XML_OPTION_SKIP_WHITE: - convert_to_long_ex(val); - parser->skipwhite = Z_LVAL_P(val); + parser->skipwhite = zval_get_long(val); break; case PHP_XML_OPTION_TARGET_ENCODING: { - xml_encoding *enc; + const xml_encoding *enc; convert_to_string_ex(val); enc = xml_get_encoding((XML_Char*)Z_STRVAL_P(val)); if (enc == NULL) { |