amassari 2003/12/16 09:53:56
Modified: c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner.cpp
c/src/xercesc/dom/impl DOMTypeInfoImpl.cpp
Log:
The DOMTypeInfo should have a NULL namespace and type name when DTD validation is
used, not empty strings
Revision Changes Path
1.35 +3 -3 xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp
Index: DGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- DGXMLScanner.cpp 14 Dec 2003 21:09:26 -0000 1.34
+++ DGXMLScanner.cpp 16 Dec 2003 17:53:56 -0000 1.35
@@ -759,7 +759,7 @@
: XMLUni::fgZeroLenString
);
// pass back type name information
- fDocHandler->elementTypeInfo(XMLUni::fgZeroLenString,
XMLUni::fgZeroLenString);
+ fDocHandler->elementTypeInfo(0, 0);
}
// If this was the root, then done with content
@@ -1594,7 +1594,7 @@
: XMLUni::fgZeroLenString
);
// pass back type name information
- fDocHandler->elementTypeInfo(XMLUni::fgZeroLenString,
XMLUni::fgZeroLenString);
+ fDocHandler->elementTypeInfo(0, 0);
}
// Pop the element stack back off since it'll never be used now
1.47 +3 -3 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- IGXMLScanner.cpp 14 Dec 2003 21:09:26 -0000 1.46
+++ IGXMLScanner.cpp 16 Dec 2003 17:53:56 -0000 1.47
@@ -1254,7 +1254,7 @@
}
else
{
- fDocHandler->elementTypeInfo(XMLUni::fgZeroLenString,
XMLUni::fgZeroLenString);
+ fDocHandler->elementTypeInfo(0, 0);
}
}
@@ -3033,7 +3033,7 @@
}
else
{
- fDocHandler->elementTypeInfo(XMLUni::fgZeroLenString,
XMLUni::fgZeroLenString);
+ fDocHandler->elementTypeInfo(0, 0);
}
}
1.2 +2 -2 xml-xerces/c/src/xercesc/dom/impl/DOMTypeInfoImpl.cpp
Index: DOMTypeInfoImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMTypeInfoImpl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMTypeInfoImpl.cpp 29 Jan 2003 19:41:09 -0000 1.1
+++ DOMTypeInfoImpl.cpp 16 Dec 2003 17:53:56 -0000 1.2
@@ -61,8 +61,8 @@
XERCES_CPP_NAMESPACE_BEGIN
DOMTypeInfoImpl::DOMTypeInfoImpl(const XMLCh* n, const XMLCh* nURI, DOMDocumentImpl
*impl) {
- name = impl->getPooledString(n);
- namespaceURI = impl->getPooledString(nURI);
+ name = n?impl->getPooledString(n):n;
+ namespaceURI = nURI?impl->getPooledString(nURI):nURI;
}
DOMTypeInfoImpl::DOMTypeInfoImpl() : name(0), namespaceURI(0) {}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
