You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/07/06 20:08:43 UTC
svn commit: r553979 - in /xerces/c/trunk: samples/src/DOMCount/
src/xercesc/com/ src/xercesc/dom/ src/xercesc/dom/impl/
src/xercesc/internal/ src/xercesc/validators/datatype/
src/xercesc/validators/schema/ src/xercesc/xinclude/
tests/src/DOM/DOMMemTest...
Author: amassari
Date: Fri Jul 6 11:08:39 2007
New Revision: 553979
URL: http://svn.apache.org/viewvc?view=rev&rev=553979
Log:
All lists and vectors should use unsigned int to report size and access items (XERCESC-1531)
Modified:
xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp
xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp
xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp
xerces/c/trunk/src/xercesc/dom/DOMImplementationList.hpp
xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp
xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp
xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.c
xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationRegistry.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp
xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp
xerces/c/trunk/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp
xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp
xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp
Modified: xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp (original)
+++ xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp Fri Jul 6 11:08:39 2007
@@ -96,10 +96,10 @@
if(n->hasAttributes()) {
// get all the attributes of the node
DOMNamedNodeMap *pAttributes = n->getAttributes();
- int nSize = pAttributes->getLength();
+ unsigned int nSize = pAttributes->getLength();
XERCES_STD_QUALIFIER cout <<"\tAttributes" << XERCES_STD_QUALIFIER endl;
XERCES_STD_QUALIFIER cout <<"\t----------" << XERCES_STD_QUALIFIER endl;
- for(int i=0;i<nSize;++i) {
+ for(unsigned int i=0;i<nSize;++i) {
DOMAttr *pAttributeNode = (DOMAttr*) pAttributes->item(i);
// get attribute name
char *name = XMLString::transcode(pAttributeNode->getName());
Modified: xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp (original)
+++ xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp Fri Jul 6 11:08:39 2007
@@ -1441,8 +1441,8 @@
try {
DOMNodeList* childs = m_Document->getChildNodes();
- int length = childs->getLength();
- for (int i=0; i < length; ++i) {
+ unsigned int length = childs->getLength();
+ for (unsigned int i=0; i < length; ++i) {
DOMNode* child = childs->item(i);
_bstr_t nodeText;
GetXML(child,nodeText);
Modified: xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp (original)
+++ xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp Fri Jul 6 11:08:39 2007
@@ -827,8 +827,8 @@
// Output any attributes on this element
DOMNamedNodeMap* attributes = toWrite->getAttributes();
- int attrCount = attributes->getLength();
- for (int i = 0; i < attrCount; i++)
+ unsigned int attrCount = attributes->getLength();
+ for (unsigned int i = 0; i < attrCount; i++)
{
DOMNode* attribute = attributes->item(i);
Modified: xerces/c/trunk/src/xercesc/dom/DOMImplementationList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMImplementationList.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMImplementationList.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMImplementationList.hpp Fri Jul 6 11:08:39 2007
@@ -90,7 +90,7 @@
* index.
* @since DOM Level 3
*/
- virtual DOMImplementation *item(XMLSize_t index) const = 0;
+ virtual DOMImplementation *item(unsigned int index) const = 0;
/**
* Returns the number of DOMImplementation in the list.
@@ -98,7 +98,7 @@
* The range of valid child node indices is 0 to <code>length-1</code> inclusive.
* @since DOM Level 3
*/
- virtual XMLSize_t getLength() const = 0;
+ virtual unsigned int getLength() const = 0;
//@}
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp Fri Jul 6 11:08:39 2007
@@ -126,7 +126,7 @@
* index.
* @since DOM Level 1
*/
- virtual DOMNode *item(XMLSize_t index) const = 0;
+ virtual DOMNode *item(unsigned int index) const = 0;
/**
* Retrieves a node specified by name.
@@ -146,7 +146,7 @@
* 0 to <code>length-1</code> inclusive.
* @since DOM Level 1
*/
- virtual XMLSize_t getLength() const = 0;
+ virtual unsigned int getLength() const = 0;
// -----------------------------------------------------------------------
// Node methods
Modified: xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp Fri Jul 6 11:08:39 2007
@@ -95,7 +95,7 @@
* index.
* @since DOM Level 1
*/
- virtual DOMNode *item(XMLSize_t index) const = 0;
+ virtual DOMNode *item(unsigned int index) const = 0;
/**
* Returns the number of nodes in the list.
@@ -103,7 +103,7 @@
* The range of valid child node indices is 0 to <code>length-1</code> inclusive.
* @since DOM Level 1
*/
- virtual XMLSize_t getLength() const = 0;
+ virtual unsigned int getLength() const = 0;
//@}
};
Modified: xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp Fri Jul 6 11:08:39 2007
@@ -87,7 +87,7 @@
* index.
* @since DOM Level 3
*/
- virtual const XMLCh *item(XMLSize_t index) const = 0;
+ virtual const XMLCh *item(unsigned int index) const = 0;
/**
* Returns the number of strings in the list.
@@ -96,7 +96,7 @@
*
* @since DOM Level 3
*/
- virtual XMLSize_t getLength() const = 0;
+ virtual unsigned int getLength() const = 0;
/**
* Test if a string is part of this DOMStringList
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp Fri Jul 6 11:08:39 2007
@@ -66,14 +66,14 @@
fNodes->reset();
else
{
- XMLSize_t size = srcmap->fNodes->size();
+ unsigned int size = srcmap->fNodes->size();
if(size > 0) {
DOMDocument *doc = fOwnerNode->getOwnerDocument();
fNodes = new (doc) DOMNodeVector(doc, size);
}
}
- for (XMLSize_t i = 0; i < srcmap->fNodes->size(); i++)
+ for (unsigned int i = 0; i < srcmap->fNodes->size(); i++)
{
DOMNode *n = srcmap->fNodes->elementAt(i);
DOMNode *clone = n->cloneNode(true);
@@ -98,8 +98,8 @@
// this->fReadOnly=readOnl;
if(deep && fNodes!=0)
{
- int sz = fNodes->size();
- for (int i=0; i<sz; ++i) {
+ unsigned int sz = fNodes->size();
+ for (unsigned int i=0; i<sz; ++i) {
castToNodeImpl(fNodes->elementAt(i))->setReadOnly(readOnl, deep);
}
}
@@ -113,10 +113,10 @@
{
// Binary search
- int i=0;
+ unsigned int i=0;
if(fNodes!=0)
{
- int first=0,last=fNodes->size()-1;
+ unsigned int first=0,last=fNodes->size()-1;
while(first<=last)
{
@@ -211,7 +211,7 @@
// In addition, to get this to work with fNodes without any namespace
// (namespaceURI and localNames are both 0) we then use the nodeName
// as a secondary key.
- int i, len = fNodes -> size();
+ unsigned int i, len = fNodes -> size();
for (i = 0; i < len; ++i) {
DOMNode *node = fNodes -> elementAt(i);
const XMLCh * nNamespaceURI = node->getNamespaceURI();
@@ -337,7 +337,7 @@
// remove the name using index
// avoid calling findNamePoint again if the index is already known
-DOMNode * DOMAttrMapImpl::removeNamedItemAt(XMLSize_t index)
+DOMNode * DOMAttrMapImpl::removeNamedItemAt(unsigned int index)
{
if (this->readOnly())
throw DOMException(
@@ -381,8 +381,8 @@
void DOMAttrMapImpl::reconcileDefaultAttributes(const DOMAttrMapImpl* defaults) {
// remove any existing default
- XMLSize_t nsize = getLength();
- for (XMLSSize_t i = nsize - 1; i >= 0; i--) {
+ unsigned int nsize = getLength();
+ for (unsigned int i = nsize - 1; i >= 0; i--) {
DOMAttr* attr = (DOMAttr*)item(i);
if (!attr->getSpecified()) {
removeNamedItemAt(i);
@@ -399,8 +399,8 @@
cloneContent(defaults);
}
else {
- XMLSize_t dsize = defaults->getLength();
- for (XMLSize_t n = 0; n < dsize; n++) {
+ unsigned int dsize = defaults->getLength();
+ for (unsigned int n = 0; n < dsize; n++) {
DOMAttr* attr = (DOMAttr*)defaults->item(n);
DOMAttr* newAttr = (DOMAttr*)attr->cloneNode(true);
@@ -417,9 +417,9 @@
* Move specified attributes from the given map to this one
*/
void DOMAttrMapImpl::moveSpecifiedAttributes(DOMAttrMapImpl* srcmap) {
- XMLSize_t nsize = srcmap->getLength();
+ unsigned int nsize = srcmap->getLength();
- for (XMLSSize_t i = nsize - 1; i >= 0; i--) {
+ for (unsigned int i = nsize - 1; i >= 0; i--) {
DOMAttr* attr = (DOMAttr*)srcmap->item(i);
if (attr->getSpecified()) {
srcmap->removeNamedItemAt(i);
@@ -432,12 +432,12 @@
}
} // moveSpecifiedAttributes(AttributeMap):void
-XMLSize_t DOMAttrMapImpl::getLength() const
+unsigned int DOMAttrMapImpl::getLength() const
{
return (fNodes != 0) ? fNodes->size() : 0;
}
-DOMNode * DOMAttrMapImpl::item(XMLSize_t index) const
+DOMNode * DOMAttrMapImpl::item(unsigned int index) const
{
return (fNodes != 0 && index < fNodes->size()) ?
fNodes->elementAt(index) : 0;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp Fri Jul 6 11:08:39 2007
@@ -68,12 +68,12 @@
virtual int findNamePoint(const XMLCh *name) const;
virtual int findNamePoint(const XMLCh *namespaceURI,
const XMLCh *localName) const;
- virtual DOMNode* removeNamedItemAt(XMLSize_t index);
+ virtual DOMNode* removeNamedItemAt(unsigned int index);
virtual void setReadOnly(bool readOnly, bool deep);
- virtual XMLSize_t getLength() const;
- virtual DOMNode* item(XMLSize_t index) const;
+ virtual unsigned int getLength() const;
+ virtual DOMNode* item(unsigned int index) const;
virtual DOMNode* getNamedItem(const XMLCh *name) const;
virtual DOMNode* setNamedItem(DOMNode *arg);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp Fri Jul 6 11:08:39 2007
@@ -108,9 +108,9 @@
if (this->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if (ranges != 0) {
- XMLSize_t sz = ranges->size();
+ unsigned int sz = ranges->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
ranges->elementAt(i)->updateSplitInfo( this, newText, offset);
}
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp Fri Jul 6 11:08:39 2007
@@ -79,9 +79,9 @@
if (node->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)node->getOwnerDocument())->getRanges();
if (ranges != 0) {
- XMLSize_t sz = ranges->size();
+ unsigned int sz = ranges->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
ranges->elementAt(i)->receiveReplacedText((DOMNode*)node);
}
}
@@ -152,9 +152,9 @@
if (node->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)node->getOwnerDocument())->getRanges();
if (ranges != 0) {
- XMLSize_t sz = ranges->size();
+ unsigned int sz = ranges->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
ranges->elementAt(i)->updateRangeForDeletedText( (DOMNode*)node, offset, count);
}
}
@@ -220,9 +220,9 @@
if (node->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)node->getOwnerDocument())->getRanges();
if (ranges != 0) {
- XMLSize_t sz = ranges->size();
+ unsigned int sz = ranges->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
ranges->elementAt(i)->updateRangeForInsertedText( (DOMNode*)node, offset, datLen);
}
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp Fri Jul 6 11:08:39 2007
@@ -114,9 +114,9 @@
if (this->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if (ranges != 0) {
- XMLSize_t sz = ranges->size();
+ unsigned int sz = ranges->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
ranges->elementAt(i)->updateSplitInfo( this, newText, offset);
}
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp Fri Jul 6 11:08:39 2007
@@ -69,7 +69,7 @@
{
}
-XMLSize_t DOMDeepNodeListImpl::getLength() const
+unsigned int DOMDeepNodeListImpl::getLength() const
{
// Reset cache to beginning of list
item(0);
@@ -80,7 +80,7 @@
}
-DOMNode *DOMDeepNodeListImpl::item(XMLSize_t index) const
+DOMNode *DOMDeepNodeListImpl::item(unsigned int index) const
{
return ((DOMDeepNodeListImpl*)this)->cacheItem(index);
}
@@ -95,9 +95,9 @@
// irrelevant ones. Doing so in a really useful manner would seem
// to involve a tree-walk in its own right, or maintaining our data
// in a parallel tree.
-DOMNode *DOMDeepNodeListImpl::cacheItem(XMLSize_t index)
+DOMNode *DOMDeepNodeListImpl::cacheItem(unsigned int index)
{
- XMLSize_t currentIndexPlus1 = fCurrentIndexPlus1;
+ unsigned int currentIndexPlus1 = fCurrentIndexPlus1;
DOMNode *currentNode = fCurrentNode;
if (castToParentImpl(fRootNode)->changes() != fChanges)
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp Fri Jul 6 11:08:39 2007
@@ -47,7 +47,7 @@
bool fMatchAll;
int fChanges;
DOMNode* fCurrentNode;
- XMLSize_t fCurrentIndexPlus1;
+ unsigned int fCurrentIndexPlus1;
//DOM Level 2
const XMLCh* fNamespaceURI;
@@ -60,9 +60,9 @@
const XMLCh *namespaceURI,
const XMLCh *localName);
virtual ~DOMDeepNodeListImpl();
- virtual XMLSize_t getLength() const;
- virtual DOMNode* item(XMLSize_t index) const;
- DOMNode* cacheItem(XMLSize_t index);
+ virtual unsigned int getLength() const;
+ virtual DOMNode* item(unsigned int index) const;
+ DOMNode* cacheItem(unsigned int index);
private:
DOMNode* nextMatchingElementAfter(DOMNode *current);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.c
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.c?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.c (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.c Fri Jul 6 11:08:39 2007
@@ -38,9 +38,9 @@
// DOMDeepNodeListPool: Constructors and Destructor
// ---------------------------------------------------------------------------
template <class TVal>
-DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool( const XMLSize_t modulus
+DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool( const unsigned int modulus
, const bool adoptElems
- , const XMLSize_t initSize) :
+ , const unsigned int initSize) :
fAdoptedElems(adoptElems)
, fBucketList(0)
, fHashModulus(modulus)
@@ -71,10 +71,10 @@
}
template <class TVal>
-DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool( const XMLSize_t modulus
+DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool( const unsigned int modulus
, const bool adoptElems
, HashBase* hashBase
- , const XMLSize_t initSize) :
+ , const unsigned int initSize) :
fAdoptedElems(adoptElems)
, fBucketList(0)
, fHashModulus(modulus)
@@ -101,8 +101,8 @@
}
template <class TVal>
-DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool( const XMLSize_t modulus
- , const XMLSize_t initSize) :
+DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool( const unsigned int modulus
+ , const unsigned int initSize) :
fAdoptedElems(true)
, fBucketList(0)
, fHashModulus(modulus)
@@ -134,7 +134,7 @@
}
template <class TVal>
-void DOMDeepNodeListPool<TVal>::initialize(const XMLSize_t modulus)
+void DOMDeepNodeListPool<TVal>::initialize(const unsigned int modulus)
{
if (modulus == 0)
ThrowXMLwithMemMgr(IllegalArgumentException, XMLExcepts::HshTbl_ZeroModulus, fMemoryManager);
@@ -145,7 +145,7 @@
(
fHashModulus * sizeof(DOMDeepNodeListPoolTableBucketElem<TVal>*)
);//new DOMDeepNodeListPoolTableBucketElem<TVal>*[fHashModulus];
- for (XMLSize_t index = 0; index < fHashModulus; index++)
+ for (unsigned int index = 0; index < fHashModulus; index++)
fBucketList[index] = 0;
}
@@ -167,7 +167,7 @@
bool DOMDeepNodeListPool<TVal>::isEmpty() const
{
// Just check the bucket list for non-empty elements
- for (XMLSize_t buckInd = 0; buckInd < fHashModulus; buckInd++)
+ for (unsigned int buckInd = 0; buckInd < fHashModulus; buckInd++)
{
if (fBucketList[buckInd] != 0)
return false;
@@ -180,7 +180,7 @@
, const XMLCh* const key2
, const XMLCh* const key3) const
{
- XMLSize_t hashVal;
+ unsigned int hashVal;
const DOMDeepNodeListPoolTableBucketElem<TVal>* findIt = findBucketElem(key1, key2, key3, hashVal);
return (findIt != 0);
}
@@ -191,7 +191,7 @@
if (fIdCounter == 0) return;
// Clean up the buckets first
- for (XMLSize_t buckInd = 0; buckInd < fHashModulus; buckInd++)
+ for (unsigned int buckInd = 0; buckInd < fHashModulus; buckInd++)
{
// Get the bucket list head for this entry
DOMDeepNodeListPoolTableBucketElem<TVal>* curElem = fBucketList[buckInd];
@@ -242,7 +242,7 @@
template <class TVal> TVal*
DOMDeepNodeListPool<TVal>::getByKey(const void* const key1, const XMLCh* const key2, const XMLCh* const key3)
{
- XMLSize_t hashVal;
+ unsigned int hashVal;
DOMDeepNodeListPoolTableBucketElem<TVal>* findIt = findBucketElem(key1, key2, key3, hashVal);
if (!findIt)
return 0;
@@ -252,7 +252,7 @@
template <class TVal> const TVal*
DOMDeepNodeListPool<TVal>::getByKey(const void* const key1, const XMLCh* const key2, const XMLCh* const key3) const
{
- XMLSize_t hashVal;
+ unsigned int hashVal;
const DOMDeepNodeListPoolTableBucketElem<TVal>* findIt = findBucketElem(key1, key2, key3, hashVal);
if (!findIt)
return 0;
@@ -260,7 +260,7 @@
}
template <class TVal> TVal*
-DOMDeepNodeListPool<TVal>::getById(const XMLSize_t elemId)
+DOMDeepNodeListPool<TVal>::getById(const unsigned int elemId)
{
// If its either zero or beyond our current id, its an error
if (!elemId || (elemId > fIdCounter))
@@ -270,7 +270,7 @@
}
template <class TVal> const TVal*
-DOMDeepNodeListPool<TVal>::getById(const XMLSize_t elemId) const
+DOMDeepNodeListPool<TVal>::getById(const unsigned int elemId) const
{
// If its either zero or beyond our current id, its an error
if (!elemId || (elemId > fIdCounter))
@@ -282,11 +282,11 @@
// ---------------------------------------------------------------------------
// DOMDeepNodeListPool: Putters
// ---------------------------------------------------------------------------
-template <class TVal> XMLSize_t
+template <class TVal> unsigned int
DOMDeepNodeListPool<TVal>::put(void* key1, XMLCh* key2, XMLCh* key3, TVal* const valueToAdopt)
{
// First see if the key exists already
- XMLSize_t hashVal;
+ unsigned int hashVal;
DOMDeepNodeListPoolTableBucketElem<TVal>* newBucket = findBucketElem(key1, key2, key3, hashVal);
//
@@ -342,7 +342,7 @@
if (fIdCounter + 1 == fIdPtrsCount)
{
// Create a new count 1.5 times larger and allocate a new array
- XMLSize_t newCount = (XMLSize_t)(fIdPtrsCount * 1.5);
+ unsigned int newCount = (unsigned int)(fIdPtrsCount * 1.5);
TVal** newArray = (TVal**) fMemoryManager->allocate
(
newCount * sizeof(TVal*)
@@ -356,7 +356,7 @@
fIdPtrs = newArray;
fIdPtrsCount = newCount;
}
- const XMLSize_t retId = ++fIdCounter;
+ const unsigned int retId = ++fIdCounter;
fIdPtrs[retId] = valueToAdopt;
// Return the id that we gave to this element
@@ -367,7 +367,7 @@
// DOMDeepNodeListPool: Private methods
// ---------------------------------------------------------------------------
template <class TVal> DOMDeepNodeListPoolTableBucketElem<TVal>* DOMDeepNodeListPool<TVal>::
-findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, XMLSize_t& hashVal)
+findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, unsigned int& hashVal)
{
// Hash the key
hashVal = fHash->getHashVal(key1, fHashModulus, fMemoryManager);
@@ -402,7 +402,7 @@
}
template <class TVal> const DOMDeepNodeListPoolTableBucketElem<TVal>* DOMDeepNodeListPool<TVal>::
-findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, XMLSize_t& hashVal) const
+findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, unsigned int& hashVal) const
{
// Hash the key
hashVal = fHash->getHashVal(key1, fHashModulus, fMemoryManager);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp Fri Jul 6 11:08:39 2007
@@ -99,16 +99,16 @@
// backwards compatability - default hasher is HashXMLCh
DOMDeepNodeListPool
(
- const XMLSize_t modulus
- , const XMLSize_t initSize = 128
+ const unsigned int modulus
+ , const unsigned int initSize = 128
);
// backwards compatability - default hasher is HashXMLCh
DOMDeepNodeListPool
(
- const XMLSize_t modulus
+ const unsigned int modulus
, const bool adoptElems
- , const XMLSize_t initSize = 128
+ , const unsigned int initSize = 128
);
// if a hash function is passed in, it will be deleted when the hashtable is deleted.
@@ -116,10 +116,10 @@
// may delete the hasher of a different hashtable if both use the same hasher.
DOMDeepNodeListPool
(
- const XMLSize_t modulus
+ const unsigned int modulus
, const bool adoptElems
, HashBase* hashBase
- , const XMLSize_t initSize = 128
+ , const unsigned int initSize = 128
);
~DOMDeepNodeListPool();
@@ -139,22 +139,22 @@
TVal* getByKey(const void* const key1, const XMLCh* const key2, const XMLCh* const key3);
const TVal* getByKey(const void* const key1, const XMLCh* const key2, const XMLCh* const key3) const;
- TVal* getById(const XMLSize_t elemId);
- const TVal* getById(const XMLSize_t elemId) const;
+ TVal* getById(const unsigned int elemId);
+ const TVal* getById(const unsigned int elemId) const;
// -----------------------------------------------------------------------
// Putters
// -----------------------------------------------------------------------
- XMLSize_t put(void* key1, XMLCh* key2, XMLCh* key3, TVal* const valueToAdopt);
+ unsigned int put(void* key1, XMLCh* key2, XMLCh* key3, TVal* const valueToAdopt);
private:
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
- DOMDeepNodeListPoolTableBucketElem<TVal>* findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, XMLSize_t& hashVal);
- const DOMDeepNodeListPoolTableBucketElem<TVal>* findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, XMLSize_t& hashVal) const;
- void initialize(const XMLSize_t modulus);
+ DOMDeepNodeListPoolTableBucketElem<TVal>* findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, unsigned int& hashVal);
+ const DOMDeepNodeListPoolTableBucketElem<TVal>* findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, unsigned int& hashVal) const;
+ void initialize(const unsigned int modulus);
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
@@ -197,11 +197,11 @@
// -----------------------------------------------------------------------
bool fAdoptedElems;
DOMDeepNodeListPoolTableBucketElem<TVal>** fBucketList;
- XMLSize_t fHashModulus;
+ unsigned int fHashModulus;
HashBase* fHash;
TVal** fIdPtrs;
- XMLSize_t fIdPtrsCount;
- XMLSize_t fIdCounter;
+ unsigned int fIdPtrsCount;
+ unsigned int fIdCounter;
MemoryManager* fMemoryManager;
};
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp Fri Jul 6 11:08:39 2007
@@ -409,9 +409,9 @@
void DOMDocumentImpl::removeNodeIterator(DOMNodeIteratorImpl* nodeIterator)
{
if (fNodeIterators != 0) {
- XMLSize_t sz = fNodeIterators->size();
+ unsigned int sz = fNodeIterators->size();
if (sz !=0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
if (fNodeIterators->elementAt(i) == nodeIterator) {
fNodeIterators->removeElementAt(i);
break;
@@ -675,9 +675,9 @@
void DOMDocumentImpl::removeRange(DOMRangeImpl* range)
{
if (fRanges != 0) {
- XMLSize_t sz = fRanges->size();
+ unsigned int sz = fRanges->size();
if (sz !=0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
if (fRanges->elementAt(i) == range) {
fRanges->removeElementAt(i);
break;
@@ -1079,7 +1079,7 @@
}
DOMNamedNodeMap *srcattr=source->getAttributes();
if(srcattr!=0)
- for(XMLSize_t i=0;i<srcattr->getLength();++i)
+ for(unsigned int i=0;i<srcattr->getLength();++i)
{
DOMAttr *attr = (DOMAttr *) srcattr->item(i);
if (attr -> getSpecified() || cloningDoc) { // not a default attribute or we are in the process of cloning the elements from inside a DOMDocumentType
@@ -1179,14 +1179,14 @@
DOMNamedNodeMap *smap = srcdoctype->getEntities();
DOMNamedNodeMap *tmap = newdoctype->getEntities();
if(smap != 0) {
- for(XMLSize_t i = 0; i < smap->getLength(); i++) {
+ for(unsigned int i = 0; i < smap->getLength(); i++) {
tmap->setNamedItem(importNode(smap->item(i), true, false));
}
}
smap = srcdoctype->getNotations();
tmap = newdoctype->getNotations();
if (smap != 0) {
- for(XMLSize_t i = 0; i < smap->getLength(); i++) {
+ for(unsigned int i = 0; i < smap->getLength(); i++) {
tmap->setNamedItem(importNode(smap->item(i), true, false));
}
}
@@ -1204,7 +1204,7 @@
smap = docTypeImpl->getElements();
tmap = newdoctype->getElements();
if (smap != 0) {
- for(XMLSize_t i = 0; i < smap->getLength(); i++) {
+ for(unsigned int i = 0; i < smap->getLength(); i++) {
tmap->setNamedItem(importNode(smap->item(i), true, true));
}
}
@@ -1406,7 +1406,7 @@
DOMNamedNodeMap *attrlist=child->getAttributes();
if(attrlist!=0)
- for(XMLSize_t i=0;i<attrlist->getLength();++i)
+ for(unsigned int i=0;i<attrlist->getLength();++i)
releaseDocNotifyUserData(attrlist->item(i));
releaseDocNotifyUserData(child);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp Fri Jul 6 11:08:39 2007
@@ -487,11 +487,11 @@
DOMNamedNodeMap* map1 = getNotations();
DOMNamedNodeMap* map2 = argDT->getNotations();
- XMLSize_t len = map1->getLength();
+ unsigned int len = map1->getLength();
if (len != map2->getLength()) {
return false;
}
- for (XMLSize_t i = 0; i < len; i++) {
+ for (unsigned int i = 0; i < len; i++) {
DOMNode* n1 = map1->item(i);
DOMNode* n2 = map2->getNamedItem(n1->getNodeName());
if (!n2 || !n1->isEqualNode(n2)) {
@@ -512,11 +512,11 @@
DOMNamedNodeMap* map1 = getEntities();
DOMNamedNodeMap* map2 = argDT->getEntities();
- XMLSize_t len = map1->getLength();
+ unsigned int len = map1->getLength();
if (len != map2->getLength()) {
return false;
}
- for (XMLSize_t i = 0; i < len; i++) {
+ for (unsigned int i = 0; i < len; i++) {
DOMNode* n1 = map1->item(i);
DOMNode* n2 = map2->getNamedItem(n1->getNodeName());
if (!n2 || !n1->isEqualNode(n2)) {
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp Fri Jul 6 11:08:39 2007
@@ -167,7 +167,7 @@
throw DOMException(
DOMException::NO_MODIFICATION_ALLOWED_ERR, 0, GetDOMNodeMemoryManager);
- XMLSSize_t i = fAttributes->findNamePoint(nam);
+ int i = fAttributes->findNamePoint(nam);
if (i >= 0)
{
DOMNode *att = fAttributes->removeNamedItemAt(i);
@@ -188,7 +188,7 @@
// Since there is no removeAttributeNodeNS, check if this oldAttr has NS or not
const XMLCh* localName = oldAttr->getLocalName();
- XMLSSize_t i = 0;
+ unsigned int i = 0;
if (localName)
i = fAttributes->findNamePoint(oldAttr->getNamespaceURI(), localName);
else
@@ -356,7 +356,7 @@
throw DOMException(
DOMException::NO_MODIFICATION_ALLOWED_ERR, 0, GetDOMNodeMemoryManager);
- XMLSSize_t i = fAttributes->findNamePoint(fNamespaceURI, fLocalName);
+ int i = fAttributes->findNamePoint(fNamespaceURI, fLocalName);
if (i >= 0)
{
DOMNode *att = fAttributes->removeNamedItemAt(i);
@@ -590,11 +590,11 @@
DOMNamedNodeMap* map1 = getAttributes();
DOMNamedNodeMap* map2 = arg->getAttributes();
- XMLSize_t len = map1->getLength();
+ unsigned int len = map1->getLength();
if (len != map2->getLength()) {
return false;
}
- for (XMLSize_t i = 0; i < len; i++) {
+ for (unsigned int i = 0; i < len; i++) {
DOMNode* n1 = map1->item(i);
if (!n1->getLocalName()) { // DOM Level 1 Node
DOMNode* n2 = map2->getNamedItem(n1->getNodeName());
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.cpp Fri Jul 6 11:08:39 2007
@@ -40,12 +40,12 @@
fList->addElement(impl);
}
-XMLSize_t DOMImplementationListImpl::getLength() const{
+unsigned int DOMImplementationListImpl::getLength() const{
return fList->size();
}
-DOMImplementation *DOMImplementationListImpl::item(XMLSize_t index) const{
+DOMImplementation *DOMImplementationListImpl::item(unsigned int index) const{
if(index<fList->size())
return fList->elementAt(index);
return 0;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp Fri Jul 6 11:08:39 2007
@@ -45,9 +45,9 @@
void add(DOMImplementation* impl);
virtual ~DOMImplementationListImpl();
- virtual DOMImplementation * item(XMLSize_t index) const;
- virtual XMLSize_t getLength() const;
- virtual void release();
+ virtual DOMImplementation * item(unsigned int index) const;
+ virtual unsigned int getLength() const;
+ virtual void release();
};
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationRegistry.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationRegistry.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationRegistry.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationRegistry.cpp Fri Jul 6 11:08:39 2007
@@ -158,8 +158,8 @@
for (unsigned int i = len; i > 0; i--) {
DOMImplementationSource* source = getDOMImplSrcVector()->elementAt(i-1);
DOMImplementationList* oneList = source->getDOMImplementationList(features);
- XMLSize_t oneListLen=oneList->getLength();
- for(XMLSize_t j=0; j<oneListLen; j++)
+ unsigned int oneListLen=oneList->getLength();
+ for(unsigned int j=0; j<oneListLen; j++)
list->add(oneList->item(j));
oneList->release();
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp Fri Jul 6 11:08:39 2007
@@ -810,7 +810,7 @@
// Output any attributes on this element
setURCharRef();
DOMNamedNodeMap *attributes = nodeToWrite->getAttributes();
- int attrCount = attributes->getLength();
+ unsigned int attrCount = attributes->getLength();
// check if the namespace for the current node is already defined
const XMLCh* prefix = nodeToWrite->getPrefix();
@@ -853,7 +853,7 @@
}
bool discard = getFeature(DISCARD_DEFAULT_CONTENT_ID);
- for (int i = 0; i < attrCount; i++)
+ for (unsigned int i = 0; i < attrCount; i++)
{
DOMAttrSPtr attribute = (DOMAttr*)attributes->item(i);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp Fri Jul 6 11:08:39 2007
@@ -55,9 +55,9 @@
for(int index=0;index<MAP_SIZE;index++)
if (fBuckets[index] != 0) {
- XMLSize_t size=fBuckets[index]->size();
+ unsigned int size=fBuckets[index]->size();
newmap->fBuckets[index] = new (doc) DOMNodeVector(doc, size);
- for (XMLSize_t i = 0; i < size; ++i) {
+ for (unsigned int i = 0; i < size; ++i) {
DOMNode *s = fBuckets[index]->elementAt(i);
DOMNode *n = s->cloneNode(true);
castToNodeImpl(n)->isSpecified(castToNodeImpl(s)->isSpecified());
@@ -71,21 +71,21 @@
}
-XMLSize_t DOMNamedNodeMapImpl::getLength() const
+unsigned int DOMNamedNodeMapImpl::getLength() const
{
- XMLSize_t count=0;
- for(int index=0;index<MAP_SIZE;index++)
+ unsigned int count=0;
+ for(unsigned int index=0;index<MAP_SIZE;index++)
count+=(fBuckets[index]==0?0:fBuckets[index]->size());
return count;
}
-DOMNode * DOMNamedNodeMapImpl::item(XMLSize_t index) const
+DOMNode * DOMNamedNodeMapImpl::item(unsigned int index) const
{
- XMLSize_t count=0;
- for(XMLSize_t i=0;i<MAP_SIZE;i++) {
+ unsigned int count=0;
+ for(unsigned int i=0;i<MAP_SIZE;i++) {
if(fBuckets[i]==0)
continue;
- XMLSize_t thisBucket=fBuckets[i]->size();
+ unsigned int thisBucket=fBuckets[i]->size();
if(index>=count && index<(count+thisBucket))
return fBuckets[i]->elementAt(index-count);
count+=thisBucket;
@@ -100,8 +100,8 @@
if(fBuckets[hash]==0)
return 0;
- int i = 0;
- int size = fBuckets[hash]->size();
+ unsigned int i = 0;
+ unsigned int size = fBuckets[hash]->size();
for (i = 0; i < size; ++i) {
DOMNode *n=fBuckets[hash]->elementAt(i);
if(XMLString::equals(name,n->getNodeName()))
@@ -129,8 +129,8 @@
if(fBuckets[hash]==0)
throw DOMException(DOMException::NOT_FOUND_ERR, 0, GetDOMNamedNodeMapMemoryManager);
- int i = 0;
- int size = fBuckets[hash]->size();
+ unsigned int i = 0;
+ unsigned int size = fBuckets[hash]->size();
for (i = 0; i < size; ++i) {
DOMNode *n=fBuckets[hash]->elementAt(i);
if(XMLString::equals(name,n->getNodeName())) {
@@ -175,8 +175,8 @@
if(fBuckets[hash]==0)
fBuckets[hash] = new (doc) DOMNodeVector(doc, 3);
- int i = 0;
- int size = fBuckets[hash]->size();
+ unsigned int i = 0;
+ unsigned int size = fBuckets[hash]->size();
for (i = 0; i < size; ++i) {
DOMNode *n=fBuckets[hash]->elementAt(i);
if(XMLString::equals(name,n->getNodeName())) {
@@ -198,8 +198,8 @@
for (int index = 0; index < MAP_SIZE; index++) {
if(fBuckets[index]==0)
continue;
- int sz = fBuckets[index]->size();
- for (int i=0; i<sz; ++i)
+ unsigned int sz = fBuckets[index]->size();
+ for (unsigned int i=0; i<sz; ++i)
castToNodeImpl(fBuckets[index]->elementAt(i))->setReadOnly(readOnl, deep);
}
}
@@ -216,8 +216,8 @@
if(fBuckets[index]==0)
continue;
- int i = 0;
- int size = fBuckets[index]->size();
+ unsigned int i = 0;
+ unsigned int size = fBuckets[index]->size();
for (i = 0; i < size; ++i) {
DOMNode *n=fBuckets[index]->elementAt(i);
const XMLCh * nNamespaceURI = n->getNamespaceURI();
@@ -267,8 +267,8 @@
if(fBuckets[index]==0)
continue;
- int i = 0;
- int size = fBuckets[index]->size();
+ unsigned int i = 0;
+ unsigned int size = fBuckets[index]->size();
for (i = 0; i < size; ++i) {
DOMNode *n=fBuckets[index]->elementAt(i);
const XMLCh * nNamespaceURI = n->getNamespaceURI();
@@ -310,8 +310,8 @@
if(fBuckets[index]==0)
continue;
- int i = 0;
- int size = fBuckets[index]->size();
+ unsigned int i = 0;
+ unsigned int size = fBuckets[index]->size();
for (i = 0; i < size; ++i) {
DOMNode *n=fBuckets[index]->elementAt(i);
const XMLCh * nNamespaceURI = n->getNamespaceURI();
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp Fri Jul 6 11:08:39 2007
@@ -57,8 +57,8 @@
virtual DOMNamedNodeMapImpl *cloneMap(DOMNode *ownerNode);
virtual void setReadOnly(bool readOnly, bool deep);
- virtual XMLSize_t getLength() const;
- virtual DOMNode* item(XMLSize_t index) const;
+ virtual unsigned int getLength() const;
+ virtual DOMNode* item(unsigned int index) const;
virtual DOMNode* getNamedItem(const XMLCh *name) const;
virtual DOMNode* setNamedItem(DOMNode *arg);
virtual DOMNode* removeNamedItem(const XMLCh *name);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.cpp Fri Jul 6 11:08:39 2007
@@ -51,11 +51,11 @@
}
fSize = gPrimes[fSizeIndex];
- fMaxEntries = (XMLSize_t)(float(fSize) * gMaxFill);
+ fMaxEntries = (unsigned int)(float(fSize) * gMaxFill);
//fTable = new (fDoc) DOMAttr*[fSize];
fTable = (DOMAttr**) ((DOMDocumentImpl *)fDoc)->allocate(sizeof(DOMAttr*) * fSize);
- XMLSize_t i;
+ unsigned int i;
for (i=0; i<fSize; i++)
fTable[i] = 0;
}
@@ -86,9 +86,9 @@
// An initial hash of zero would cause the rehash to fail.
//
const XMLCh *id=attr->getValue();
- XMLSize_t initalHash = XMLString::hash(id, fSize-1, ((DOMDocumentImpl *)fDoc)->getMemoryManager());
+ unsigned int initalHash = XMLString::hash(id, fSize-1, ((DOMDocumentImpl *)fDoc)->getMemoryManager());
initalHash++;
- XMLSize_t currentHash = initalHash;
+ unsigned int currentHash = initalHash;
//
// Loop looking for an empty slot for this ID.
@@ -119,9 +119,9 @@
// An initial hash of zero would cause the rehash to fail.
//
const XMLCh *id=attr->getValue();
- XMLSize_t initalHash = XMLString::hash(id, fSize-1, ((DOMDocumentImpl *)fDoc)->getMemoryManager());
+ unsigned int initalHash = XMLString::hash(id, fSize-1, ((DOMDocumentImpl *)fDoc)->getMemoryManager());
initalHash++;
- XMLSize_t currentHash = initalHash;
+ unsigned int currentHash = initalHash;
//
// Loop looking for a slot pointing to an attr with this id.
@@ -152,9 +152,9 @@
//
// Get the hashcode for the supplied string.
//
- XMLSize_t initalHash = XMLString::hash(id, fSize-1, ((DOMDocumentImpl *)fDoc)->getMemoryManager());
+ unsigned int initalHash = XMLString::hash(id, fSize-1, ((DOMDocumentImpl *)fDoc)->getMemoryManager());
initalHash++;
- XMLSize_t currentHash = initalHash;
+ unsigned int currentHash = initalHash;
//
// Loop looking for a slot pointing to an attr with this id.
@@ -182,7 +182,7 @@
void DOMNodeIDMap::growTable()
{
DOMAttr **oldTable = fTable;
- XMLSize_t oldSize = fSize;
+ unsigned int oldSize = fSize;
//
// Figure the new table size.
@@ -205,11 +205,11 @@
//
//fTable = new (fDoc) DOMAttr *[fSize];
fTable = (DOMAttr**) ((DOMDocumentImpl *)fDoc)->allocate(sizeof(DOMAttr*) * fSize);
- XMLSize_t i;
+ unsigned int i;
for (i=0; i<fSize; i++)
fTable[i] = 0;
- fMaxEntries = (XMLSize_t)(float(fSize) * gMaxFill);
+ fMaxEntries = (unsigned int)(float(fSize) * gMaxFill);
//
// Move entries over from the old table to the new one.
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIDMap.hpp Fri Jul 6 11:08:39 2007
@@ -71,14 +71,14 @@
private:
DOMAttr **fTable;
- XMLSize_t fSizeIndex; // Index of the current table size in the
- // array of possible table sizes.
- XMLSize_t fSize; // The current size of the table array
- // (number of slots, not bytes.)
- XMLSize_t fNumEntries; // The number of entries used.
- XMLSize_t fMaxEntries; // The max number of entries to use before
- // growing the table.
- DOMDocument *fDoc; // The owning document.
+ unsigned int fSizeIndex; // Index of the current table size in the
+ // array of possible table sizes.
+ unsigned int fSize; // The current size of the table array
+ // (number of slots, not bytes.)
+ unsigned int fNumEntries; // The number of entries used.
+ unsigned int fMaxEntries; // The max number of entries to use before
+ // growing the table.
+ DOMDocument *fDoc; // The owning document.
};
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.cpp Fri Jul 6 11:08:39 2007
@@ -512,9 +512,9 @@
DOMNamedNodeMap *nodeMap = thisNode->getAttributes();
if(nodeMap != 0) {
- int length = nodeMap->getLength();
+ unsigned int length = nodeMap->getLength();
- for (int i = 0;i < length;i++) {
+ for (unsigned int i = 0;i < length;i++) {
DOMNode *attr = nodeMap->item(i);
const XMLCh* attrPrefix = attr->getPrefix();
const XMLCh* value = attr->getNodeValue();
@@ -563,8 +563,8 @@
if (thisNode->hasAttributes()) {
DOMNamedNodeMap *nodeMap = thisNode->getAttributes();
if(nodeMap != 0) {
- int length = nodeMap->getLength();
- for (int i = 0;i < length;i++) {
+ unsigned int length = nodeMap->getLength();
+ for (unsigned int i = 0;i < length;i++) {
DOMNode *attr = nodeMap->item(i);
const XMLCh *attrPrefix = attr->getPrefix();
const XMLCh *value = attr->getNodeValue();
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.cpp Fri Jul 6 11:08:39 2007
@@ -43,8 +43,8 @@
-XMLSize_t DOMNodeListImpl::getLength() const{
- XMLSize_t count = 0;
+unsigned int DOMNodeListImpl::getLength() const{
+ unsigned int count = 0;
if (fNode) {
DOMNode *node = fNode->fFirstChild;
while(node != 0){
@@ -58,10 +58,10 @@
-DOMNode *DOMNodeListImpl::item(XMLSize_t index) const{
+DOMNode *DOMNodeListImpl::item(unsigned int index) const{
if (fNode) {
DOMNode *node = fNode->fFirstChild;
- for(XMLSize_t i=0; i<index && node!=0; ++i)
+ for(unsigned int i=0; i<index && node!=0; ++i)
node = castToChildImpl(node)->nextSibling;
return node;
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp Fri Jul 6 11:08:39 2007
@@ -63,8 +63,8 @@
public:
DOMNodeListImpl(DOMParentNode *node);
virtual ~DOMNodeListImpl();
- virtual DOMNode * item(XMLSize_t index) const;
- virtual XMLSize_t getLength() const;
+ virtual DOMNode * item(unsigned int index) const;
+ virtual unsigned int getLength() const;
};
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.cpp Fri Jul 6 11:08:39 2007
@@ -40,17 +40,17 @@
init(doc, 10);
}
-DOMNodeVector::DOMNodeVector(DOMDocument *doc, XMLSize_t size) {
+DOMNodeVector::DOMNodeVector(DOMDocument *doc, unsigned int size) {
init(doc, size);
}
-void DOMNodeVector::init(DOMDocument *doc, XMLSize_t size) {
+void DOMNodeVector::init(DOMDocument *doc, unsigned int size) {
assert(size > 0);
//data = new (doc) DOMNode *[size];
data = (DOMNode**) ((DOMDocumentImpl *)doc)->allocate(sizeof(DOMNode*) * size);
assert(data != 0);
- XMLSize_t i;
+ unsigned int i;
for (i=0; i<size; i++)
data[i] = 0;
allocatedSize = size;
@@ -71,16 +71,16 @@
void DOMNodeVector::checkSpace() {
if (nextFreeSlot == allocatedSize) {
- XMLSize_t grow = allocatedSize/2;
+ unsigned int grow = allocatedSize/2;
if (grow < 10) grow = 10;
- XMLSize_t newAllocatedSize = allocatedSize + grow;
+ unsigned int newAllocatedSize = allocatedSize + grow;
DOMDocument *doc = data[0]->getOwnerDocument();
//DOMNode **newData = new (doc) DOMNode *[newAllocatedSize];
DOMNode **newData = (DOMNode**) ((DOMDocumentImpl *)doc)->allocate(sizeof(DOMNode*) * newAllocatedSize);
assert(newData != 0);
- for (XMLSize_t i=0; i<allocatedSize; i++) {
+ for (unsigned int i=0; i<allocatedSize; i++) {
newData[i] = data[i];
}
// delete [] data; // revisit. Can't delete! Recycle?
@@ -90,8 +90,8 @@
}
-void DOMNodeVector::insertElementAt(DOMNode *elem, XMLSize_t index) {
- XMLSize_t i;
+void DOMNodeVector::insertElementAt(DOMNode *elem, unsigned int index) {
+ unsigned int i;
assert(index <= nextFreeSlot);
@@ -105,9 +105,9 @@
}
-void DOMNodeVector::removeElementAt(XMLSize_t index) {
+void DOMNodeVector::removeElementAt(unsigned int index) {
assert(index < nextFreeSlot);
- for (XMLSize_t i=index; i<nextFreeSlot-1; ++i) {
+ for (unsigned int i=index; i<nextFreeSlot-1; ++i) {
data[i] = data[i+1];
}
--nextFreeSlot;
@@ -117,7 +117,7 @@
nextFreeSlot = 0;
}
-void DOMNodeVector::setElementAt(DOMNode *elem, XMLSize_t index) {
+void DOMNodeVector::setElementAt(DOMNode *elem, unsigned int index) {
assert(index < nextFreeSlot);
data[index] = elem;
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp Fri Jul 6 11:08:39 2007
@@ -43,9 +43,9 @@
class DOMNodeVector {
private:
DOMNode **data;
- XMLSize_t allocatedSize;
- XMLSize_t nextFreeSlot;
- void init(DOMDocument *doc, XMLSize_t size);
+ unsigned int allocatedSize;
+ unsigned int nextFreeSlot;
+ void init(DOMDocument *doc, unsigned int size);
void checkSpace();
// unimplemented
@@ -54,20 +54,20 @@
public:
DOMNodeVector(DOMDocument *doc);
- DOMNodeVector(DOMDocument *doc, XMLSize_t size);
+ DOMNodeVector(DOMDocument *doc, unsigned int size);
~DOMNodeVector();
- XMLSize_t size();
- DOMNode* elementAt(XMLSize_t index);
+ unsigned int size();
+ DOMNode* elementAt(unsigned int index);
DOMNode* lastElement();
void addElement(DOMNode *);
- void insertElementAt(DOMNode *, XMLSize_t index);
- void setElementAt(DOMNode *val, XMLSize_t index);
- void removeElementAt(XMLSize_t index);
+ void insertElementAt(DOMNode *, unsigned int index);
+ void setElementAt(DOMNode *val, unsigned int index);
+ void removeElementAt(unsigned int index);
void reset();
};
-inline DOMNode *DOMNodeVector::elementAt(XMLSize_t index) {
+inline DOMNode *DOMNodeVector::elementAt(unsigned int index) {
if (index >= nextFreeSlot)
return 0;
return data[index];
@@ -79,7 +79,7 @@
return data[nextFreeSlot-1];
}
-inline XMLSize_t DOMNodeVector::size() {
+inline unsigned int DOMNodeVector::size() {
return nextFreeSlot;
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp Fri Jul 6 11:08:39 2007
@@ -176,7 +176,7 @@
else {
//this is done in namespace fixup so no need to do it if namespace is on
if(attrMap) {
- for(XMLSize_t i = 0; i < attrMap->getLength(); i++) {
+ for(unsigned int i = 0; i < attrMap->getLength(); i++) {
attrMap->item(i)->normalize();
}
}
@@ -247,9 +247,9 @@
void DOMNormalizer::namespaceFixUp(DOMElementImpl *ele) const {
DOMAttrMapImpl *attrMap = ele->fAttributes;
- int len = attrMap->getLength();
+ unsigned int len = attrMap->getLength();
//get the ns info from the attrs
- for(int i = 0; i < len; i++) {
+ for(unsigned int i = 0; i < len; i++) {
DOMAttr *at = (DOMAttr*)attrMap->item(i);
//normalize the attr whatever happens
@@ -300,7 +300,7 @@
len = attrMap->getLength();
// hp aCC complains this i is a redefinition of the i on line 283
- for(int j = 0; j < len; j++) {
+ for(unsigned int j = 0; j < len; j++) {
DOMAttr *at = (DOMAttr*)attrMap->item(j);
const XMLCh *uri = at->getNamespaceURI();
const XMLCh* prefix = at->getPrefix();
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.cpp Fri Jul 6 11:08:39 2007
@@ -257,9 +257,9 @@
if (this->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if ( ranges != 0) {
- XMLSize_t sz = ranges->size();
+ unsigned int sz = ranges->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
ranges->elementAt(i)->updateRangeForInsertedNode(newChild);
}
}
@@ -284,9 +284,9 @@
//notify iterators
NodeIterators* nodeIterators = ((DOMDocumentImpl *)this->getOwnerDocument())->getNodeIterators();
if (nodeIterators != 0) {
- XMLSize_t sz = nodeIterators->size();
+ unsigned int sz = nodeIterators->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
if (nodeIterators->elementAt(i) != 0)
nodeIterators->elementAt(i)->removeNode(oldChild);
}
@@ -296,9 +296,9 @@
//fix other ranges for change before deleting the node
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if (ranges != 0) {
- XMLSize_t sz = ranges->size();
+ unsigned int sz = ranges->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
if (ranges->elementAt(i) != 0)
ranges->elementAt(i)->updateRangeForDeletedNode(oldChild);
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMParentNode.hpp Fri Jul 6 11:08:39 2007
@@ -75,10 +75,10 @@
DOMNodeList* getChildNodes() const;
DOMNode* getFirstChild() const;
DOMNode* getLastChild() const;
- XMLSize_t getLength() const;
+ unsigned int getLength() const;
bool hasChildNodes() const;
DOMNode* insertBefore(DOMNode *newChild, DOMNode *refChild);
- DOMNode* item(XMLSize_t index) const;
+ DOMNode* item(unsigned int index) const;
DOMNode* removeChild(DOMNode *oldChild);
DOMNode* replaceChild(DOMNode *newChild, DOMNode *oldChild);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp Fri Jul 6 11:08:39 2007
@@ -145,9 +145,9 @@
if (this->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if (ranges != 0) {
- XMLSize_t sz = ranges->size();
+ unsigned int sz = ranges->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
ranges->elementAt(i)->updateSplitInfo( this, newText, offset);
}
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.cpp Fri Jul 6 11:08:39 2007
@@ -39,19 +39,19 @@
fList->addElement((XMLCh*)str);
}
-XMLSize_t DOMStringListImpl::getLength() const{
+unsigned int DOMStringListImpl::getLength() const{
return fList->size();
}
-const XMLCh* DOMStringListImpl::item(XMLSize_t index) const{
+const XMLCh* DOMStringListImpl::item(unsigned int index) const{
if(index<fList->size())
return fList->elementAt(index);
return 0;
}
bool DOMStringListImpl::contains(const XMLCh* str) const{
- for(XMLSize_t i=0;i<fList->size();i++)
+ for(unsigned int i=0;i<fList->size();i++)
if(XMLString::equals(fList->elementAt(i), str))
return true;
return false;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp Fri Jul 6 11:08:39 2007
@@ -44,10 +44,10 @@
void add(const XMLCh* impl);
virtual ~DOMStringListImpl();
- virtual const XMLCh* item(XMLSize_t index) const;
- virtual XMLSize_t getLength() const;
- virtual bool contains(const XMLCh* str) const;
- virtual void release();
+ virtual const XMLCh* item(unsigned int index) const;
+ virtual unsigned int getLength() const;
+ virtual bool contains(const XMLCh* str) const;
+ virtual void release();
};
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp Fri Jul 6 11:08:39 2007
@@ -104,9 +104,9 @@
if (this->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if (ranges != 0) {
- XMLSize_t sz = ranges->size();
+ unsigned int sz = ranges->size();
if (sz != 0) {
- for (XMLSize_t i =0; i<sz; i++) {
+ for (unsigned int i =0; i<sz; i++) {
ranges->elementAt(i)->updateSplitInfo( this, newText, offset);
}
}
Modified: xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp Fri Jul 6 11:08:39 2007
@@ -844,7 +844,7 @@
resetBuffer();
- int bytesRead = fInputStream->readBytes(fBufStart, fBufSize);
+ XMLSize_t bytesRead = fInputStream->readBytes(fBufStart, fBufSize);
/***
* InputStream MUST fill in the exact amount of bytes as requested
Modified: xerces/c/trunk/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/ListDatatypeValidator.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/datatype/ListDatatypeValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/datatype/ListDatatypeValidator.cpp Fri Jul 6 11:08:39 2007
@@ -372,9 +372,9 @@
/***
* 2.5.1.2 List datatypes
*
- * The canonical-lexical-representation for the �list� datatype is defined as
- * the lexical form in which each item in the �list� has the canonical
- * lexical representation of its �itemType�.
+ * The canonical-lexical-representation for the list datatype is defined as
+ * the lexical form in which each item in the list has the canonical
+ * lexical representation of its itemType.
***/
const XMLCh* ListDatatypeValidator::getCanonicalRepresentation(const XMLCh* const rawData
, MemoryManager* const memMgr
Modified: xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.cpp Fri Jul 6 11:08:39 2007
@@ -252,12 +252,12 @@
const XMLCh* contextStr = (isTopLevel) ? fgGlobal : fgLocal;
DOMNamedNodeMap* eltAttrs = elem->getAttributes();
- int attrCount = eltAttrs->getLength();
+ unsigned int attrCount = eltAttrs->getLength();
XMLByte attList[A_Count];
memset(attList, 0, sizeof(attList));
- for (int i = 0; i < attrCount; i++) {
+ for (unsigned int i = 0; i < attrCount; i++) {
DOMNode* attribute = eltAttrs->item(i);
const XMLCh* attName = attribute->getNodeName();
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Fri Jul 6 11:08:39 2007
@@ -4647,9 +4647,9 @@
DOMNamedNodeMap* eltAttrs = elem->getAttributes();
bool seenNS=false;
- int attrCount = eltAttrs->getLength();
+ unsigned int attrCount = eltAttrs->getLength();
- for (int i = 0; i < attrCount; i++) {
+ for (unsigned int i = 0; i < attrCount; i++) {
DOMNode* attribute = eltAttrs->item(i);
@@ -9022,11 +9022,11 @@
// next is the namespaces on the elem
DOMElement* currentElem = (DOMElement*) elem;
DOMNamedNodeMap* eltAttrs;
- int attrCount;
+ unsigned int attrCount;
do {
eltAttrs = currentElem->getAttributes();
attrCount = eltAttrs->getLength();
- for (int j = 0; j < attrCount; j++)
+ for (unsigned int j = 0; j < attrCount; j++)
{
DOMNode* attribute = eltAttrs->item(j);
const XMLCh* attName = attribute->getNodeName();
Modified: xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp (original)
+++ xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp Fri Jul 6 11:08:39 2007
@@ -99,8 +99,8 @@
if(elem->hasAttributes()) {
/* get all the attributes of the node */
DOMNamedNodeMap *pAttributes = elem->getAttributes();
- int nSize = pAttributes->getLength();
- for(int i=0;i<nSize;++i) {
+ unsigned int nSize = pAttributes->getLength();
+ for(unsigned int i=0;i<nSize;++i) {
DOMAttr *pAttributeNode = (DOMAttr*) pAttributes->item(i);
/* get attribute name */
if (XMLString::equals(pAttributeNode->getName(), XIncludeUtils::fgXIBaseAttrName)){
@@ -135,8 +135,8 @@
if(xincludeNode->hasAttributes()) {
/* get all the attributes of the node */
DOMNamedNodeMap *pAttributes = xincludeNode->getAttributes();
- int nSize = pAttributes->getLength();
- for(int i=0;i<nSize;++i) {
+ unsigned int nSize = pAttributes->getLength();
+ for(unsigned int i=0;i<nSize;++i) {
DOMAttr *pAttributeNode = (DOMAttr*) pAttributes->item(i);
const XMLCh *attrName = pAttributeNode->getName();
/* check each attribute against the potential useful names */
@@ -314,8 +314,8 @@
// check for NOTATION or ENTITY clash
if(child->getNodeType()==DOMNode::ELEMENT_NODE && includedDoc->getDoctype()!=NULL) {
DOMNamedNodeMap *pAttributes = child->getAttributes();
- int nSize = pAttributes->getLength();
- for(int i=0;i<nSize;++i) {
+ unsigned int nSize = pAttributes->getLength();
+ for(unsigned int i=0;i<nSize;++i) {
DOMAttr *pAttributeNode = (DOMAttr*) pAttributes->item(i);
const DOMTypeInfo * typeInfo=pAttributeNode->getSchemaTypeInfo();
if(typeInfo && XMLString::equals(typeInfo->getTypeNamespace(), XMLUni::fgInfosetURIName)) {
Modified: xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp Fri Jul 6 11:08:39 2007
@@ -433,7 +433,7 @@
TASSERT(textLength == 5);
DOMNodeList* nl = tx->getChildNodes();
- int nodeListLen = nl->getLength();
+ unsigned int nodeListLen = nl->getLength();
TASSERT(nodeListLen == 0);
nl = el->getChildNodes();
@@ -458,7 +458,7 @@
nl = doc->getChildNodes(); // Should be non-null, but empty
TASSERT(nl != 0);
- int len = nl->getLength();
+ unsigned int len = nl->getLength();
TASSERT(len == 0);
DOMElement* el = doc->createElement(X("NodeList01"));
Modified: xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp Fri Jul 6 11:08:39 2007
@@ -2196,8 +2196,8 @@
XMLString::transcode("*", tempStr, 3999);
DOMNodeList* docElements = document->getElementsByTagName(tempStr);
- int docSize = docElements->getLength();
- int i;
+ unsigned int docSize = docElements->getLength();
+ unsigned int i;
for (i = 0; i < docSize; i++)
{
DOMNode* n = (DOMNode*) docElements->item(i);
@@ -2870,8 +2870,8 @@
if (rem2)
rem2->release();
nodeMap = element->getAttributes();
- int size = nodeMap->getLength();
- int k;
+ unsigned int size = nodeMap->getLength();
+ unsigned int k;
for (k = 0; k < size; k++)
{
DOMNode* n = (DOMNode) nodeMap->item(k);
@@ -2888,7 +2888,7 @@
#endif
nodeMap = element->getAttributes();
- int size = nodeMap->getLength();
+ unsigned int size = nodeMap->getLength();
if (size != 2)
{
fprintf(stderr, "DOMElement* Tests Failure 001\n");
@@ -2928,8 +2928,8 @@
XMLString::transcode("*",tempStr, 3999);
DOMNodeList* docElements = document->getElementsByTagName(tempStr);
- int docSize = docElements->getLength();
- int i;
+ unsigned int docSize = docElements->getLength();
+ unsigned int i;
for (i = 0; i < docSize; i++)
{
DOMNode* n = docElements->item(i);
Modified: xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp (original)
+++ xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp Fri Jul 6 11:08:39 2007
@@ -413,8 +413,8 @@
XMLCh tempStr[4000];
XMLString::transcode("testFile", tempStr, 3999);
DOMNodeList* list = fileListDoc->getElementsByTagName(tempStr);
- int i;
- int numFiles = list->getLength();
+ unsigned int i;
+ unsigned int numFiles = list->getLength();
for (i=0; i<numFiles; i++)
{
++gTestsRun;
Modified: xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp?view=diff&rev=553979&r1=553978&r2=553979
==============================================================================
--- xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp (original)
+++ xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp Fri Jul 6 11:08:39 2007
@@ -656,8 +656,8 @@
void ThreadParser::SAXHandler::startElement(const XMLCh *const name, AttributeList &attributes)
{
SAXInstance->addToCheckSum(name);
- int n = attributes.getLength();
- int i;
+ unsigned int n = attributes.getLength();
+ unsigned int i;
for (i=0; i<n; i++)
{
const XMLCh *attNam = attributes.getName(i);
@@ -680,8 +680,8 @@
{
SAX2Instance->addToCheckSum(localname);
- int n = attributes.getLength();
- int i;
+ unsigned int n = attributes.getLength();
+ unsigned int i;
for (i=0; i<n; i++)
{
const XMLCh *attNam = attributes.getQName(i);
@@ -708,8 +708,8 @@
s = node->getNodeName(); // the element name
attributes = node->getAttributes(); // Element's attributes
- int numAttributes = attributes->getLength();
- int i;
+ unsigned int numAttributes = attributes->getLength();
+ unsigned int i;
for (i=0; i<numAttributes; i++)
domCheckSum(attributes->item(i));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org