diff options
author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
---|---|---|
committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/xml/compat.c | |
parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/xml/compat.c')
-rw-r--r-- | ext/xml/compat.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/ext/xml/compat.c b/ext/xml/compat.c index 41f5d42012..81f5cb9667 100644 --- a/ext/xml/compat.c +++ b/ext/xml/compat.c @@ -198,15 +198,6 @@ _start_element_handler_ns(void *user, const xmlChar *name, const xmlChar *prefix } static void -_namespace_handler(XML_Parser parser, xmlNsPtr nsptr) -{ - if (nsptr != NULL) { - _namespace_handler(parser, nsptr->next); - parser->h_end_ns(parser->user, nsptr->prefix); - } -} - -static void _end_element_handler(void *user, const xmlChar *name) { xmlChar *qualified_name; @@ -368,7 +359,7 @@ _external_entity_ref_handler(void *user, const xmlChar *names, int type, const x return; } - parser->h_external_entity_ref(parser, names, "", sys_id, pub_id); + parser->h_external_entity_ref(parser, names, (XML_Char *) "", sys_id, pub_id); } static xmlEntityPtr @@ -602,7 +593,7 @@ has been defined and none can be detected */ } #endif - error = xmlParseChunk(parser->parser, data, data_len, is_final); + error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final); if (!error) { return 1; } else if (parser->parser->lastError.level > XML_ERR_WARNING ){ @@ -728,7 +719,7 @@ PHPAPI const XML_Char * XML_ErrorString(int code) { if (code < 0 || code >= (int)(sizeof(error_mapping) / sizeof(error_mapping[0]))) { - return "Unknown"; + return (const XML_Char *) "Unknown"; } return error_mapping[code]; } @@ -763,7 +754,7 @@ XML_GetCurrentByteCount(XML_Parser parser) PHPAPI const XML_Char *XML_ExpatVersion(void) { - return "1.0"; + return (const XML_Char *) "1.0"; } PHPAPI void |