fixed bug #129489, propagation of parsing flags in entities. improved the
* parser.c: fixed bug #129489, propagation of parsing flags
in entities.
* parser.c xmlreader.c: improved the comments of parsing options
Daniel
diff --git a/xmlreader.c b/xmlreader.c
index bfcc053..fa2ed32 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -4019,7 +4019,7 @@
* @reader: an XML reader
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
* @reuse: keep the context for reuse
*
* Setup an XML reader with new options
@@ -4253,10 +4253,10 @@
* @cur: a pointer to a zero terminated string
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Create an xmltextReader for an XML in-memory document.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
*
* Returns the new reader or NULL in case of error.
*/
@@ -4278,10 +4278,10 @@
* xmlReaderForFile:
* @filename: a file or URL
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML file from the filesystem or the network.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
*
* Returns the new reader or NULL in case of error.
*/
@@ -4303,10 +4303,10 @@
* @size: the size of the array
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Create an xmltextReader for an XML in-memory document.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
*
* Returns the new reader or NULL in case of error.
*/
@@ -4338,10 +4338,10 @@
* @fd: an open file descriptor
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Create an xmltextReader for an XML from a file descriptor.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
*
* Returns the new reader or NULL in case of error.
*/
@@ -4374,10 +4374,10 @@
* @ioctx: an I/O handler
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Create an xmltextReader for an XML document from I/O functions and source.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
*
* Returns the new reader or NULL in case of error.
*/
@@ -4453,10 +4453,10 @@
* @cur: a pointer to a zero terminated string
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Setup an xmltextReader to parse an XML in-memory document.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
* This reuses the existing @reader xmlTextReader.
*
* Returns 0 in case of success and -1 in case of error
@@ -4483,10 +4483,10 @@
* @reader: an XML reader
* @filename: a file or URL
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* parse an XML file from the filesystem or the network.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
* This reuses the existing @reader xmlTextReader.
*
* Returns 0 in case of success and -1 in case of error
@@ -4517,10 +4517,10 @@
* @size: the size of the array
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Setup an xmltextReader to parse an XML in-memory document.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
* This reuses the existing @reader xmlTextReader.
*
* Returns 0 in case of success and -1 in case of error
@@ -4550,10 +4550,10 @@
* @fd: an open file descriptor
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Setup an xmltextReader to parse an XML from a file descriptor.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
* This reuses the existing @reader xmlTextReader.
*
* Returns 0 in case of success and -1 in case of error
@@ -4583,11 +4583,11 @@
* @ioctx: an I/O handler
* @URL: the base URL to use for the document
* @encoding: the document encoding, or NULL
- * @options: a combination of xmlParserOption(s)
+ * @options: a combination of xmlParserOption
*
* Setup an xmltextReader to parse an XML document from I/O functions
* and source.
- * The parsing flags @options are a combination of xmlParserOption(s).
+ * The parsing flags @options are a combination of xmlParserOption.
* This reuses the existing @reader xmlTextReader.
*
* Returns 0 in case of success and -1 in case of error