You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/05/27 20:42:15 UTC
cvs commit: xml-xerces/c/src/xercesc/internal ReaderMgr.cpp ReaderMgr.hpp XMLReader.cpp XMLReader.hpp XMLScanner.cpp XMLScanner.hpp
tng 02/05/27 11:42:15
Modified: c/src/xercesc/internal ReaderMgr.cpp ReaderMgr.hpp
XMLReader.cpp XMLReader.hpp XMLScanner.cpp
XMLScanner.hpp
Log:
To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
Revision Changes Path
1.3 +3 -3 xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp
Index: ReaderMgr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReaderMgr.cpp 28 Feb 2002 21:55:57 -0000 1.2
+++ ReaderMgr.cpp 27 May 2002 18:42:14 -0000 1.3
@@ -55,7 +55,7 @@
*/
/*
- * $Id: ReaderMgr.cpp,v 1.2 2002/02/28 21:55:57 tng Exp $
+ * $Id: ReaderMgr.cpp,v 1.3 2002/05/27 18:42:14 tng Exp $
*/
// ---------------------------------------------------------------------------
@@ -829,7 +829,7 @@
return getLastExtEntity(theEntity)->getSystemId();
}
-int ReaderMgr::getColumnNumber() const
+XMLSSize_t ReaderMgr::getColumnNumber() const
{
if (!fReaderStack && !fCurReader)
return 0;
@@ -838,7 +838,7 @@
return getLastExtEntity(theEntity)->getColumnNumber();
}
-int ReaderMgr::getLineNumber() const
+XMLSSize_t ReaderMgr::getLineNumber() const
{
if (!fReaderStack && !fCurReader)
return 0;
1.2 +7 -4 xml-xerces/c/src/xercesc/internal/ReaderMgr.hpp
Index: ReaderMgr.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/ReaderMgr.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReaderMgr.hpp 1 Feb 2002 22:21:58 -0000 1.1
+++ ReaderMgr.hpp 27 May 2002 18:42:14 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: ReaderMgr.hpp,v $
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/27 18:42:14 tng
+ * To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.13 2001/07/12 18:50:08 tng
* Some performance modification regarding standalone check and xml decl check.
@@ -153,8 +156,8 @@
{
const XMLCh* systemId;
const XMLCh* publicId;
- unsigned int lineNumber;
- unsigned int colNumber;
+ XMLSSize_t lineNumber;
+ XMLSSize_t colNumber;
};
@@ -263,8 +266,8 @@
// -----------------------------------------------------------------------
virtual const XMLCh* getPublicId() const;
virtual const XMLCh* getSystemId() const;
- virtual int getLineNumber() const;
- virtual int getColumnNumber() const;
+ virtual XMLSSize_t getLineNumber() const;
+ virtual XMLSSize_t getColumnNumber() const;
private :
1.2 +3 -3 xml-xerces/c/src/xercesc/internal/XMLReader.cpp
Index: XMLReader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLReader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLReader.cpp 1 Feb 2002 22:22:02 -0000 1.1
+++ XMLReader.cpp 27 May 2002 18:42:14 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLReader.cpp,v 1.1 2002/02/01 22:22:02 peiyongz Exp $
+ * $Id: XMLReader.cpp,v 1.2 2002/05/27 18:42:14 tng Exp $
*/
// ---------------------------------------------------------------------------
@@ -865,8 +865,8 @@
bool XMLReader::skipSpaces(bool& skippedSomething)
{
// Remember the current line and column
- unsigned int orgLine = fCurLine;
- unsigned int orgCol = fCurCol;
+ XMLSSize_t orgLine = fCurLine;
+ XMLSSize_t orgCol = fCurCol;
//
// We enter a loop where we skip over spaces until we hit the end of
1.2 +9 -6 xml-xerces/c/src/xercesc/internal/XMLReader.hpp
Index: XMLReader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLReader.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLReader.hpp 1 Feb 2002 22:22:02 -0000 1.1
+++ XMLReader.hpp 27 May 2002 18:42:14 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: XMLReader.hpp,v $
- * Revision 1.1 2002/02/01 22:22:02 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/27 18:42:14 tng
+ * To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:02 peiyongz
+ * sane_include
*
* Revision 1.18 2001/12/06 17:47:04 tng
* Performance Enhancement. Modify the handling of the fNEL option so that it results in fgCharCharsTable being modified, instead of having all of the low-level routines check the option. This seemed acceptable because the code appears to only permit the option to be turned on and not turned off again. By Henry Zongaro.
@@ -283,9 +286,9 @@
// -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
- unsigned int getColumnNumber() const;
+ XMLSSize_t getColumnNumber() const;
const XMLCh* getEncodingStr() const;
- unsigned int getLineNumber() const;
+ XMLSSize_t getLineNumber() const;
bool getNoMoreFlag() const;
const XMLCh* getPublicId() const;
unsigned int getReaderNum() const;
@@ -512,8 +515,8 @@
XMLCh fCharBuf[kCharBufSize];
unsigned int fCharsAvail;
unsigned char fCharSizeBuf[kCharBufSize];
- unsigned int fCurCol;
- unsigned int fCurLine;
+ XMLSSize_t fCurCol;
+ XMLSSize_t fCurLine;
XMLRecognizer::Encodings fEncoding;
XMLCh* fEncodingStr;
bool fForcedEncoding;
@@ -613,7 +616,7 @@
// ---------------------------------------------------------------------------
// XMLReader: Getter methods
// ---------------------------------------------------------------------------
-inline unsigned int XMLReader::getColumnNumber() const
+inline XMLSSize_t XMLReader::getColumnNumber() const
{
return fCurCol;
}
@@ -623,7 +626,7 @@
return fEncodingStr;
}
-inline unsigned int XMLReader::getLineNumber() const
+inline XMLSSize_t XMLReader::getLineNumber() const
{
return fCurLine;
}
1.8 +3 -3 xml-xerces/c/src/xercesc/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLScanner.cpp 22 May 2002 20:54:33 -0000 1.7
+++ XMLScanner.cpp 27 May 2002 18:42:14 -0000 1.8
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLScanner.cpp,v 1.7 2002/05/22 20:54:33 knoaman Exp $
+ * $Id: XMLScanner.cpp,v 1.8 2002/05/27 18:42:14 tng Exp $
*/
@@ -1243,8 +1243,8 @@
, const unsigned int maxSysIdChars
, XMLCh* const pubIdToFill
, const unsigned int maxPubIdChars
- , unsigned int& lineToFill
- , unsigned int& colToFill)
+ , XMLSSize_t& lineToFill
+ , XMLSSize_t& colToFill)
{
// Create a local info object and get it filled in by the reader manager
ReaderMgr::LastExtEntityInfo lastInfo;
1.4 +9 -2 xml-xerces/c/src/xercesc/internal/XMLScanner.hpp
Index: XMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLScanner.hpp 22 May 2002 20:54:33 -0000 1.3
+++ XMLScanner.hpp 27 May 2002 18:42:14 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log: XMLScanner.hpp,v $
+ * Revision 1.4 2002/05/27 18:42:14 tng
+ * To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
+ *
* Revision 1.3 2002/05/22 20:54:33 knoaman
* Prepare for DOM L3 :
* - Make use of the XMLEntityHandler/XMLErrorReporter interfaces, instead of using
@@ -367,8 +370,8 @@
, const unsigned int maxSysIdChars
, XMLCh* const pubIdToFill
, const unsigned int maxPubIdChars
- , unsigned int& lineToFill
- , unsigned int& colToFill
+ , XMLSSize_t& lineToFill
+ , XMLSSize_t& colToFill
);
const Locator* getLocator() const;
unsigned int getSrcOffset() const;
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org