cvs: php4 /ext/xml compat.c expat_compat.h

sterling Wed May 21 23:29:05 2003 EDT Modified files: /php4/ext/xml compat.c expat_compat.h Log: rename namespace to use_namespace to avoid a c++ keyword conflict fix whitespace surrounding the enums, use tabs please :) Index: php4/ext/xml/compat.c diff -u php4/ext/xml/compat.c:1.10 php4/ext/xml/compat.c:1.11 --- php4/ext/xml/compat.c:1.10 Mon May 19 17:53:33 2003 +++ php4/ext/xml/compat.c Wed May 21 23:29:05 2003 @@ -90,7 +90,7 @@ return; } - if (parser->namespace) { + if (parser->use_namespace) { _find_namespace_decl(parser, name, attributes); _qualify_namespace(parser, name, &qualified_name); } else { @@ -112,7 +112,7 @@ return; } - if (parser->namespace) { + if (parser->use_namespace) { xmlChar *nsname; nsname = xmlHashLookup(parser->_reverse_ns_map, name); @@ -323,7 +323,7 @@ parser = (XML_Parser) memsuite->malloc_fcn(sizeof(struct _XML_Parser)); memset(parser, 0, sizeof(struct _XML_Parser)); - parser->namespace = 0; + parser->use_namespace = 0; parser->mem_hdlrs = *memsuite; parser->parser = xmlCreatePushParserCtxt((xmlSAXHandlerPtr) &php_xml_compat_handlers, (void *) parser, NULL, 0, NULL); if (parser->parser == NULL) { @@ -335,7 +335,7 @@ parser->parser->charset = XML_CHAR_ENCODING_NONE; } if (sep != NULL) { - parser->namespace = 1; + parser->use_namespace = 1; parser->_ns_map = xmlHashCreate(10); parser->_reverse_ns_map = xmlHashCreate(10); } @@ -567,7 +567,7 @@ void XML_ParserFree(XML_Parser parser) { - if (parser->namespace) { + if (parser->use_namespace) { xmlHashFree(parser->_ns_map, _free_ns_name); xmlHashFree(parser->_reverse_ns_map, _free_ns_name); } Index: php4/ext/xml/expat_compat.h diff -u php4/ext/xml/expat_compat.h:1.6 php4/ext/xml/expat_compat.h:1.7 --- php4/ext/xml/expat_compat.h:1.6 Sat May 17 18:09:58 2003 +++ php4/ext/xml/expat_compat.h Wed May 21 23:29:05 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: expat_compat.h,v 1.6 2003/05/17 22:09:58 sterling Exp $ */ +/* $Id: expat_compat.h,v 1.7 2003/05/22 03:29:05 sterling Exp $ */ #ifndef PHP_EXPAT_COMPAT_H #define PHP_EXPAT_COMPAT_H @@ -50,7 +50,7 @@ } XML_Memory_Handling_Suite; typedef struct _XML_Parser { - int namespace; + int use_namespace; xmlHashTablePtr _ns_map; xmlHashTablePtr _reverse_ns_map; @@ -74,42 +74,42 @@ } *XML_Parser; enum XML_Error { - XML_ERROR_NONE, - XML_ERROR_NO_MEMORY, - XML_ERROR_SYNTAX, - XML_ERROR_NO_ELEMENTS, - XML_ERROR_INVALID_TOKEN, - XML_ERROR_UNCLOSED_TOKEN, - XML_ERROR_PARTIAL_CHAR, - XML_ERROR_TAG_MISMATCH, - XML_ERROR_DUPLICATE_ATTRIBUTE, - XML_ERROR_JUNK_AFTER_DOC_ELEMENT, - XML_ERROR_PARAM_ENTITY_REF, - XML_ERROR_UNDEFINED_ENTITY, - XML_ERROR_RECURSIVE_ENTITY_REF, - XML_ERROR_ASYNC_ENTITY, - XML_ERROR_BAD_CHAR_REF, - XML_ERROR_BINARY_ENTITY_REF, - XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, - XML_ERROR_MISPLACED_XML_PI, - XML_ERROR_UNKNOWN_ENCODING, - XML_ERROR_INCORRECT_ENCODING, - XML_ERROR_UNCLOSED_CDATA_SECTION, - XML_ERROR_EXTERNAL_ENTITY_HANDLING, - XML_ERROR_NOT_STANDALONE, - XML_ERROR_UNEXPECTED_STATE, - XML_ERROR_ENTITY_DECLARED_IN_PE, - XML_ERROR_FEATURE_REQUIRES_XML_DTD, - XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING + XML_ERROR_NONE, + XML_ERROR_NO_MEMORY, + XML_ERROR_SYNTAX, + XML_ERROR_NO_ELEMENTS, + XML_ERROR_INVALID_TOKEN, + XML_ERROR_UNCLOSED_TOKEN, + XML_ERROR_PARTIAL_CHAR, + XML_ERROR_TAG_MISMATCH, + XML_ERROR_DUPLICATE_ATTRIBUTE, + XML_ERROR_JUNK_AFTER_DOC_ELEMENT, + XML_ERROR_PARAM_ENTITY_REF, + XML_ERROR_UNDEFINED_ENTITY, + XML_ERROR_RECURSIVE_ENTITY_REF, + XML_ERROR_ASYNC_ENTITY, + XML_ERROR_BAD_CHAR_REF, + XML_ERROR_BINARY_ENTITY_REF, + XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, + XML_ERROR_MISPLACED_XML_PI, + XML_ERROR_UNKNOWN_ENCODING, + XML_ERROR_INCORRECT_ENCODING, + XML_ERROR_UNCLOSED_CDATA_SECTION, + XML_ERROR_EXTERNAL_ENTITY_HANDLING, + XML_ERROR_NOT_STANDALONE, + XML_ERROR_UNEXPECTED_STATE, + XML_ERROR_ENTITY_DECLARED_IN_PE, + XML_ERROR_FEATURE_REQUIRES_XML_DTD, + XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING }; enum XML_Content_Type { - XML_CTYPE_EMPTY = 1, - XML_CTYPE_ANY, - XML_CTYPE_MIXED, - XML_CTYPE_NAME, - XML_CTYPE_CHOICE, - XML_CTYPE_SEQ + XML_CTYPE_EMPTY = 1, + XML_CTYPE_ANY, + XML_CTYPE_MIXED, + XML_CTYPE_NAME, + XML_CTYPE_CHOICE, + XML_CTYPE_SEQ }; XML_Parser XML_ParserCreate(const XML_Char *);