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/11 18:05:18 UTC
svn commit: r555320 [3/3] - in /xerces/c/trunk/src/xercesc: dom/impl/
framework/ framework/psvi/ internal/ parsers/ util/ util/FileManagers/
util/NetAccessors/WinSock/ util/regx/ validators/datatype/
validators/schema/ validators/schema/identity/ xincl...
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?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp Wed Jul 11 09:05:13 2007
@@ -43,7 +43,7 @@
// RegxParser::ReferencePostion: Constructors and Destructor
// ---------------------------------------------------------------------------
RegxParser::ReferencePosition::ReferencePosition(const int refNo,
- const int position)
+ const XMLSize_t position)
:fReferenceNo(refNo)
, fPosition(position)
{
@@ -984,7 +984,7 @@
if (fState != REGX_T_CHAR || fCharData != chOpenCurly)
ThrowXMLwithMemMgr(ParseException,XMLExcepts::Parser_Atom2, fMemoryManager);
- int nameStart = fOffset;
+ XMLSize_t nameStart = fOffset;
int nameEnd = XMLString::indexOf(fString,chCloseCurly,nameStart, fMemoryManager);
if (nameEnd < 0)
@@ -1118,7 +1118,7 @@
tok->mergeRanges(rangeTok);
end = true;
- if (nameEnd+1 >= fStringLen || fString[nameEnd+1] != chCloseSquare) {
+ if (nameEnd+1 >= (int)fStringLen || fString[nameEnd+1] != chCloseSquare) {
ThrowXMLwithMemMgr(ParseException,XMLExcepts::Parser_CC1, fMemoryManager);
}
@@ -1383,7 +1383,7 @@
// ---------------------------------------------------------------------------
// RegxParser: Helper Methods
// ---------------------------------------------------------------------------
-bool RegxParser::checkQuestion(const int off) {
+bool RegxParser::checkQuestion(const XMLSize_t off) {
return ((off < fStringLen) && fString[off] == chQuestion);
}
Modified: xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp Wed Jul 11 09:05:13 2007
@@ -92,7 +92,7 @@
unsigned short getState() const;
XMLInt32 getCharData() const;
int getNoParen() const;
- int getOffset() const;
+ XMLSize_t getOffset() const;
bool hasBackReferences() const;
TokenFactory* getTokenFactory() const;
int getOptions() const;
@@ -113,7 +113,7 @@
// -----------------------------------------------------------------------
// Protected Helper methods
// -----------------------------------------------------------------------
- virtual bool checkQuestion(const int off);
+ virtual bool checkQuestion(const XMLSize_t off);
virtual XMLInt32 decodeEscaped();
MemoryManager* getMemoryManager() const;
// -----------------------------------------------------------------------
@@ -178,10 +178,10 @@
class ReferencePosition : public XMemory
{
public :
- ReferencePosition(const int refNo, const int position);
+ ReferencePosition(const int refNo, const XMLSize_t position);
- int fReferenceNo;
- int fPosition;
+ int fReferenceNo;
+ XMLSize_t fPosition;
};
// -----------------------------------------------------------------------
@@ -195,10 +195,10 @@
MemoryManager* fMemoryManager;
bool fHasBackReferences;
int fOptions;
- int fOffset;
+ XMLSize_t fOffset;
int fNoGroups;
unsigned short fParseContext;
- int fStringLen;
+ XMLSize_t fStringLen;
unsigned short fState;
XMLInt32 fCharData;
XMLCh* fString;
@@ -230,7 +230,7 @@
return fNoGroups;
}
-inline int RegxParser::getOffset() const {
+inline XMLSize_t RegxParser::getOffset() const {
return fOffset;
}
Modified: xerces/c/trunk/src/xercesc/util/regx/Token.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/Token.cpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/Token.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/Token.cpp Wed Jul 11 09:05:13 2007
@@ -109,7 +109,7 @@
case T_BACKREFERENCE:
return 0; // ***** - REVISIT
case T_STRING:
- return XMLString::stringLen(getString());
+ return (int)XMLString::stringLen(getString());
case T_LOOKAHEAD:
case T_NEGATIVELOOKAHEAD:
case T_LOOKBEHIND:
@@ -191,7 +191,7 @@
case T_BACKREFERENCE:
return -1; // REVISIT
case T_STRING:
- return XMLString::stringLen(getString());
+ return (int)XMLString::stringLen(getString());
case T_LOOKAHEAD:
case T_NEGATIVELOOKAHEAD:
case T_LOOKBEHIND:
@@ -414,8 +414,8 @@
if (getTokenType() != T_STRING && tok->getTokenType() != T_STRING)
return false; //Should we throw an exception?
- int length = XMLString::stringLen(getString());
- int tokLength = XMLString::stringLen(tok->getString());
+ XMLSize_t length = XMLString::stringLen(getString());
+ XMLSize_t tokLength = XMLString::stringLen(tok->getString());
return length < tokLength;
}
Modified: xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.cpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.cpp Wed Jul 11 09:05:13 2007
@@ -62,9 +62,9 @@
static unsigned int getTableLen(const XMLCh* const theTable) {
- unsigned int rangeLen = XMLString::stringLen(theTable);
+ XMLSize_t rangeLen = XMLString::stringLen(theTable);
- return rangeLen + 2*XMLString::stringLen(theTable + rangeLen + 1);
+ return (unsigned int)(rangeLen + 2*XMLString::stringLen(theTable + rangeLen + 1));
}
// ---------------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/validators/datatype/DatatypeValidator.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/DatatypeValidator.cpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/datatype/DatatypeValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/datatype/DatatypeValidator.cpp Wed Jul 11 09:05:13 2007
@@ -130,8 +130,8 @@
if (name || uri) {
- unsigned int nameLen = XMLString::stringLen(name);
- unsigned int uriLen = XMLString::stringLen(uri);
+ XMLSize_t nameLen = XMLString::stringLen(name);
+ XMLSize_t uriLen = XMLString::stringLen(uri);
fTypeName = (XMLCh*) fMemoryManager->allocate
(
@@ -166,7 +166,7 @@
if (typeName)
{
- unsigned int nameLen = XMLString::stringLen(typeName);
+ XMLSize_t nameLen = XMLString::stringLen(typeName);
int commaOffset = XMLString::indexOf(typeName, chComma);
fTypeName = (XMLCh*) fMemoryManager->allocate
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=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/datatype/ListDatatypeValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/datatype/ListDatatypeValidator.cpp Wed Jul 11 09:05:13 2007
@@ -398,7 +398,7 @@
}
}
- unsigned int retBufSize = 2 * XMLString::stringLen(rawData);
+ XMLSize_t retBufSize = 2 * XMLString::stringLen(rawData);
XMLCh* retBuf = (XMLCh*) toUse->allocate(retBufSize * sizeof(XMLCh));
retBuf[0] = 0;
XMLCh* retBufPtr = retBuf;
@@ -409,7 +409,7 @@
for (unsigned int i = 0; i < tokenVector->size(); i++)
{
XMLCh* itemCanRep = (XMLCh*) itemDv->getCanonicalRepresentation(tokenVector->elementAt(i), toUse, false);
- unsigned int itemLen = XMLString::stringLen(itemCanRep);
+ XMLSize_t itemLen = XMLString::stringLen(itemCanRep);
if(retBufPtr+itemLen+2 >= retBuf+retBufSize)
{
Modified: xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.cpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.cpp Wed Jul 11 09:05:13 2007
@@ -90,14 +90,11 @@
{
// create type name
XMLCh typeName[128];
- unsigned int nsLen = XMLString::stringLen(
- SchemaSymbols::fgURI_SCHEMAFORSCHEMA);
+ XMLSize_t nsLen = XMLString::stringLen(SchemaSymbols::fgURI_SCHEMAFORSCHEMA);
- XMLString::copyString(
- typeName, SchemaSymbols::fgURI_SCHEMAFORSCHEMA);
+ XMLString::copyString(typeName, SchemaSymbols::fgURI_SCHEMAFORSCHEMA);
typeName[nsLen] = chComma;
- XMLString::copyString(
- typeName + nsLen + 1, SchemaSymbols::fgATTVAL_ANYTYPE);
+ XMLString::copyString(typeName + nsLen + 1, SchemaSymbols::fgATTVAL_ANYTYPE);
// Create and initialize 'anyType'
fAnyType = new ComplexTypeInfo();
Modified: xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.hpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.hpp Wed Jul 11 09:05:13 2007
@@ -436,7 +436,7 @@
fTypeName = XMLString::replicate(typeName, fMemoryManager);
int index = XMLString::indexOf(fTypeName, chComma);
- int length = XMLString::stringLen(fTypeName);
+ XMLSize_t length = XMLString::stringLen(fTypeName);
fTypeLocalName = (XMLCh*) fMemoryManager->allocate
(
(length - index + 1) * sizeof(XMLCh)
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=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Wed Jul 11 09:05:13 2007
@@ -4501,7 +4501,7 @@
// Get xpath attribute
// ------------------------------------------------------------------
const XMLCh* xpathExpr = getElementAttValue(elem, SchemaSymbols::fgATT_XPATH, true);
- unsigned int xpathLen = XMLString::stringLen(xpathExpr);
+ XMLSize_t xpathLen = XMLString::stringLen(xpathExpr);
if (!xpathExpr || !xpathLen) {
@@ -4511,7 +4511,7 @@
fBuffer.reset();
- unsigned int startIndex = 0;
+ XMLSize_t startIndex = 0;
while (startIndex < xpathLen) {
if(XMLChar1_0::isWhitespace(*(xpathExpr+startIndex)))
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.hpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.hpp Wed Jul 11 09:05:13 2007
@@ -790,7 +790,7 @@
inline const XMLCh* TraverseSchema::getLocalPart(const XMLCh* const rawName) {
int colonIndex = XMLString::indexOf(rawName, chColon);
- int rawNameLen = XMLString::stringLen(rawName);
+ XMLSize_t rawNameLen = XMLString::stringLen(rawName);
if (colonIndex + 1 == rawNameLen) {
return XMLUni::fgZeroLenString;
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp Wed Jul 11 09:05:13 2007
@@ -382,7 +382,7 @@
void XercesXPath::parseExpression(XMLStringPool* const stringPool,
XercesNamespaceResolver* const scopeContext) {
- unsigned int length = XMLString::stringLen(fExpression);
+ XMLSize_t length = XMLString::stringLen(fExpression);
if (!length) {
return;
@@ -747,12 +747,12 @@
// XPathScanner: Scan methods
// ---------------------------------------------------------------------------
bool XPathScanner::scanExpression(const XMLCh* const data,
- int currentOffset,
- const int endOffset,
+ XMLSize_t currentOffset,
+ const XMLSize_t endOffset,
ValueVectorOf<int>* const tokens) {
bool starIsMultiplyOperator = false;
- int nameOffset = -1;
+ XMLSize_t nameOffset = 0;
int nameHandle = -1;
int prefixHandle = -1;
XMLCh ch;
@@ -975,7 +975,7 @@
ch = data[currentOffset];
- int litOffset = currentOffset;
+ XMLSize_t litOffset = currentOffset;
while (ch != qchar) {
if (++currentOffset == endOffset) {
return false; // REVISIT
@@ -1302,9 +1302,9 @@
}
-int XPathScanner::scanNCName(const XMLCh* const data,
- const int endOffset,
- int currentOffset) {
+XMLSize_t XPathScanner::scanNCName(const XMLCh* const data,
+ const XMLSize_t endOffset,
+ XMLSize_t currentOffset) {
XMLCh ch = data[currentOffset];
@@ -1325,9 +1325,9 @@
}
-int XPathScanner::scanNumber(const XMLCh* const data,
- const int endOffset,
- int currentOffset,
+XMLSize_t XPathScanner::scanNumber(const XMLCh* const data,
+ const XMLSize_t endOffset,
+ XMLSize_t currentOffset,
ValueVectorOf<int>* const tokens) {
XMLCh ch = data[currentOffset];
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.hpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.hpp Wed Jul 11 09:05:13 2007
@@ -355,8 +355,8 @@
// -----------------------------------------------------------------------
// Scan methods
// -----------------------------------------------------------------------
- bool scanExpression(const XMLCh* const data, int currentOffset,
- const int endOffset, ValueVectorOf<int>* const tokens);
+ bool scanExpression(const XMLCh* const data, XMLSize_t currentOffset,
+ const XMLSize_t endOffset, ValueVectorOf<int>* const tokens);
protected:
// -----------------------------------------------------------------------
@@ -386,10 +386,10 @@
// -----------------------------------------------------------------------
// Scan methods
// -----------------------------------------------------------------------
- int scanNCName(const XMLCh* const data, const int endOffset,
- int currentOffset);
- int scanNumber(const XMLCh* const data, const int endOffset,
- int currentOffset, ValueVectorOf<int>* const tokens);
+ XMLSize_t scanNCName(const XMLCh* const data, const XMLSize_t endOffset,
+ XMLSize_t currentOffset);
+ XMLSize_t scanNumber(const XMLCh* const data, const XMLSize_t endOffset,
+ XMLSize_t currentOffset, ValueVectorOf<int>* const tokens);
// -----------------------------------------------------------------------
// Data members
Modified: xerces/c/trunk/src/xercesc/xinclude/XIncludeLocation.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/xinclude/XIncludeLocation.cpp?view=diff&rev=555320&r1=555319&r2=555320
==============================================================================
--- xerces/c/trunk/src/xercesc/xinclude/XIncludeLocation.cpp (original)
+++ xerces/c/trunk/src/xercesc/xinclude/XIncludeLocation.cpp Wed Jul 11 09:05:13 2007
@@ -62,14 +62,14 @@
if (fHref == NULL){
return NULL;
}
- int fileLength = XMLString::stringLen(fHref);
+ XMLSize_t fileLength = XMLString::stringLen(fHref);
if (baseToAdd == NULL){
return fHref;
}
XMLPlatformUtils::removeDotDotSlash((XMLCh *const)baseToAdd);
- int baseLength = XMLString::stringLen(baseToAdd);
+ XMLSize_t baseLength = XMLString::stringLen(baseToAdd);
int lastSlash = XMLString::lastIndexOf(baseToAdd, chForwardSlash);
if (lastSlash == -1){
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org