diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | error.c | 2 | ||||
| -rw-r--r-- | include/libxml/xmlreader.h | 43 | ||||
| -rw-r--r-- | xmlreader.c | 9 |
4 files changed, 54 insertions, 10 deletions
@@ -1,3 +1,13 @@ +Tue Apr 20 11:42:50 CEST 2004 Daniel Veillard <daniel@veillard.com> + + * error.c: Johnson Cameron pointed out that + initGenericErrorDefaultFunc() was really wrong. + * xmlreader.c include/libxml/xmlreader.h: xmlTextReaderMode enum + must be made public, added some missing comments on the XMLReader + header. + * c14n.c: Alexsey fixed C14N bug with processing namespaces + from attributes + Mon Apr 19 23:27:46 CEST 2004 Daniel Veillard <daniel@veillard.com> * xpath.c: fixed a stupid () error + Mark name. @@ -87,7 +87,7 @@ initGenericErrorDefaultFunc(xmlGenericErrorFunc * handler) if (handler == NULL) xmlGenericError = xmlGenericErrorDefaultFunc; else - (*handler) = xmlGenericErrorDefaultFunc; + xmlGenericError = (*handler); } /** diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h index 4e452014..de130419 100644 --- a/include/libxml/xmlreader.h +++ b/include/libxml/xmlreader.h @@ -21,6 +21,27 @@ extern "C" { #endif +/** + * xmlTextReaderMode: + * + * Internal state values for the reader. + */ +typedef enum { + XML_TEXTREADER_MODE_INITIAL = 0, + XML_TEXTREADER_MODE_INTERACTIVE = 1, + XML_TEXTREADER_MODE_ERROR = 2, + XML_TEXTREADER_MODE_EOF =3, + XML_TEXTREADER_MODE_CLOSED = 4, + XML_TEXTREADER_MODE_READING = 5 +} xmlTextReaderMode; + +/** + * xmlParserProperties: + * + * Some common options to use with xmlTextReaderSetParserProp, but it + * is better to use xmlParserOption and the xmlReaderNewxxx and + * xmlReaderForxxx APIs now. + */ typedef enum { XML_PARSER_LOADDTD = 1, XML_PARSER_DEFAULTATTRS = 2, @@ -28,6 +49,12 @@ typedef enum { XML_PARSER_SUBST_ENTITIES = 4 } xmlParserProperties; +/** + * xmlParserSeverities: + * + * How severe an error callback is when the per-reader error callback API + * is used. + */ typedef enum { XML_PARSER_SEVERITY_VALIDITY_WARNING = 1, XML_PARSER_SEVERITY_VALIDITY_ERROR = 2, @@ -35,6 +62,11 @@ typedef enum { XML_PARSER_SEVERITY_ERROR = 4 } xmlParserSeverities; +/** + * xmlReaderTypes: + * + * Predefined constants for the different types of nodes. + */ typedef enum { XML_READER_TYPE_NONE = 0, XML_READER_TYPE_ELEMENT = 1, @@ -56,7 +88,18 @@ typedef enum { XML_READER_TYPE_XML_DECLARATION = 17 } xmlReaderTypes; +/** + * xmlTextReader: + * + * Structure for an xmlReader context. + */ typedef struct _xmlTextReader xmlTextReader; + +/** + * xmlTextReaderPtr: + * + * Pointer to an xmlReader context. + */ typedef xmlTextReader *xmlTextReaderPtr; /* diff --git a/xmlreader.c b/xmlreader.c index 41083adb..f1757593 100644 --- a/xmlreader.c +++ b/xmlreader.c @@ -74,15 +74,6 @@ #define XML_TEXTREADER_CTXT 2 typedef enum { - XML_TEXTREADER_MODE_INITIAL = 0, - XML_TEXTREADER_MODE_INTERACTIVE = 1, - XML_TEXTREADER_MODE_ERROR = 2, - XML_TEXTREADER_MODE_EOF =3, - XML_TEXTREADER_MODE_CLOSED = 4, - XML_TEXTREADER_MODE_READING = 5 -} xmlTextReaderMode; - -typedef enum { XML_TEXTREADER_NONE = -1, XML_TEXTREADER_START= 0, XML_TEXTREADER_ELEMENT= 1, |