com php-src: Fix ext/xml warnings: ext/xml/compat.c

From: Date: Sat, 06 Sep 2014 10:26:41 +0000
Subject: com php-src: Fix ext/xml warnings: ext/xml/compat.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81442@lists.php.net to get a copy of this message
Commit: 17cb2443a7392f917c2a91587e8bc5151b7574ff Author: Nikita Popov <nikic@php.net> Fri, 5 Sep 2014 20:29:50 +0200 Parents: 7d0416f4018103f95c4f06daabe60769310ffa6e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=17cb2443a7392f917c2a91587e8bc5151b7574ff Log: Fix ext/xml warnings Changed paths: M ext/xml/compat.c Diff: diff --git a/ext/xml/compat.c b/ext/xml/compat.c index 41f5d42..81f5cb9 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

« previous php.cvs (#81442) next »