shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-09 04:58:16 +03:00
Code

added a parser XML_PARSE_COMPACT option to allocate small text nodes (less

Browse Source 
* HTMLparser.c parser.c SAX2.c debugXML.c tree.c valid.c xmlreader.c
  xmllint.c include/libxml/HTMLparser.h include/libxml/parser.h:
  added a parser XML_PARSE_COMPACT option to allocate small
  text nodes (less than 8 bytes on 32bits, less than 16bytes on 64bits)
  directly within the node, various changes to cope with this.
* result/XPath/tests/* result/XPath/xptr/* result/xmlid/*: this
  slightly change the output
Daniel
This commit is contained in:
Daniel Veillard 2005-08-25 13:19:21 +00:00
parent 3854c57a99
commit 8874b94cd2
27 changed files with 176 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Thu Aug 25 15:14:56 CEST 2005 Daniel Veillard <daniel@veillard.com>
* HTMLparser.c parser.c SAX2.c debugXML.c tree.c valid.c xmlreader.c
xmllint.c include/libxml/HTMLparser.h include/libxml/parser.h:
added a parser XML_PARSE_COMPACT option to allocate small
text nodes (less than 8 bytes on 32bits, less than 16bytes on 64bits)
directly within the node, various changes to cope with this.
* result/XPath/tests/* result/XPath/xptr/* result/xmlid/*: this
slightly change the output
Thu Aug 25 12:16:26 CEST 2005 Daniel Veillard <daniel@veillard.com>
* configure.in: patch from Andrew W. Nosenko, use se $GCC = 'yes'

4
HTMLparser.c
View File

@ -5820,6 +5820,10 @@ htmlCtxtUseOptions(htmlParserCtxtPtr ctxt, int options)
ctxt->recovery = 1;
} else
ctxt->recovery = 0;
if (options & HTML_PARSE_COMPACT) {
ctxt->options |= HTML_PARSE_COMPACT;
options -= HTML_PARSE_COMPACT;
}
ctxt->dictNames = 0;
return (options);
}

18
SAX2.c
View File

@ -1777,6 +1777,7 @@ xmlSAX2TextNode(xmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
xmlErrMemory(ctxt, "xmlSAX2Characters");
return(NULL);
}
memset(ret, 0, sizeof(xmlNode));
/*
* intern the formatting blanks found between tags, or the
* very short strings
@ -1784,7 +1785,14 @@ xmlSAX2TextNode(xmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
if (ctxt->dictNames) {
xmlChar cur = str[len];
if ((len <= 3) && ((cur == '"') || (cur == '\'') ||
if ((len < (int) (2 * sizeof(void *))) &&
(ctxt->options & XML_PARSE_COMPACT)) {
/* store the string in the node overrithing properties and nsDef */
xmlChar *tmp = (xmlChar *) &(ret->properties);
memcpy(tmp, str, len);
tmp[len] = 0;
intern = tmp;
} else if ((len <= 3) && ((cur == '"') || (cur == '\'') ||
((cur == '<') && (str[len + 1] != '!')))) {
intern = xmlDictLookup(ctxt->dict, str, len);
} else if (IS_BLANK_CH(*str) && (len < 60) && (cur == '<') &&
@ -1798,7 +1806,6 @@ xmlSAX2TextNode(xmlParserCtxtPtr ctxt, const xmlChar *str, int len) {
}
}
skip:
memset(ret, 0, sizeof(xmlNode));
ret->type = XML_TEXT_NODE;
ret->name = xmlStringText;
@ -2407,8 +2414,11 @@ xmlSAX2Characters(void *ctx, const xmlChar *ch, int len)
* We try to minimaze realloc() uses and avoid copying
* and recomputing length over and over.
*/
if ((ctxt->nodemem == ctxt->nodelen + 1) &&
(xmlDictOwns(ctxt->dict, lastChild->content))) {
if (lastChild->content == (xmlChar *)&(lastChild->properties)) {
lastChild->content = xmlStrdup(lastChild->content);
lastChild->properties = NULL;
} else if ((ctxt->nodemem == ctxt->nodelen + 1) &&
(xmlDictOwns(ctxt->dict, lastChild->content))) {
lastChild->content = xmlStrdup(lastChild->content);
}
if (ctxt->nodelen + len >= ctxt->nodemem) {

14
debugXML.c
View File

@ -902,9 +902,15 @@ xmlCtxtDumpOneNode(xmlDebugCtxtPtr ctxt, xmlNodePtr node)
if (!ctxt->check) {
xmlCtxtDumpSpaces(ctxt);
if (node->name == (const xmlChar *) xmlStringTextNoenc)
fprintf(ctxt->output, "TEXT no enc\n");
fprintf(ctxt->output, "TEXT no enc");
else
fprintf(ctxt->output, "TEXT\n");
fprintf(ctxt->output, "TEXT");
if (node->content == (xmlChar *) &(node->properties))
fprintf(ctxt->output, " compact\n");
else if (xmlDictOwns(ctxt->dict, node->content) == 1)
fprintf(ctxt->output, " interned\n");
else
fprintf(ctxt->output, "\n");
}
break;
case XML_CDATA_SECTION_NODE:
@ -1005,9 +1011,9 @@ xmlCtxtDumpOneNode(xmlDebugCtxtPtr ctxt, xmlNodePtr node)
fprintf(ctxt->output, "PBM: doc == NULL !!!\n");
}
ctxt->depth++;
if (node->nsDef != NULL)
if ((node->type == XML_ELEMENT_NODE) && (node->nsDef != NULL))
xmlCtxtDumpNamespaceList(ctxt, node->nsDef);
if (node->properties != NULL)
if ((node->type == XML_ELEMENT_NODE) && (node->properties != NULL))
xmlCtxtDumpAttrList(ctxt, node->properties);
if (node->type != XML_ENTITY_REF_NODE) {
if ((node->type != XML_ELEMENT_NODE) && (node->content != NULL)) {

3
include/libxml/HTMLparser.h
View File

@ -178,7 +178,8 @@ typedef enum {
HTML_PARSE_NOWARNING= 1<<6, /* suppress warning reports */
HTML_PARSE_PEDANTIC = 1<<7, /* pedantic error reporting */
HTML_PARSE_NOBLANKS = 1<<8, /* remove blank nodes */
HTML_PARSE_NONET = 1<<11 /* Forbid network access */
HTML_PARSE_NONET = 1<<11,/* Forbid network access */
HTML_PARSE_COMPACT = 1<<16 /* compact small text nodes */
} htmlParserOption;
XMLPUBFUN void XMLCALL

3
include/libxml/parser.h
View File

@ -1088,7 +1088,8 @@ typedef enum {
XML_PARSE_NODICT = 1<<12,/* Do not reuse the context dictionnary */
XML_PARSE_NSCLEAN = 1<<13,/* remove redundant namespaces declarations */
XML_PARSE_NOCDATA = 1<<14,/* merge CDATA as text nodes */
XML_PARSE_NOXINCNODE= 1<<15 /* do not generate XINCLUDE START/END nodes */
XML_PARSE_NOXINCNODE= 1<<15,/* do not generate XINCLUDE START/END nodes */
XML_PARSE_COMPACT = 1<<16 /* compact small text nodes */
} xmlParserOption;
XMLPUBFUN void XMLCALL

11
parser.c
View File

@ -684,7 +684,7 @@ xmlAddDefAttrs(xmlParserCtxtPtr ctxt,
}
/*
* plit the element name into prefix:localname , the string found
* Split the element name into prefix:localname , the string found
* are within the DTD and hen not associated to namespace names.
*/
name = xmlSplitQName3(fullattr, &len);
@ -11319,8 +11319,9 @@ xmlParseBalancedChunkMemoryInternal(xmlParserCtxtPtr oldctxt,
*lst = cur;
while (cur != NULL) {
#ifdef LIBXML_VALID_ENABLED
if (oldctxt->validate && oldctxt->wellFormed &&
oldctxt->myDoc && oldctxt->myDoc->intSubset) {
if ((oldctxt->validate) && (oldctxt->wellFormed) &&
(oldctxt->myDoc) && (oldctxt->myDoc->intSubset) &&
(cur->type == XML_ELEMENT_NODE)) {
oldctxt->valid &= xmlValidateElement(&oldctxt->vctxt,
oldctxt->myDoc, cur);
}
@ -12843,6 +12844,10 @@ xmlCtxtUseOptions(xmlParserCtxtPtr ctxt, int options)
ctxt->options |= XML_PARSE_NONET;
options -= XML_PARSE_NONET;
}
if (options & XML_PARSE_COMPACT) {
ctxt->options |= XML_PARSE_COMPACT;
options -= XML_PARSE_COMPACT;
}
ctxt->linenumbers = 1;
return (options);
}

4
result/XPath/tests/chaptersbase
View File

@ -72,10 +72,10 @@ Set contains 1 nodes:
Expression: /child::EXAMPLE/child::head/node()
Object is a Node Set :
Set contains 3 nodes:
1 TEXT
1 TEXT compact
content=
2 ELEMENT title
3 TEXT
3 TEXT compact
content=
========================

2
result/XPath/tests/idsimple
View File

@ -5,7 +5,7 @@ Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT EXAMPLE
ATTRIBUTE id
TEXT
TEXT compact
content=root
ATTRIBUTE prop1
TEXT

16
result/XPath/tests/langsimple
View File

@ -5,30 +5,30 @@ Object is a Node Set :
Set contains 9 nodes:
1 ELEMENT b
ATTRIBUTE lang
TEXT
TEXT compact
content=en
2 ELEMENT x
3 ELEMENT x
4 ELEMENT para
ATTRIBUTE lang
TEXT
TEXT compact
content=en
5 ELEMENT div
ATTRIBUTE lang
TEXT
TEXT compact
content=en
6 ELEMENT para
7 ELEMENT para
ATTRIBUTE lang
TEXT
TEXT compact
content=EN
8 ELEMENT para
ATTRIBUTE lang
TEXT
TEXT compact
content=en-us
9 ELEMENT para
ATTRIBUTE lang
TEXT
TEXT compact
content=EN-US
========================
@ -37,11 +37,11 @@ Object is a Node Set :
Set contains 2 nodes:
1 ELEMENT para
ATTRIBUTE lang
TEXT
TEXT compact
content=en-us
2 ELEMENT para
ATTRIBUTE lang
TEXT
TEXT compact
content=EN-US
========================

32
result/XPath/tests/mixedpat
View File

@ -5,7 +5,7 @@ Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=root
========================
@ -14,11 +14,11 @@ Object is a Node Set :
Set contains 2 nodes:
1 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=root
2 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=p1
========================
@ -27,11 +27,11 @@ Object is a Node Set :
Set contains 2 nodes:
1 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=root
2 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=p1
========================
@ -40,11 +40,11 @@ Object is a Node Set :
Set contains 2 nodes:
1 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=root
2 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=p1
========================
@ -53,15 +53,15 @@ Object is a Node Set :
Set contains 3 nodes:
1 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=root
2 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=p1
3 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=p2
========================
@ -70,16 +70,16 @@ Object is a Node Set :
Set contains 4 nodes:
1 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=root
2 ELEMENT p1
3 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=p1
4 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=p2
========================
@ -88,14 +88,14 @@ Object is a Node Set :
Set contains 4 nodes:
1 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=root
2 ELEMENT p1
3 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=p1
4 ELEMENT s
ATTRIBUTE p
TEXT
TEXT compact
content=p2

8
result/XPath/tests/simpleabbr
View File

@ -45,7 +45,7 @@ Object is a Node Set :
Set contains 2 nodes:
1 TEXT
content=bla bla bla ...
2 TEXT
2 TEXT compact
content=...
========================
@ -54,7 +54,7 @@ Object is a Node Set :
Set contains 2 nodes:
1 TEXT
content=bla bla bla ...
2 TEXT
2 TEXT compact
content=...
========================
@ -63,7 +63,7 @@ Object is a Node Set :
Set contains 2 nodes:
1 TEXT
content=bla bla bla ...
2 TEXT
2 TEXT compact
content=...
========================
@ -77,5 +77,5 @@ Set contains 1 nodes:
Expression: (//p/text())[position()=last()]
Object is a Node Set :
Set contains 1 nodes:
1 TEXT
1 TEXT compact
content=...

4
result/XPath/tests/simplebase
View File

@ -53,10 +53,10 @@ Set contains 1 nodes:
Expression: /child::EXAMPLE/child::head/node()
Object is a Node Set :
Set contains 3 nodes:
1 TEXT
1 TEXT compact
content=
2 ELEMENT title
3 TEXT
3 TEXT compact
content=
========================

4
result/XPath/tests/usr1check
View File

@ -5,8 +5,8 @@ Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT ITEM
ATTRIBUTE monto
TEXT
TEXT compact
content=50.12
ATTRIBUTE divisa
TEXT
TEXT compact
content=DOL

14
result/XPath/xptr/strrange
View File

@ -44,7 +44,7 @@ Expression: xpointer(string-range(//p, 'difficult'))
Object is a Location Set:
1 : Object is a range :
From index 3 in node
TEXT
TEXT compact
content=a diff
To index 4 in node
TEXT
@ -56,10 +56,10 @@ Expression: xpointer(string-range(//p, 'spanning'))
Object is a Location Set:
1 : Object is a range :
From index 3 in node
TEXT
TEXT compact
content=a span
To index 3 in node
TEXT
TEXT compact
content=ing one
@ -80,17 +80,17 @@ Expression: xpointer(string-range(//seq, ''))
Object is a Location Set:
1 : Object is a collapsed range :
index 1 in node
TEXT
TEXT compact
content=123
2 : Object is a collapsed range :
index 2 in node
TEXT
TEXT compact
content=123
3 : Object is a collapsed range :
index 3 in node
TEXT
TEXT compact
content=123
4 : Object is a collapsed range :
index 4 in node
TEXT
TEXT compact
content=123

2
result/XPath/xptr/strrange2
View File

@ -60,5 +60,5 @@ Expression: xpointer(string-range(//p, 'difficult', 1, 0))
Object is a Location Set:
1 : Object is a collapsed range :
index 3 in node
TEXT
TEXT compact
content=a diff

2
result/xmlid/id_err2.xml
View File

@ -2,5 +2,5 @@ Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT foo
ATTRIBUTE id
TEXT
TEXT compact
content=bar

2
result/xmlid/id_tst1.xml
View File

@ -2,5 +2,5 @@ Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT foo
ATTRIBUTE id
TEXT
TEXT compact
content=bar

2
result/xmlid/id_tst2.xml
View File

@ -2,5 +2,5 @@ Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT foo
ATTRIBUTE id
TEXT
TEXT compact
content=bar

2
result/xmlid/id_tst3.xml
View File

@ -2,5 +2,5 @@ Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT o:o
ATTRIBUTE id
TEXT
TEXT compact
content=bar

2
result/xmlid/id_tst4.xml
View File

@ -2,5 +2,5 @@ Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT foo
ATTRIBUTE id
TEXT
TEXT compact
content=bar

2
runtest.c
View File

@ -4306,7 +4306,7 @@ launchTests(testDescPtr tst) {
testErrorsSize = 0;
testErrors[0] = 0;
res = tst->func(globbuf.gl_pathv[i], result, error,
tst->options);
tst->options | XML_PARSE_COMPACT);
xmlResetLastError();
if (res != 0) {
fprintf(stderr, "File %s generated an error\n",

4
testXPath.c
View File

@ -178,9 +178,9 @@ int main(int argc, char **argv) {
}
if (document == NULL) {
if (filename == NULL)
document = xmlReadDoc(buffer,NULL,NULL,0);
document = xmlReadDoc(buffer,NULL,NULL,XML_PARSE_COMPACT);
else
document = xmlReadFile(filename,NULL,0);
document = xmlReadFile(filename,NULL,XML_PARSE_COMPACT);
}
for (i = 1; i < argc ; i++) {
if ((!strcmp(argv[i], "-i")) || (!strcmp(argv[i], "--input"))) {

58
tree.c
View File

@ -3287,7 +3287,8 @@ xmlFreeNodeList(xmlNodePtr cur) {
if ((cur->type != XML_ELEMENT_NODE) &&
(cur->type != XML_XINCLUDE_START) &&
(cur->type != XML_XINCLUDE_END) &&
(cur->type != XML_ENTITY_REF_NODE)) {
(cur->type != XML_ENTITY_REF_NODE) &&
(cur->content != (xmlChar *) &(cur->properties))) {
DICT_FREE(cur->content)
}
if (((cur->type == XML_ELEMENT_NODE) ||
@ -3356,7 +3357,8 @@ xmlFreeNode(xmlNodePtr cur) {
(cur->content != NULL) &&
(cur->type != XML_ENTITY_REF_NODE) &&
(cur->type != XML_XINCLUDE_END) &&
(cur->type != XML_XINCLUDE_START)) {
(cur->type != XML_XINCLUDE_START) &&
(cur->content != (xmlChar *) &(cur->properties))) {
DICT_FREE(cur->content)
}
@ -3811,7 +3813,7 @@ xmlStaticCopyNode(const xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent,
if (!extended)
goto out;
if (node->nsDef != NULL)
if ((node->type == XML_ELEMENT_NODE) && (node->nsDef != NULL))
ret->nsDef = xmlCopyNamespaceList(node->nsDef);
if (node->ns != NULL) {
@ -3838,7 +3840,7 @@ xmlStaticCopyNode(const xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent,
ret->ns = ns;
}
}
if (node->properties != NULL)
if ((node->type == XML_ELEMENT_NODE) && (node->properties != NULL))
ret->properties = xmlCopyPropList(ret, node->properties);
if (node->type == XML_ENTITY_REF_NODE) {
if ((doc == NULL) || (node->doc != doc)) {
@ -5106,7 +5108,8 @@ xmlNodeSetContent(xmlNodePtr cur, const xmlChar *content) {
case XML_ENTITY_NODE:
case XML_PI_NODE:
case XML_COMMENT_NODE:
if (cur->content != NULL) {
if ((cur->content != NULL) &&
(cur->content != (xmlChar *) &(cur->properties))) {
if (!((cur->doc != NULL) && (cur->doc->dict != NULL) &&
(xmlDictOwns(cur->doc->dict, cur->content))))
xmlFree(cur->content);
@ -5117,6 +5120,8 @@ xmlNodeSetContent(xmlNodePtr cur, const xmlChar *content) {
cur->content = xmlStrdup(content);
} else
cur->content = NULL;
cur->properties = NULL;
cur->nsDef = NULL;
break;
case XML_DOCUMENT_NODE:
case XML_HTML_DOCUMENT_NODE:
@ -5178,8 +5183,11 @@ xmlNodeSetContentLen(xmlNodePtr cur, const xmlChar *content, int len) {
case XML_PI_NODE:
case XML_COMMENT_NODE:
case XML_NOTATION_NODE:
if (cur->content != NULL) {
xmlFree(cur->content);
if ((cur->content != NULL) &&
(cur->content != (xmlChar *) &(cur->properties))) {
if (!((cur->doc != NULL) && (cur->doc->dict != NULL) &&
(xmlDictOwns(cur->doc->dict, cur->content))))
xmlFree(cur->content);
}
if (cur->children != NULL) xmlFreeNodeList(cur->children);
cur->children = cur->last = NULL;
@ -5187,6 +5195,8 @@ xmlNodeSetContentLen(xmlNodePtr cur, const xmlChar *content, int len) {
cur->content = xmlStrndup(content, len);
} else
cur->content = NULL;
cur->properties = NULL;
cur->nsDef = NULL;
break;
case XML_DOCUMENT_NODE:
case XML_DTD_NODE:
@ -5257,10 +5267,12 @@ xmlNodeAddContentLen(xmlNodePtr cur, const xmlChar *content, int len) {
case XML_COMMENT_NODE:
case XML_NOTATION_NODE:
if (content != NULL) {
if ((cur->doc != NULL) && (cur->doc->dict != NULL) &&
xmlDictOwns(cur->doc->dict, cur->content)) {
cur->content =
xmlStrncatNew(cur->content, content, len);
if ((cur->content == (xmlChar *) &(cur->properties)) ||
((cur->doc != NULL) && (cur->doc->dict != NULL) &&
xmlDictOwns(cur->doc->dict, cur->content))) {
cur->content = xmlStrncatNew(cur->content, content, len);
cur->properties = NULL;
cur->nsDef = NULL;
break;
}
cur->content = xmlStrncat(cur->content, content, len);
@ -5903,7 +5915,8 @@ xmlHasProp(xmlNodePtr node, const xmlChar *name) {
xmlAttrPtr prop;
xmlDocPtr doc;
if ((node == NULL) || (name == NULL)) return(NULL);
if ((node == NULL) || (node->type != XML_ELEMENT_NODE) || (name == NULL))
return(NULL);
/*
* Check on the properties attached to the node
*/
@ -5959,7 +5972,7 @@ xmlHasNsProp(xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace) {
xmlDocPtr doc;
#endif /* LIBXML_TREE_ENABLED */
if (node == NULL)
if ((node == NULL) || (node->type != XML_ELEMENT_NODE) || (name == NULL))
return(NULL);
prop = node->properties;
@ -6057,7 +6070,9 @@ xmlGetProp(xmlNodePtr node, const xmlChar *name) {
xmlAttrPtr prop;
xmlDocPtr doc;
if ((node == NULL) || (name == NULL)) return(NULL);
if ((node == NULL) || (node->type != XML_ELEMENT_NODE) || (name == NULL))
return(NULL);
/*
* Check on the properties attached to the node
*/
@ -6114,7 +6129,8 @@ xmlGetNoNsProp(xmlNodePtr node, const xmlChar *name) {
xmlAttrPtr prop;
xmlDocPtr doc;
if ((node == NULL) || (name == NULL)) return(NULL);
if ((node == NULL) || (node->type != XML_ELEMENT_NODE) || (name == NULL))
return(NULL);
/*
* Check on the properties attached to the node
*/
@ -6172,7 +6188,7 @@ xmlGetNsProp(xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace) {
xmlDocPtr doc;
xmlNsPtr ns;
if (node == NULL)
if ((node == NULL) || (node->type != XML_ELEMENT_NODE))
return(NULL);
prop = node->properties;
@ -6236,7 +6252,7 @@ int
xmlUnsetProp(xmlNodePtr node, const xmlChar *name) {
xmlAttrPtr prop, prev = NULL;;
if ((node == NULL) || (name == NULL))
if ((node == NULL) || (node->type != XML_ELEMENT_NODE) || (name == NULL))
return(-1);
prop = node->properties;
while (prop != NULL) {
@ -6265,7 +6281,7 @@ int
xmlUnsetNsProp(xmlNodePtr node, xmlNsPtr ns, const xmlChar *name) {
xmlAttrPtr prop, prev = NULL;;
if ((node == NULL) || (name == NULL))
if ((node == NULL) || (node->type != XML_ELEMENT_NODE) || (name == NULL))
return(-1);
prop = node->properties;
if (ns == NULL)
@ -6471,12 +6487,14 @@ xmlTextConcat(xmlNodePtr node, const xmlChar *content, int len) {
return(-1);
}
/* need to check if content is currently in the dictionary */
if ((node->doc != NULL) && (node->doc->dict != NULL) &&
xmlDictOwns(node->doc->dict, node->content)) {
if ((node->content == (xmlChar *) &(node->properties)) ||
((node->doc != NULL) && (node->doc->dict != NULL) &&
xmlDictOwns(node->doc->dict, node->content))) {
node->content = xmlStrncatNew(node->content, content, len);
} else {
node->content = xmlStrncat(node->content, content, len);
}
node->properties = NULL;
if (node->content == NULL)
return(-1);
return(0);

48
valid.c
View File

@ -5860,24 +5860,12 @@ xmlValidateOneElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
NULL,NULL,NULL);
return(0);
}
if (elem->properties != NULL) {
xmlErrValidNode(ctxt, elem, XML_ERR_INTERNAL_ERROR,
"Text element has attribute !\n",
NULL,NULL,NULL);
return(0);
}
if (elem->ns != NULL) {
xmlErrValidNode(ctxt, elem, XML_ERR_INTERNAL_ERROR,
"Text element has namespace !\n",
NULL,NULL,NULL);
return(0);
}
if (elem->nsDef != NULL) {
xmlErrValidNode(ctxt, elem, XML_ERR_INTERNAL_ERROR,
"Text element has namespace !\n",
NULL,NULL,NULL);
return(0);
}
if (elem->content == NULL) {
xmlErrValidNode(ctxt, elem, XML_ERR_INTERNAL_ERROR,
"Text element has no content !\n",
@ -6302,23 +6290,25 @@ xmlValidateElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc, xmlNodePtr elem) {
}
ret &= xmlValidateOneElement(ctxt, doc, elem);
attr = elem->properties;
while (attr != NULL) {
value = xmlNodeListGetString(doc, attr->children, 0);
ret &= xmlValidateOneAttribute(ctxt, doc, elem, attr, value);
if (value != NULL)
xmlFree((char *)value);
attr= attr->next;
}
ns = elem->nsDef;
while (ns != NULL) {
if (elem->ns == NULL)
ret &= xmlValidateOneNamespace(ctxt, doc, elem, NULL,
ns, ns->href);
else
ret &= xmlValidateOneNamespace(ctxt, doc, elem, elem->ns->prefix,
ns, ns->href);
ns = ns->next;
if (elem->type == XML_ELEMENT_NODE) {
attr = elem->properties;
while (attr != NULL) {
value = xmlNodeListGetString(doc, attr->children, 0);
ret &= xmlValidateOneAttribute(ctxt, doc, elem, attr, value);
if (value != NULL)
xmlFree((char *)value);
attr= attr->next;
}
ns = elem->nsDef;
while (ns != NULL) {
if (elem->ns == NULL)
ret &= xmlValidateOneNamespace(ctxt, doc, elem, NULL,
ns, ns->href);
else
ret &= xmlValidateOneNamespace(ctxt, doc, elem,
elem->ns->prefix, ns, ns->href);
ns = ns->next;
}
}
child = elem->children;
while (child != NULL) {

6
xmllint.c
View File

@ -196,7 +196,7 @@ static const char *pattern = NULL;
static xmlPatternPtr patternc = NULL;
static xmlStreamCtxtPtr patstream = NULL;
#endif
static int options = 0;
static int options = XML_PARSE_COMPACT;
static int sax = 0;
/************************************************************************
@ -2793,6 +2793,7 @@ static void usage(const char *name) {
printf("\t--path 'paths': provide a set of paths for resources\n");
printf("\t--load-trace : print trace of all external entites loaded\n");
printf("\t--nonet : refuse to fetch DTDs or entities over network\n");
printf("\t--nocompact : do not generate compact text nodes\n");
printf("\t--htmlout : output results as HTML\n");
printf("\t--nowrap : do not put HTML doc wrapper\n");
#ifdef LIBXML_VALID_ENABLED
@ -3175,6 +3176,9 @@ main(int argc, char **argv) {
} else if ((!strcmp(argv[i], "-nonet")) ||
(!strcmp(argv[i], "--nonet"))) {
options |= XML_PARSE_NONET;
} else if ((!strcmp(argv[i], "-nocompact")) ||
(!strcmp(argv[i], "--nocompact"))) {
options &= ~XML_PARSE_COMPACT;
} else if ((!strcmp(argv[i], "-load-trace")) ||
(!strcmp(argv[i], "--load-trace"))) {
load_trace++;

16
xmlreader.c
View File

@ -348,7 +348,8 @@ xmlTextReaderFreeNodeList(xmlTextReaderPtr reader, xmlNodePtr cur) {
(cur->type == XML_XINCLUDE_END)) &&
(cur->properties != NULL))
xmlTextReaderFreePropList(reader, cur->properties);
if ((cur->type != XML_ELEMENT_NODE) &&
if ((cur->content != (xmlChar *) &(cur->properties)) &&
(cur->type != XML_ELEMENT_NODE) &&
(cur->type != XML_XINCLUDE_START) &&
(cur->type != XML_XINCLUDE_END) &&
(cur->type != XML_ENTITY_REF_NODE)) {
@ -422,7 +423,8 @@ xmlTextReaderFreeNode(xmlTextReaderPtr reader, xmlNodePtr cur) {
(cur->type == XML_XINCLUDE_END)) &&
(cur->properties != NULL))
xmlTextReaderFreePropList(reader, cur->properties);
if ((cur->type != XML_ELEMENT_NODE) &&
if ((cur->content != (xmlChar *) &(cur->properties)) &&
(cur->type != XML_ELEMENT_NODE) &&
(cur->type != XML_XINCLUDE_START) &&
(cur->type != XML_XINCLUDE_END) &&
(cur->type != XML_ENTITY_REF_NODE)) {
@ -2810,7 +2812,9 @@ xmlTextReaderReadAttributeValue(xmlTextReaderPtr reader) {
reader->faketext = xmlNewDocText(reader->node->doc,
ns->href);
} else {
if (reader->faketext->content != NULL)
if ((reader->faketext->content != NULL) &&
(reader->faketext->content !=
(xmlChar *) &(reader->faketext->properties)))
xmlFree(reader->faketext->content);
reader->faketext->content = xmlStrdup(ns->href);
}
@ -4776,6 +4780,12 @@ xmlTextReaderSetup(xmlTextReaderPtr reader,
if (reader == NULL)
return (-1);
/*
* we force the generation of compact text nodes on the reader
* since usr applications should never modify the tree
*/
options |= XML_PARSE_COMPACT;
reader->doc = NULL;
reader->entNr = 0;
reader->parserFlags = options;