Permalink
Browse files

- xpath.c: trying to get 52979 solved

- tree.c result/ result/noent/: trying to get 52712 solved, this
  also made me clean up the fact that XML output in general should
  not add formating blanks by default, this changed the output of
  a few tests
Daniel
  • Loading branch information...
1 parent 73639a7 commit 1731d6ae0a5258e8e07f780c74694c2dde093383 Daniel Veillard committed Apr 10, 2001
Showing with 34 additions and 67 deletions.
  1. +8 −0 ChangeLog
  2. +1 −5 result/dtd10
  3. +1 −5 result/dtd6
  4. +1 −4 result/dtd7
  5. +1 −4 result/dtd8
  6. +1 −4 result/dtd9
  7. +1 −3 result/ent7
  8. +1 −5 result/noent/dtd10
  9. +1 −5 result/noent/dtd6
  10. +1 −4 result/noent/dtd7
  11. +1 −4 result/noent/dtd8
  12. +1 −4 result/noent/dtd9
  13. +2 −0 result/noent/ent2
  14. +1 −3 result/noent/ent7
  15. +2 −4 result/noent/xml1
  16. +7 −7 tree.c
  17. +3 −6 xpath.c
View
@@ -1,3 +1,11 @@
+Tue Apr 10 18:13:10 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+ * xpath.c: trying to get 52979 solved
+ * tree.c result/ result/noent/: trying to get 52712 solved, this
+ also made me clean up the fact that XML output in general should
+ not add formating blanks by default, this changed the output of
+ a few tests
+
Tue Apr 10 16:30:20 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* xpath.c: Bill Brack pointer an error in detecting a null nodeset
View
@@ -6,8 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<c> is a</c>
-<d> valid document</d>
-</doc>
+<doc><b>This</b><c> is a</c><d> valid document</d></doc>
View
@@ -4,8 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
-<a>This</a>
-<b> is a valid</b>
-<a> document</a>
-</doc>
+<doc><a>This</a><b> is a valid</b><a> document</a></doc>
View
@@ -4,7 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
-<a>This</a>
-<b> is a valid document</b>
-</doc>
+<doc><a>This</a><b> is a valid document</b></doc>
View
@@ -6,7 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<c> is a valid document</c>
-</doc>
+<doc><b>This</b><c> is a valid document</c></doc>
View
@@ -6,7 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<d> is a valid document</d>
-</doc>
+<doc><b>This</b><d> is a valid document</d></doc>
View
@@ -5,6 +5,4 @@
<!ELEMENT item (para)+>
<!ELEMENT para (#PCDATA)>
]>
-<item>
-<para>'they called me &sampleEnt;'</para>
-</item>
+<item><para>'they called me &sampleEnt;'</para></item>
View
@@ -6,8 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<c> is a</c>
-<d> valid document</d>
-</doc>
+<doc><b>This</b><c> is a</c><d> valid document</d></doc>
View
@@ -4,8 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
-<a>This</a>
-<b> is a valid</b>
-<a> document</a>
-</doc>
+<doc><a>This</a><b> is a valid</b><a> document</a></doc>
View
@@ -4,7 +4,4 @@
<!ELEMENT a (#PCDATA)>
<!ELEMENT b (#PCDATA)>
]>
-<doc>
-<a>This</a>
-<b> is a valid document</b>
-</doc>
+<doc><a>This</a><b> is a valid document</b></doc>
View
@@ -6,7 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<c> is a valid document</c>
-</doc>
+<doc><b>This</b><c> is a valid document</c></doc>
View
@@ -6,7 +6,4 @@
<!ELEMENT c (#PCDATA)>
<!ELEMENT d (#PCDATA)>
]>
-<doc>
-<b>This</b>
-<d> is a valid document</d>
-</doc>
+<doc><b>This</b><d> is a valid document</d></doc>
View
@@ -6,5 +6,7 @@
]>
<EXAMPLE>
+<title>my title</title>
+
This text is about XML, the Extensible Markup Language and this is an embedded <IMG src="image"/>
</EXAMPLE>
View
@@ -5,6 +5,4 @@
<!ELEMENT item (para)+>
<!ELEMENT para (#PCDATA)>
]>
-<item>
-<para>'they called me the hyacinth girl'</para>
-</item>
+<item><para>'they called me the hyacinth girl'</para></item>
View
@@ -4,8 +4,6 @@
numerically (&#38;#38;#38;) or with a general entity
(&amp;amp;).</p>">
]>
-<test>
-<p>An ampersand (&amp;) may be escaped
+<test><p>An ampersand (&amp;) may be escaped
numerically (&amp;#38;) or with a general entity
- (&amp;amp;).</p>
-</test>
+ (&amp;amp;).</p></test>
View
14 tree.c
@@ -5779,7 +5779,7 @@ xmlDocContentDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr cur,
void
xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr,
int * doc_txt_len, const char * txt_encoding,
- int format ATTRIBUTE_UNUSED) {
+ int format) {
int dummy = 0;
xmlCharEncoding doc_charset;
@@ -5842,7 +5842,7 @@ xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr,
return;
}
- xmlDocContentDumpOutput(out_buff, out_doc, txt_encoding, 1);
+ xmlDocContentDumpOutput(out_buff, out_doc, txt_encoding, format);
xmlOutputBufferFlush(out_buff);
if (out_buff->conv != NULL) {
*doc_txt_len = out_buff->conv->use;
@@ -5909,7 +5909,7 @@ void
xmlDocDumpMemoryEnc(xmlDocPtr out_doc, xmlChar **doc_txt_ptr,
int * doc_txt_len, const char * txt_encoding) {
xmlDocDumpFormatMemoryEnc(out_doc, doc_txt_ptr, doc_txt_len,
- txt_encoding, 1);
+ txt_encoding, 0);
}
/**
@@ -6011,7 +6011,7 @@ xmlDocDump(FILE *f, xmlDocPtr cur) {
}
buf = xmlOutputBufferCreateFile(f, handler);
if (buf == NULL) return(-1);
- xmlDocContentDumpOutput(buf, cur, NULL, 1);
+ xmlDocContentDumpOutput(buf, cur, NULL, 0);
ret = xmlOutputBufferClose(buf);
return(ret);
@@ -6032,7 +6032,7 @@ xmlSaveFileTo(xmlOutputBuffer *buf, xmlDocPtr cur, const char *encoding) {
int ret;
if (buf == NULL) return(0);
- xmlDocContentDumpOutput(buf, cur, encoding, 1);
+ xmlDocContentDumpOutput(buf, cur, encoding, 0);
ret = xmlOutputBufferClose(buf);
return(ret);
}
@@ -6076,7 +6076,7 @@ xmlSaveFileEnc(const char *filename, xmlDocPtr cur, const char *encoding) {
buf = xmlOutputBufferCreateFilename(filename, handler, 0);
if (buf == NULL) return(-1);
- xmlDocContentDumpOutput(buf, cur, encoding, 1);
+ xmlDocContentDumpOutput(buf, cur, encoding, 0);
ret = xmlOutputBufferClose(buf);
return(ret);
@@ -6131,7 +6131,7 @@ xmlSaveFile(const char *filename, xmlDocPtr cur) {
buf = xmlOutputBufferCreateFilename(filename, handler, cur->compression);
if (buf == NULL) return(-1);
- xmlDocContentDumpOutput(buf, cur, NULL, 1);
+ xmlDocContentDumpOutput(buf, cur, NULL, 0);
ret = xmlOutputBufferClose(buf);
return(ret);
View
@@ -164,14 +164,11 @@ xmlXPathInit(void) {
if (initialized) return;
- xmlXPathNAN = 0;
- xmlXPathNAN /= 0;
+ xmlXPathNAN = 0.0 / 0.0;
- xmlXPathPINF = 1;
- xmlXPathPINF /= 0;
+ xmlXPathPINF = 1 / 0.0;
- xmlXPathNINF = -1;
- xmlXPathNINF /= 0;
+ xmlXPathNINF = -1 / 0.0;
initialized = 1;
}

0 comments on commit 1731d6a

Please sign in to comment.