forked from pool/libxml2
Accepting request 145538 from home:posophe:branches:devel:libraries:c_c++
update to 2.9.0 OBS-URL: https://build.opensuse.org/request/show/145538 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxml2?expand=0&rev=75
This commit is contained in:
committed by
Git OBS Bridge
parent
4c4a3966c3
commit
4a9662c88e
@@ -11,9 +11,9 @@ Date: Thu Jan 26 19:11:02 2012 +0800
|
||||
|
||||
Index: SAX2.c
|
||||
===================================================================
|
||||
--- SAX2.c.orig
|
||||
+++ SAX2.c
|
||||
@@ -2162,7 +2162,6 @@ xmlSAX2StartElementNs(void *ctx,
|
||||
--- SAX2.c.orig 2012-09-11 08:01:01.000000000 +0200
|
||||
+++ SAX2.c 2012-12-15 16:32:27.353560391 +0100
|
||||
@@ -2188,7 +2188,6 @@
|
||||
xmlNodePtr parent;
|
||||
xmlNsPtr last = NULL, ns;
|
||||
const xmlChar *uri, *pref;
|
||||
@@ -21,7 +21,7 @@ Index: SAX2.c
|
||||
int i, j;
|
||||
|
||||
if (ctx == NULL) return;
|
||||
@@ -2182,20 +2181,6 @@ xmlSAX2StartElementNs(void *ctx,
|
||||
@@ -2208,20 +2207,6 @@
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -42,7 +42,7 @@ Index: SAX2.c
|
||||
* allocate the node
|
||||
*/
|
||||
if (ctxt->freeElems != NULL) {
|
||||
@@ -2208,10 +2193,7 @@ xmlSAX2StartElementNs(void *ctx,
|
||||
@@ -2234,10 +2219,7 @@
|
||||
if (ctxt->dictNames)
|
||||
ret->name = localname;
|
||||
else {
|
||||
@@ -54,20 +54,20 @@ Index: SAX2.c
|
||||
if (ret->name == NULL) {
|
||||
xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElementNs");
|
||||
return;
|
||||
@@ -2223,11 +2205,8 @@ xmlSAX2StartElementNs(void *ctx,
|
||||
@@ -2249,11 +2231,8 @@
|
||||
if (ctxt->dictNames)
|
||||
ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL,
|
||||
ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL,
|
||||
(xmlChar *) localname, NULL);
|
||||
- else if (lname == NULL)
|
||||
- ret = xmlNewDocNode(ctxt->myDoc, NULL, localname, NULL);
|
||||
else
|
||||
- ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL,
|
||||
- ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL,
|
||||
- (xmlChar *) lname, NULL);
|
||||
+ ret = xmlNewDocNode(ctxt->myDoc, NULL, localname, NULL);
|
||||
if (ret == NULL) {
|
||||
xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElementNs");
|
||||
return;
|
||||
@@ -2334,33 +2313,8 @@ xmlSAX2StartElementNs(void *ctx,
|
||||
@@ -2360,31 +2339,6 @@
|
||||
*/
|
||||
if (nb_attributes > 0) {
|
||||
for (j = 0,i = 0;i < nb_attributes;i++,j+=5) {
|
||||
@@ -97,11 +97,9 @@ Index: SAX2.c
|
||||
- }
|
||||
- }
|
||||
xmlSAX2AttributeNs(ctxt, attributes[j], attributes[j+1],
|
||||
- attributes[j+3], attributes[j+4]);
|
||||
+ attributes[j+3], attributes[j+4]);
|
||||
attributes[j+3], attributes[j+4]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Index: result/namespaces/err_7.xml
|
||||
===================================================================
|
||||
--- result/namespaces/err_7.xml.orig
|
||||
|
||||
Reference in New Issue
Block a user