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 2008/07/02 18:00:35 UTC
svn commit: r673428 - in /xerces/c/trunk/src/xercesc: dom/impl/ xinclude/
Author: amassari
Date: Wed Jul 2 09:00:35 2008
New Revision: 673428
URL: http://svn.apache.org/viewvc?rev=673428&view=rev
Log:
Fixed warnings
Modified:
xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.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/DOMImplementationRegistry.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp
xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
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?rev=673428&r1=673427&r2=673428&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp Wed Jul 2 09:00:35 2008
@@ -398,8 +398,8 @@
cloneContent(defaults);
}
else {
- unsigned int dsize = defaults->getLength();
- for (unsigned int n = 0; n < dsize; n++) {
+ XMLSize_t dsize = defaults->getLength();
+ for (XMLSize_t n = 0; n < dsize; n++) {
DOMAttr* attr = (DOMAttr*)defaults->item(n);
DOMAttr* newAttr = (DOMAttr*)attr->cloneNode(true);
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?rev=673428&r1=673427&r2=673428&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp Wed Jul 2 09:00:35 2008
@@ -466,11 +466,11 @@
DOMNamedNodeMap* map1 = getNotations();
DOMNamedNodeMap* map2 = argDT->getNotations();
- unsigned int len = map1->getLength();
+ XMLSize_t len = map1->getLength();
if (len != map2->getLength()) {
return false;
}
- for (unsigned int i = 0; i < len; i++) {
+ for (XMLSize_t i = 0; i < len; i++) {
DOMNode* n1 = map1->item(i);
DOMNode* n2 = map2->getNamedItem(n1->getNodeName());
if (!n2 || !n1->isEqualNode(n2)) {
@@ -491,11 +491,11 @@
DOMNamedNodeMap* map1 = getEntities();
DOMNamedNodeMap* map2 = argDT->getEntities();
- unsigned int len = map1->getLength();
+ XMLSize_t len = map1->getLength();
if (len != map2->getLength()) {
return false;
}
- for (unsigned int i = 0; i < len; i++) {
+ for (XMLSize_t 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?rev=673428&r1=673427&r2=673428&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp Wed Jul 2 09:00:35 2008
@@ -590,11 +590,11 @@
DOMNamedNodeMap* map1 = getAttributes();
DOMNamedNodeMap* map2 = arg->getAttributes();
- unsigned int len = map1->getLength();
+ XMLSize_t len = map1->getLength();
if (len != map2->getLength()) {
return false;
}
- for (unsigned int i = 0; i < len; i++) {
+ for (XMLSize_t 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/DOMImplementationRegistry.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationRegistry.cpp?rev=673428&r1=673427&r2=673428&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationRegistry.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationRegistry.cpp Wed Jul 2 09:00:35 2008
@@ -97,8 +97,8 @@
for (unsigned int i = len; i > 0; i--) {
DOMImplementationSource* source = gDOMImplSrcVector->elementAt(i-1);
DOMImplementationList* oneList = source->getDOMImplementationList(features);
- unsigned int oneListLen=oneList->getLength();
- for(unsigned int j=0; j<oneListLen; j++)
+ XMLSize_t oneListLen=oneList->getLength();
+ for(XMLSize_t 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?rev=673428&r1=673427&r2=673428&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp Wed Jul 2 09:00:35 2008
@@ -809,7 +809,7 @@
// Output any attributes on this element
setURCharRef();
DOMNamedNodeMap *attributes = nodeToWrite->getAttributes();
- unsigned int attrCount = attributes->getLength();
+ XMLSize_t attrCount = attributes->getLength();
// check if the namespace for the current node is already defined
const XMLCh* prefix = nodeToWrite->getPrefix();
@@ -839,7 +839,7 @@
}
bool discard = getFeature(DISCARD_DEFAULT_CONTENT_ID);
- for (unsigned int i = 0; i < attrCount; i++)
+ for (XMLSize_t i = 0; i < attrCount; i++)
{
DOMAttrSPtr attribute = (DOMAttr*)attributes->item(i);
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?rev=673428&r1=673427&r2=673428&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.cpp Wed Jul 2 09:00:35 2008
@@ -479,9 +479,9 @@
DOMNamedNodeMap *nodeMap = thisNode->getAttributes();
if(nodeMap != 0) {
- unsigned int length = nodeMap->getLength();
+ XMLSize_t length = nodeMap->getLength();
- for (unsigned int i = 0;i < length;i++) {
+ for (XMLSize_t i = 0;i < length;i++) {
DOMNode *attr = nodeMap->item(i);
const XMLCh* attrPrefix = attr->getPrefix();
const XMLCh* value = attr->getNodeValue();
@@ -530,8 +530,8 @@
if (thisNode->hasAttributes()) {
DOMNamedNodeMap *nodeMap = thisNode->getAttributes();
if(nodeMap != 0) {
- unsigned int length = nodeMap->getLength();
- for (unsigned int i = 0;i < length;i++) {
+ XMLSize_t length = nodeMap->getLength();
+ for (XMLSize_t 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/DOMNormalizer.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp?rev=673428&r1=673427&r2=673428&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp Wed Jul 2 09:00:35 2008
@@ -181,9 +181,9 @@
void DOMNormalizer::namespaceFixUp(DOMElementImpl *ele) const {
DOMAttrMapImpl *attrMap = ele->fAttributes;
- unsigned int len = attrMap->getLength();
+ XMLSize_t len = attrMap->getLength();
//get the ns info from the attrs
- for(unsigned int i = 0; i < len; i++) {
+ for(XMLSize_t i = 0; i < len; i++) {
DOMAttr *at = (DOMAttr*)attrMap->item(i);
//normalize the attr whatever happens
@@ -234,7 +234,7 @@
len = attrMap->getLength();
// hp aCC complains this i is a redefinition of the i on line 283
- for(unsigned int j = 0; j < len; j++) {
+ for(XMLSize_t 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/DOMXPathExpressionImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp?rev=673428&r1=673427&r2=673428&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp Wed Jul 2 09:00:35 2008
@@ -169,9 +169,9 @@
QName qName(node->getNodeName(), uriId, fMemoryManager);
SchemaElementDecl elemDecl(&qName);
DOMNamedNodeMap* attrMap=node->getAttributes();
- unsigned int attrCount = attrMap->getLength();
+ XMLSize_t attrCount = attrMap->getLength();
RefVectorOf<XMLAttr> attrList(attrCount, true, fMemoryManager);
- for(unsigned int i=0;i<attrCount;i++)
+ for(XMLSize_t i=0;i<attrCount;i++)
{
DOMAttr* attr=(DOMAttr*)attrMap->item(i);
attrList.addElement(new (fMemoryManager) XMLAttr(fStringPool->addOrFind(attr->getNamespaceURI()),
Modified: xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp?rev=673428&r1=673427&r2=673428&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp (original)
+++ xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp Wed Jul 2 09:00:35 2008
@@ -99,8 +99,8 @@
if(elem->hasAttributes()) {
/* get all the attributes of the node */
DOMNamedNodeMap *pAttributes = elem->getAttributes();
- unsigned int nSize = pAttributes->getLength();
- for(unsigned int i=0;i<nSize;++i) {
+ XMLSize_t nSize = pAttributes->getLength();
+ for(XMLSize_t 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();
- unsigned int nSize = pAttributes->getLength();
- for(unsigned int i=0;i<nSize;++i) {
+ XMLSize_t nSize = pAttributes->getLength();
+ for(XMLSize_t i=0;i<nSize;++i) {
DOMAttr *pAttributeNode = (DOMAttr*) pAttributes->item(i);
const XMLCh *attrName = pAttributeNode->getName();
/* check each attribute against the potential useful names */
@@ -319,8 +319,8 @@
// check for NOTATION or ENTITY clash
if(child->getNodeType()==DOMNode::ELEMENT_NODE && includedDoc->getDoctype()!=NULL) {
DOMNamedNodeMap *pAttributes = child->getAttributes();
- unsigned int nSize = pAttributes->getLength();
- for(unsigned int i=0;i<nSize;++i) {
+ XMLSize_t nSize = pAttributes->getLength();
+ for(XMLSize_t i=0;i<nSize;++i) {
DOMAttr *pAttributeNode = (DOMAttr*) pAttributes->item(i);
const DOMTypeInfo * typeInfo=pAttributeNode->getSchemaTypeInfo();
if(typeInfo && XMLString::equals(typeInfo->getTypeNamespace(), XMLUni::fgInfosetURIName)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org