Author: dbertoni
Date: Mon Jul 14 22:04:13 2008
New Revision: 676796
URL: http://svn.apache.org/viewvc?rev=676796&view=rev
Log:
More cleanup for unsigned int/XMLSize_t changes and various compiler warnings.
Modified:
xerces/c/trunk/samples/src/CreateDOMDocument/CreateDOMDocument.cpp
xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp
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/framework/psvi/PSVIHandler.hpp
xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp
xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp
xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp
xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp
xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp
Modified: xerces/c/trunk/samples/src/CreateDOMDocument/CreateDOMDocument.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/CreateDOMDocument/CreateDOMDocument.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/CreateDOMDocument/CreateDOMDocument.cpp
(original)
+++ xerces/c/trunk/samples/src/CreateDOMDocument/CreateDOMDocument.cpp Mon Jul
14 22:04:13 2008
@@ -171,7 +171,7 @@
// Now count the number of elements in the above DOM tree.
//
- unsigned int elementCount =
doc->getElementsByTagName(X("*"))->getLength();
+ const XMLSize_t elementCount =
doc->getElementsByTagName(X("*"))->getLength();
XERCES_STD_QUALIFIER cout << "The tree just created contains: "
<< elementCount
<< " elements." << XERCES_STD_QUALIFIER endl;
@@ -203,4 +203,3 @@
XMLPlatformUtils::Terminate();
return errorCode;
}
-
Modified: xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp (original)
+++ xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp Mon Jul 14 22:04:13 2008
@@ -96,10 +96,10 @@
if(n->hasAttributes()) {
// get all the attributes of the node
DOMNamedNodeMap *pAttributes = n->getAttributes();
- unsigned int nSize = pAttributes->getLength();
+ const XMLSize_t nSize = pAttributes->getLength();
XERCES_STD_QUALIFIER cout <<"\tAttributes" <<
XERCES_STD_QUALIFIER endl;
XERCES_STD_QUALIFIER cout <<"\t----------" <<
XERCES_STD_QUALIFIER endl;
- for(unsigned int i=0;i<nSize;++i) {
+ for(XMLSize_t 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/dom/impl/DOMAttrMapImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp Mon Jul 14 22:04:13
2008
@@ -210,8 +210,8 @@
// 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.
- unsigned int i, len = fNodes -> size();
- for (i = 0; i < len; ++i) {
+ const XMLSize_t len = fNodes -> size();
+ for (XMLSize_t i = 0; i < len; ++i) {
DOMNode *node = fNodes -> elementAt(i);
const XMLCh * nNamespaceURI = node->getNamespaceURI();
const XMLCh * nLocalName = node->getLocalName();
@@ -221,7 +221,7 @@
if (XMLString::equals(localName, nLocalName)
||
(nLocalName == 0 && XMLString::equals(localName,
node->getNodeName())))
- return i;
+ return (int)i;
}
}
return -1; //not found
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?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp Mon Jul 14 22:04:13
2008
@@ -1395,6 +1395,8 @@
return ((DOMElementImpl*)n)->rename(namespaceURI, name);
case ATTRIBUTE_NODE:
return ((DOMAttrImpl*)n)->rename(namespaceURI, name);
+ default:
+ break;
}
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
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?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.cpp Mon Jul 14 22:04:13
2008
@@ -40,18 +40,17 @@
init(doc, 10);
}
-DOMNodeVector::DOMNodeVector(DOMDocument *doc, unsigned int size) {
+DOMNodeVector::DOMNodeVector(DOMDocument *doc, XMLSize_t size) {
init(doc, size);
}
-void DOMNodeVector::init(DOMDocument *doc, unsigned int size) {
+void DOMNodeVector::init(DOMDocument *doc, XMLSize_t size) {
assert(size > 0);
//data = new (doc) DOMNode *[size];
data = (DOMNode**) ((DOMDocumentImpl *)doc)->allocate(sizeof(DOMNode*) *
size);
assert(data != 0);
- unsigned int i;
- for (i=0; i<size; i++)
+ for (XMLSize_t i=0; i<size; i++)
data[i] = 0;
allocatedSize = size;
nextFreeSlot = 0;
@@ -71,16 +70,16 @@
void DOMNodeVector::checkSpace() {
if (nextFreeSlot == allocatedSize) {
- unsigned int grow = allocatedSize/2;
+ XMLSize_t grow = allocatedSize/2;
if (grow < 10) grow = 10;
- unsigned int newAllocatedSize = allocatedSize + grow;
+ const XMLSize_t 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 (unsigned int i=0; i<allocatedSize; i++) {
+ for (XMLSize_t i=0; i<allocatedSize; i++) {
newData[i] = data[i];
}
// delete [] data; // revisit. Can't delete! Recycle?
@@ -90,13 +89,12 @@
}
-void DOMNodeVector::insertElementAt(DOMNode *elem, unsigned int index) {
- unsigned int i;
+void DOMNodeVector::insertElementAt(DOMNode *elem, XMLSize_t index) {
assert(index <= nextFreeSlot);
checkSpace();
- for (i=nextFreeSlot; i>index; --i) {
+ for (XMLSize_t i=nextFreeSlot; i>index; --i) {
data[i] = data[i-1];
}
data[index] = elem;
@@ -105,9 +103,9 @@
}
-void DOMNodeVector::removeElementAt(unsigned int index) {
+void DOMNodeVector::removeElementAt(XMLSize_t index) {
assert(index < nextFreeSlot);
- for (unsigned int i=index; i<nextFreeSlot-1; ++i) {
+ for (XMLSize_t i=index; i<nextFreeSlot-1; ++i) {
data[i] = data[i+1];
}
--nextFreeSlot;
@@ -117,7 +115,7 @@
nextFreeSlot = 0;
}
-void DOMNodeVector::setElementAt(DOMNode *elem, unsigned int index) {
+void DOMNodeVector::setElementAt(DOMNode *elem, XMLSize_t 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?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNodeVector.hpp Mon Jul 14 22:04:13
2008
@@ -43,9 +43,9 @@
class DOMNodeVector {
private:
DOMNode **data;
- unsigned int allocatedSize;
- unsigned int nextFreeSlot;
- void init(DOMDocument *doc, unsigned int size);
+ XMLSize_t allocatedSize;
+ XMLSize_t nextFreeSlot;
+ void init(DOMDocument *doc, XMLSize_t size);
void checkSpace();
// unimplemented
@@ -54,20 +54,20 @@
public:
DOMNodeVector(DOMDocument *doc);
- DOMNodeVector(DOMDocument *doc, unsigned int size);
+ DOMNodeVector(DOMDocument *doc, XMLSize_t size);
~DOMNodeVector();
- unsigned int size();
- DOMNode* elementAt(unsigned int index);
+ XMLSize_t size();
+ DOMNode* elementAt(XMLSize_t index);
DOMNode* lastElement();
void addElement(DOMNode *);
- void insertElementAt(DOMNode *, unsigned int index);
- void setElementAt(DOMNode *val, unsigned int index);
- void removeElementAt(unsigned int index);
+ void insertElementAt(DOMNode *, XMLSize_t index);
+ void setElementAt(DOMNode *val, XMLSize_t index);
+ void removeElementAt(XMLSize_t index);
void reset();
};
-inline DOMNode *DOMNodeVector::elementAt(unsigned int index) {
+inline DOMNode *DOMNodeVector::elementAt(XMLSize_t index) {
if (index >= nextFreeSlot)
return 0;
return data[index];
@@ -79,7 +79,7 @@
return data[nextFreeSlot-1];
}
-inline unsigned int DOMNodeVector::size() {
+inline XMLSize_t 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?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp Mon Jul 14 22:04:13
2008
@@ -172,6 +172,8 @@
}
}
}
+ default:
+ break;
}
return 0;
Modified: xerces/c/trunk/src/xercesc/framework/psvi/PSVIHandler.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/PSVIHandler.hpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/PSVIHandler.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/PSVIHandler.hpp Mon Jul 14
22:04:13 2008
@@ -22,12 +22,14 @@
#if !defined(XERCESC_INCLUDE_GUARD_PSVIHANDLER_HPP)
#define XERCESC_INCLUDE_GUARD_PSVIHANDLER_HPP
-#include <xercesc/framework/psvi/PSVIElement.hpp>
-#include <xercesc/framework/psvi/PSVIAttributeList.hpp>
XERCES_CPP_NAMESPACE_BEGIN
+class PSVIElement;
+class PSVIAttributeList;
+
+
/**
* This abstract class provides the interface for the scanner to return
* PSVI information to the application.
Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp Mon Jul 14 22:04:13
2008
@@ -35,6 +35,7 @@
#include <xercesc/framework/MemoryManager.hpp>
#include <xercesc/framework/XMLGrammarPool.hpp>
#include <xercesc/framework/XMLDTDDescription.hpp>
+#include <xercesc/framework/psvi/PSVIElement.hpp>
#include <xercesc/framework/psvi/PSVIHandler.hpp>
#include <xercesc/framework/psvi/PSVIAttributeList.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp Mon Jul 14 22:04:13
2008
@@ -190,7 +190,7 @@
// If its not a special case namespace attr of some sort, then we
// do normal checking and processing.
- XMLAttDef::AttTypes attType;
+ XMLAttDef::AttTypes attType = XMLAttDef::CData;
DatatypeValidator *attrValidator = 0;
PSVIAttribute *psviAttr = 0;
bool otherXSI = false;
@@ -264,8 +264,6 @@
if (!otherXSI) {
fUndeclaredAttrRegistryNS->put((void *)suffPtr, uriId, 0);
- // Just normalize as CDATA
- attType = XMLAttDef::CData;
normalizeAttRawValue
(
namePtr
@@ -635,7 +633,10 @@
}
// Save the type for later use
- attType = (attDef)?attDef->getType():XMLAttDef::CData;
+ if (attDef)
+ {
+ attType = attDef->getType();
+ }
}
// now fill in the PSVIAttributes entry for this attribute:
Modified: xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp Mon Jul 14 22:04:13
2008
@@ -34,6 +34,7 @@
#include <xercesc/framework/XMLPScanToken.hpp>
#include <xercesc/framework/MemoryManager.hpp>
#include <xercesc/framework/XMLGrammarPool.hpp>
+#include <xercesc/framework/psvi/PSVIElement.hpp>
#include <xercesc/framework/psvi/PSVIHandler.hpp>
#include <xercesc/framework/psvi/PSVIAttributeList.hpp>
#include <xercesc/framework/psvi/XSAnnotation.hpp>
@@ -2207,7 +2208,7 @@
// If its not a special case namespace attr of some sort, then we
// do normal checking and processing.
- XMLAttDef::AttTypes attType;
+ XMLAttDef::AttTypes attType = XMLAttDef::CData;
DatatypeValidator *attrValidator = 0;
PSVIAttribute *psviAttr = 0;
bool otherXSI = false;
@@ -2281,8 +2282,6 @@
if (!otherXSI) {
fUndeclaredAttrRegistryNS->put((void *)suffPtr, uriId, 0);
- // Just normalize as CDATA
- attType = XMLAttDef::CData;
normalizeAttRawValue
(
namePtr
@@ -2608,7 +2607,10 @@
}
// Save the type for later use
- attType = (attDef)?attDef->getType():XMLAttDef::CData;
+ if (attDef)
+ {
+ attType = attDef->getType();
+ }
}
// now fill in the PSVIAttributes entry for this attribute:
Modified: xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp Mon Jul 14
22:04:13 2008
@@ -1919,9 +1919,9 @@
while (e.hasMoreElements())
{
- XMLCh* key1;
+ void* key1;
int key2;
- e.nextElementKey((void*&)key1, key2);
+ e.nextElementKey(key1, key2);
SchemaAttDef* data = objToStore->get(key1, key2);
serEng<<data;
@@ -2017,11 +2017,11 @@
while (e.hasMoreElements())
{
- XMLCh* key1;
+ void* key1;
int key2;
- e.nextElementKey((void*&)key1, key2);
- serEng.writeString(key1);
+ e.nextElementKey(key1, key2);
+ serEng.writeString((const XMLCh*)key1);
serEng<<key2;
ElemVector* data = objToStore->get(key1, key2);
@@ -2135,14 +2135,14 @@
serEng<<e.size();
- XMLCh* strkey;
+ void* strkey;
int key1;
int key2;
/* Update to store key2 separately as for the putGroupElemDecl the key
is not the
enclosing scope but another value. */
while (e.hasMoreKeys())
{
- e.nextElementKey((void*&)strkey, key1, key2);
+ e.nextElementKey(strkey, key1, key2);
serEng<<key2;
SchemaElementDecl* data = objToStore->getByKey(strkey, key1, key2);
serEng<<data;
Modified:
xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
(original)
+++
xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
Mon Jul 14 22:04:13 2008
@@ -97,13 +97,6 @@
fSocket(0)
{
//
- // Constants in ASCII to send/check in the HTTP request/response
- //
-
- static const char *CRLF2X = "\r\n\r\n";
- static const char *LF2X = "\n\n";
-
- //
// Convert the hostName to the platform's code page for gethostbyname and
// inet_addr functions.
//
Modified: xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp Mon Jul 14
22:04:13 2008
@@ -1822,6 +1822,8 @@
}
break;
}
+ default:
+ break;
}
return true;
}
@@ -1843,6 +1845,8 @@
case Token::T_RANGE:
case Token::T_NRANGE:
return ((RangeToken*)token)->match(ch);
+ default:
+ break;
}
}
// in any other case, there is the chance that they overlap
Modified: xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp Mon Jul 14 22:04:13 2008
@@ -780,7 +780,11 @@
return processBacksolidus_lt();
case chCloseAngle:
return processBacksolidus_gt();
+ default:
+ break;
}
+ default:
+ break;
}
Token* tok = parseAtom();
@@ -862,6 +866,8 @@
processNext();
}
break;
+ default:
+ break;
}
return tok;
Modified:
xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp
Mon Jul 14 22:04:13 2008
@@ -126,8 +126,6 @@
false, false, false, false, false, false, false, false, false, false,
false, true , true , true , true , true /* 0x7B:'{', 0x7C:'|', 0x7D:'}',
0x7E:'~', 0x7F:DEL */
};
- int bufferIndex = 0;
-
// For each character in content
XMLSize_t i;
for (i = 0; i < len; i++)
Modified:
xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
Mon Jul 14 22:04:13 2008
@@ -116,7 +116,7 @@
checkValueSpace(content, manager);
- int colonPos;
+ int colonPos = 0;
XMLCh* prefix = 0;
ArrayJanitor<XMLCh> jan(prefix, manager);
@@ -175,7 +175,7 @@
int i=0;
int enumLength = getEnumeration()->size();
bool foundURIId = false;
- const XMLCh* normURI;
+ const XMLCh* normURI = 0;
// The +=2 is because the enumeration has prefix:localname as
one entry followed
// by the URI string for the prefix as the next entry.
for ( ; i < enumLength; i+=2)
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?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Mon Jul 14
22:04:13 2008
@@ -3335,7 +3335,6 @@
// Code was just comparing the string of
prefix:localname
// and if the schema and instance document had
different
// prefixes with the same URI string then we were
giving an error.
- const XMLCh* localPart = getLocalPart(attValue);
const XMLCh* prefix = getPrefix(attValue);
const XMLCh* uriStr = (prefix && *prefix) ?
resolvePrefixToURI(content, prefix) : fTargetNSURIString;
@@ -6710,7 +6709,7 @@
SchemaAttDef* completeWildCard = 0;
Janitor<SchemaAttDef> janCompleteWildCard(0);
- XMLAttDef::DefAttTypes defAttType;
+ XMLAttDef::DefAttTypes defAttType = XMLAttDef::Default;
bool defAttTypeSet = false;
for (unsigned int i=0; i < attGroupListSize; i++) {
@@ -9102,7 +9101,7 @@
do {
eltAttrs = currentElem->getAttributes();
attrCount = eltAttrs->getLength();
- for (unsigned int j = 0; j < attrCount; j++)
+ for (XMLSize_t j = 0; j < attrCount; j++)
{
DOMNode* attribute = eltAttrs->item(j);
const XMLCh* attName = attribute->getNodeName();
Modified: xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp?rev=676796&r1=676795&r2=676796&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp (original)
+++ xerces/c/trunk/tests/src/XSerializerTest/XSerializerHandlers.hpp Mon Jul 14
22:04:13 2008
@@ -43,12 +43,12 @@
// -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
- unsigned int getElementCount() const
+ XMLSize_t getElementCount() const
{
return fElementCount;
}
- unsigned int getAttrCount() const
+ XMLSize_t getAttrCount() const
{
return fAttrCount;
}
@@ -102,9 +102,9 @@
// This is set by the error handlers, and is queryable later to
// see if any errors occured.
// -----------------------------------------------------------------------
- unsigned int fAttrCount;
+ XMLSize_t fAttrCount;
XMLSize_t fCharacterCount;
- unsigned int fElementCount;
+ XMLSize_t fElementCount;
XMLSize_t fSpaceCount;
bool fSawErrors;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
