1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00

excluded content string check for XML_ELEMENT_DECL in

* debugXML.c: excluded content string check for XML_ELEMENT_DECL
  in xmlCtxtGenericNodeCheck
* runtest.c: changed "open" calls to include O_BINARY for Windows
This commit is contained in:
William M. Brack
2005-07-06 17:39:14 +00:00
parent abac41e829
commit 0357a308b8
3 changed files with 4218 additions and 4206 deletions

View File

@ -1,3 +1,9 @@
Wed Jul 6 10:38:02 PDT 2005 William Brack <wbrack@mmm.com.hk>
* debugXML.c: excluded content string check for XML_ELEMENT_DECL
in xmlCtxtGenericNodeCheck
* runtest.c: changed "open" calls to include O_BINARY for Windows
Wed Jul 6 17:14:03 CEST 2005 Daniel Veillard <daniel@veillard.com>
* parser.c: fixing bug #166777 (and #169838), it was an heuristic

View File

@ -347,6 +347,7 @@ xmlCtxtGenericNodeCheck(xmlDebugCtxtPtr ctxt, xmlNodePtr node) {
(node->type != XML_ELEMENT_DECL) &&
(node->type != XML_ATTRIBUTE_DECL) &&
(node->type != XML_DTD_NODE) &&
(node->type != XML_ELEMENT_DECL) &&
(node->type != XML_HTML_DOCUMENT_NODE) &&
(node->type != XML_DOCUMENT_NODE)) {
if (node->content != NULL)

View File

@ -593,10 +593,10 @@ static int compareFiles(const char *r1, const char *r2) {
char bytes1[4096];
char bytes2[4096];
fd1 = open(r1, O_RDONLY);
fd1 = open(r1, O_RDONLY | O_BINARY);
if (fd1 < 0)
return(-1);
fd2 = open(r2, O_RDONLY);
fd2 = open(r2, O_RDONLY | O_BINARY);
if (fd2 < 0) {
close(fd1);
return(-1);
@ -633,7 +633,7 @@ static int compareFileMem(const char *filename, const char *mem, int size) {
return(-1);
if (info.st_size != size)
return(-1);
fd = open(filename, O_RDONLY);
fd = open(filename, O_RDONLY | O_BINARY);
if (fd < 0)
return(-1);
while (idx < size) {
@ -643,6 +643,11 @@ static int compareFileMem(const char *filename, const char *mem, int size) {
if (res + idx > size)
break;
if (memcmp(bytes, &mem[idx], res) != 0) {
int ix;
for (ix=0; ix<res; ix++)
if (bytes[ix] != mem[idx+ix])
break;
fprintf(stderr,"Compare error at position %d\n", idx+ix);
close(fd);
return(1);
}
@ -662,7 +667,7 @@ static int loadMem(const char *filename, const char **mem, int *size) {
base = malloc(info.st_size + 1);
if (base == NULL)
return(-1);
if ((fd = open(filename, O_RDONLY)) < 0) {
if ((fd = open(filename, O_RDONLY | O_BINARY)) < 0) {
free(base);
return(-1);
}