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 17:20:55 UTC
svn commit: r553923 - in /xerces/c/trunk/src/xercesc: framework/ internal/
util/ util/Transcoders/Cygwin/ util/Transcoders/ICU/
util/Transcoders/IconvFBSD/ util/Transcoders/IconvGNU/
util/Transcoders/MacOSUnicodeConverter/ util/Transcoders/Uniconv390/ ...
Author: amassari
Date: Fri Jul 6 08:20:53 2007
New Revision: 553923
URL: http://svn.apache.org/viewvc?view=rev&rev=553923
Log:
Changed XMLTransService interface to have transcodeFrom and transcodeTo use XMLSize_t (XERCESC-1531)
Modified:
xerces/c/trunk/src/xercesc/framework/XMLFormatter.cpp
xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
xerces/c/trunk/src/xercesc/util/TransService.cpp
xerces/c/trunk/src/xercesc/util/TransService.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.cpp
xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.hpp
xerces/c/trunk/src/xercesc/util/XML88591Transcoder.cpp
xerces/c/trunk/src/xercesc/util/XML88591Transcoder.hpp
xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.cpp
xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.hpp
xerces/c/trunk/src/xercesc/util/XMLChTranscoder.cpp
xerces/c/trunk/src/xercesc/util/XMLChTranscoder.hpp
xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.cpp
xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.hpp
xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.cpp
xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.hpp
xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp
xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp
Modified: xerces/c/trunk/src/xercesc/framework/XMLFormatter.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLFormatter.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLFormatter.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLFormatter.cpp Fri Jul 6 08:20:53 2007
@@ -502,13 +502,13 @@
? XMLTranscoder::UnRep_RepChar
: XMLTranscoder::UnRep_Throw;
- unsigned int charsEaten;
+ XMLSize_t charsEaten;
unsigned int count = oCount;
while (count) {
- const unsigned srcChars = (count > kTmpBufSize) ? (int)kTmpBufSize : count;
+ const XMLSize_t srcChars = (count > kTmpBufSize) ? (int)kTmpBufSize : count;
- const unsigned int outBytes
+ const XMLSize_t outBytes
= fXCoder->transcodeTo(srcPtr, srcChars,
fTmpBuf, kTmpBufSize,
charsEaten, unRepOpts);
@@ -608,8 +608,8 @@
{
if (!ref) {
- unsigned int charsEaten;
- const unsigned int outBytes =
+ XMLSize_t charsEaten;
+ const XMLSize_t outBytes =
fXCoder->transcodeTo(stdRef, XMLString::stringLen(stdRef),
fTmpBuf, kTmpBufSize, charsEaten,
XMLTranscoder::UnRep_Throw);
Modified: xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLReader.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLReader.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLReader.cpp Fri Jul 6 08:20:53 2007
@@ -1747,8 +1747,8 @@
}
// Ask the transcoder to internalize another batch of chars
- unsigned int bytesEaten;
- const unsigned int charsDone = fTranscoder->transcodeFrom
+ XMLSize_t bytesEaten;
+ const XMLSize_t charsDone = fTranscoder->transcodeFrom
(
&fRawByteBuf[fRawBufIndex]
, fRawBytesAvail - fRawBufIndex
Modified: xerces/c/trunk/src/xercesc/util/TransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/TransService.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/TransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/TransService.cpp Fri Jul 6 08:20:53 2007
@@ -543,11 +543,6 @@
// ---------------------------------------------------------------------------
// XMLTranscoder: Protected helpers
// ---------------------------------------------------------------------------
-void XMLTranscoder::checkBlockSize(const unsigned int)
-{
-// if (toCheck > fBlockSize)
-// ThrowXML(TranscodingException, XMLExcepts::Trans_BadBlockSize);
-}
// ---------------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/util/TransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/TransService.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/TransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/TransService.hpp Fri Jul 6 08:20:53 2007
@@ -259,13 +259,13 @@
*/
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
) = 0;
@@ -282,13 +282,13 @@
* @return Returns the number of chars put into the target buffer
*/
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
) = 0;
@@ -350,11 +350,6 @@
// -----------------------------------------------------------------------
// Protected helper methods
// -----------------------------------------------------------------------
- // As the body of this function is commented out it could be removed.
- // However, currently all calls to it are guarded by #if defined(XERCES_DEBUG)
- // so will leave it for now.
- void checkBlockSize(const unsigned int toCheck);
-
private :
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp Fri Jul 6 08:20:53 2007
@@ -667,12 +667,12 @@
// ---------------------------------------------------------------------------
// CygwinTranscoder: The virtual transcoder API
// ---------------------------------------------------------------------------
-unsigned int
-CygwinTranscoder::transcodeFrom( const XMLByte* const srcData
- , const unsigned int srcCount
- , XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+XMLSize_t
+CygwinTranscoder::transcodeFrom( const XMLByte* const srcData
+ , const XMLSize_t srcCount
+ , XMLCh* const toFill
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
// Get temp pointers to the in and out buffers, and the chars sizes one
@@ -750,12 +750,12 @@
}
-unsigned int
+XMLSize_t
CygwinTranscoder::transcodeTo(const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
// Get pointers to the start and end of each buffer
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp Fri Jul 6 08:20:53 2007
@@ -147,23 +147,23 @@
// -----------------------------------------------------------------------
// Implementation of the virtual transcoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp Fri Jul 6 08:20:53 2007
@@ -464,12 +464,12 @@
// ---------------------------------------------------------------------------
// ICUTranscoder: The virtual transcoder API
// ---------------------------------------------------------------------------
-unsigned int
+XMLSize_t
ICUTranscoder::transcodeFrom(const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
// If debugging, insure the block size is legal
@@ -603,12 +603,12 @@
}
-unsigned int
+XMLSize_t
ICUTranscoder::transcodeTo( const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
//
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp Fri Jul 6 08:20:53 2007
@@ -108,23 +108,23 @@
// -----------------------------------------------------------------------
// Implementation of the virtual transcoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp Fri Jul 6 08:20:53 2007
@@ -1378,13 +1378,13 @@
// ---------------------------------------------------------------------------
// IconvFBSDTranscoder: Implementation of the virtual transcoder API
// ---------------------------------------------------------------------------
-unsigned int IconvFBSDTranscoder::transcodeFrom
+XMLSize_t IconvFBSDTranscoder::transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes )
{
// Transcode TO XMLCh
@@ -1438,14 +1438,14 @@
return toReturn;
}
-unsigned int IconvFBSDTranscoder::transcodeTo
+XMLSize_t IconvFBSDTranscoder::transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
- , XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
- , const UnRepOpts options )
+ , const XMLSize_t srcCount
+ , XMLByte* const toFill
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
+ , const UnRepOpts options )
{
// Transcode FROM XMLCh
char tmpWBuff[gTempBuffArraySize];
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp Fri Jul 6 08:20:53 2007
@@ -249,24 +249,24 @@
// -----------------------------------------------------------------------
// Implementation of the virtual transcoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
- , const UnRepOpts options
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
+ , const UnRepOpts options
);
virtual bool canTranscodeTo
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp Fri Jul 6 08:20:53 2007
@@ -980,13 +980,13 @@
// ---------------------------------------------------------------------------
// IconvGNUTranscoder: Implementation of the virtual transcoder API
// ---------------------------------------------------------------------------
-unsigned int IconvGNUTranscoder::transcodeFrom
+XMLSize_t IconvGNUTranscoder::transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes )
{
// Transcode TO XMLCh
@@ -1033,13 +1033,13 @@
return toReturn;
}
-unsigned int IconvGNUTranscoder::transcodeTo
+XMLSize_t IconvGNUTranscoder::transcodeTo
(
- const XMLCh* const srcData
- , const unsigned int srcCount
- , XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ const XMLCh* const srcData
+ , const XMLSize_t srcCount
+ , XMLByte* const toFill
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options )
{
// Transcode FROM XMLCh
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp Fri Jul 6 08:20:53 2007
@@ -235,24 +235,24 @@
// -----------------------------------------------------------------------
// Implementation of the virtual transcoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
- , const UnRepOpts options
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
+ , const UnRepOpts options
);
virtual bool canTranscodeTo
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp Fri Jul 6 08:20:53 2007
@@ -528,13 +528,13 @@
// MacOSTranscoder: The virtual transcoder API
// ---------------------------------------------------------------------------
-unsigned int
-MacOSTranscoder::transcodeFrom( const XMLByte* const srcData
- , const unsigned int srcCount
- , XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
- , unsigned char* const charSizes)
+XMLSize_t
+MacOSTranscoder::transcodeFrom( const XMLByte* const srcData
+ , const XMLSize_t srcCount
+ , XMLCh* const toFill
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
+ , unsigned char* const charSizes)
{
// Reset the tec state (since we don't know that we're part of a
// larger run of text).
@@ -568,12 +568,12 @@
}
-unsigned int
+XMLSize_t
MacOSTranscoder::transcodeTo(const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
// Reset the tec state (since we don't know that we're part of a
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp Fri Jul 6 08:20:53 2007
@@ -156,23 +156,23 @@
// -----------------------------------------------------------------------
// The virtual transcoding interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.cpp Fri Jul 6 08:20:53 2007
@@ -49,23 +49,19 @@
// ---------------------------------------------------------------------------
// XML256TableTranscoder390: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
-XML256TableTranscoder390::transcodeFrom(const XMLByte* const srcData
- , const unsigned int srcCount
+XMLSize_t
+XML256TableTranscoder390::transcodeFrom(const XMLByte* const srcData
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the number of chars in the source.
//
- const unsigned int countToDo = srcCount < maxChars ? srcCount : maxChars;
+ const XMLSize_t countToDo = srcCount < maxChars ? srcCount : maxChars;
//
// Loop through the count we have to do and map each char via the
@@ -89,24 +85,19 @@
}
-unsigned int
-XML256TableTranscoder390::transcodeTo( const XMLCh* const srcData
- , const unsigned int srcCount
+XMLSize_t
+XML256TableTranscoder390::transcodeTo( const XMLCh* const srcData
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxBytes);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the number of chars in the source.
//
- const unsigned int countToDo = srcCount < maxBytes ? srcCount : maxBytes;
+ const XMLSize_t countToDo = srcCount < maxBytes ? srcCount : maxBytes;
//
// Loop through the count we have to do and map each char via the
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML256TableTranscoder390.hpp Fri Jul 6 08:20:53 2007
@@ -44,23 +44,23 @@
// -----------------------------------------------------------------------
// The virtual transcoding interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.cpp Fri Jul 6 08:20:53 2007
@@ -98,24 +98,19 @@
// ---------------------------------------------------------------------------
// XML88591Transcoder390: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
-XML88591Transcoder390::transcodeFrom( const XMLByte* const srcData
- , const unsigned int srcCount
+XMLSize_t
+XML88591Transcoder390::transcodeFrom( const XMLByte* const srcData
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the number of bytes in the source.
//
- const unsigned int countToDo = srcCount < maxChars ? srcCount : maxChars;
+ const XMLSize_t countToDo = srcCount < maxChars ? srcCount : maxChars;
//
// Loop through the bytes to do and convert over each byte. Its just
@@ -136,24 +131,19 @@
}
-unsigned int
-XML88591Transcoder390::transcodeTo(const XMLCh* const srcData
- , const unsigned int srcCount
+XMLSize_t
+XML88591Transcoder390::transcodeTo(const XMLCh* const srcData
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxBytes);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output bytes and the number of chars in the source.
//
- const unsigned int countToDo = srcCount < maxBytes ? srcCount : maxBytes;
+ const XMLSize_t countToDo = srcCount < maxBytes ? srcCount : maxBytes;
//
// Loop through the bytes to do and convert over each byte. Its just
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XML88591Transcoder390.hpp Fri Jul 6 08:20:53 2007
@@ -54,23 +54,23 @@
// -----------------------------------------------------------------------
// Implementation of the XMLTranscoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.cpp Fri Jul 6 08:20:53 2007
@@ -102,24 +102,19 @@
// ---------------------------------------------------------------------------
// XMLASCIITranscoder390: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
-XMLASCIITranscoder390::transcodeFrom( const XMLByte* const srcData
- , const unsigned int srcCount
+XMLSize_t
+XMLASCIITranscoder390::transcodeFrom( const XMLByte* const srcData
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the source byte count.
//
- const unsigned int countToDo = srcCount < maxChars ? srcCount : maxChars;
+ const XMLSize_t countToDo = srcCount < maxChars ? srcCount : maxChars;
//
// Now loop through that many source chars and just cast each one
@@ -128,7 +123,7 @@
//
const XMLByte* srcPtr = srcData;
XMLCh* outPtr = toFill;
- unsigned int countDone = countToDo;
+ XMLSize_t countDone = countToDo;
int flag = 0;
// if flag is set to 1, an non-ASCII character is encountered
@@ -159,28 +154,23 @@
}
-unsigned int
-XMLASCIITranscoder390::transcodeTo(const XMLCh* const srcData
- , const unsigned int srcCount
+XMLSize_t
+XMLASCIITranscoder390::transcodeTo(const XMLCh* const srcData
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxBytes);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the source byte count.
//
- const unsigned int countToDo = srcCount < maxBytes ? srcCount : maxBytes;
+ const XMLSize_t countToDo = srcCount < maxBytes ? srcCount : maxBytes;
const XMLCh* srcPtr = srcData;
XMLByte* outPtr = toFill;
- for (unsigned int index = 0; index < countToDo; index++)
+ for (XMLSize_t index = 0; index < countToDo; index++)
{
// If its legal, do it and jump back to the top
if (*srcPtr < 0x80)
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLASCIITranscoder390.hpp Fri Jul 6 08:20:53 2007
@@ -54,23 +54,23 @@
// -----------------------------------------------------------------------
// Implementation of the XMLTranscoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.cpp Fri Jul 6 08:20:53 2007
@@ -168,23 +168,18 @@
// ---------------------------------------------------------------------------
// XMLUTF8Transcoder390: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
-XMLUTF8Transcoder390::transcodeFrom(const XMLByte* const srcData
- , const unsigned int srcCount
+XMLSize_t
+XMLUTF8Transcoder390::transcodeFrom(const XMLByte* const srcData
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
// Watch for pathological scenario. Shouldn't happen, but...
if (!srcCount || !maxChars)
return 0;
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Get pointers to our start and end points of the input and output
// buffers.
@@ -194,7 +189,7 @@
XMLCh* outPtr = toFill;
XMLCh* outEnd = outPtr + maxChars;
unsigned char* sizePtr = charSizes;
- unsigned int countDone = (srcCount<maxChars)?srcCount:maxChars;
+ XMLSize_t countDone = (srcCount<maxChars)?srcCount:maxChars;
// if this flag is set, a none ASCII character is encountered
int flag = 0;
@@ -497,12 +492,12 @@
}
-unsigned int
-XMLUTF8Transcoder390::transcodeTo( const XMLCh* const srcData
- , const unsigned int srcCount
+XMLSize_t
+XMLUTF8Transcoder390::transcodeTo( const XMLCh* const srcData
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
// Watch for pathological scenario. Shouldn't happen, but...
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/XMLUTF8Transcoder390.hpp Fri Jul 6 08:20:53 2007
@@ -55,23 +55,23 @@
// -----------------------------------------------------------------------
// Implementation of the XMLTranscoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp Fri Jul 6 08:20:53 2007
@@ -141,23 +141,23 @@
// -----------------------------------------------------------------------
// Implementation of the virtual transcoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.cpp Fri Jul 6 08:20:53 2007
@@ -40,24 +40,19 @@
// ---------------------------------------------------------------------------
// XML256TableTranscoder: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
+XMLSize_t
XML256TableTranscoder::transcodeFrom(const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the number of chars in the source.
//
- const unsigned int countToDo = srcCount < maxChars ? srcCount : maxChars;
+ const XMLSize_t countToDo = srcCount < maxChars ? srcCount : maxChars;
//
// Loop through the count we have to do and map each char via the
@@ -88,24 +83,19 @@
}
-unsigned int
+XMLSize_t
XML256TableTranscoder::transcodeTo( const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxBytes);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the number of chars in the source.
//
- const unsigned int countToDo = srcCount < maxBytes ? srcCount : maxBytes;
+ const XMLSize_t countToDo = srcCount < maxBytes ? srcCount : maxBytes;
//
// Loop through the count we have to do and map each char via the
Modified: xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XML256TableTranscoder.hpp Fri Jul 6 08:20:53 2007
@@ -44,23 +44,23 @@
// -----------------------------------------------------------------------
// The virtual transcoding interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/XML88591Transcoder.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XML88591Transcoder.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XML88591Transcoder.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XML88591Transcoder.cpp Fri Jul 6 08:20:53 2007
@@ -46,24 +46,19 @@
// ---------------------------------------------------------------------------
// XML88591Transcoder: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
+XMLSize_t
XML88591Transcoder::transcodeFrom( const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the number of bytes in the source.
//
- const unsigned int countToDo = srcCount < maxChars ? srcCount : maxChars;
+ const XMLSize_t countToDo = srcCount < maxChars ? srcCount : maxChars;
//
// Loop through the bytes to do and convert over each byte. Its just
@@ -84,24 +79,19 @@
}
-unsigned int
+XMLSize_t
XML88591Transcoder::transcodeTo(const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxBytes);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output bytes and the number of chars in the source.
//
- const unsigned int countToDo = srcCount < maxBytes ? srcCount : maxBytes;
+ const XMLSize_t countToDo = srcCount < maxBytes ? srcCount : maxBytes;
//
// Loop through the bytes to do and convert over each byte. Its just
Modified: xerces/c/trunk/src/xercesc/util/XML88591Transcoder.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XML88591Transcoder.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XML88591Transcoder.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XML88591Transcoder.hpp Fri Jul 6 08:20:53 2007
@@ -54,23 +54,23 @@
// -----------------------------------------------------------------------
// Implementation of the XMLTranscoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.cpp Fri Jul 6 08:20:53 2007
@@ -46,24 +46,19 @@
// ---------------------------------------------------------------------------
// XMLASCIITranscoder: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
+XMLSize_t
XMLASCIITranscoder::transcodeFrom( const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the source byte count.
//
- const unsigned int countToDo = srcCount < maxChars ? srcCount : maxChars;
+ const XMLSize_t countToDo = srcCount < maxChars ? srcCount : maxChars;
//
// Now loop through that many source chars and just cast each one
@@ -72,7 +67,7 @@
//
const XMLByte* srcPtr = srcData;
XMLCh* outPtr = toFill;
- unsigned int countDone = 0;
+ XMLSize_t countDone = 0;
for (; countDone < countToDo; countDone++)
{
// Do the optimistic work up front
@@ -113,28 +108,23 @@
}
-unsigned int
+XMLSize_t
XMLASCIITranscoder::transcodeTo(const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxBytes);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the source byte count.
//
- const unsigned int countToDo = srcCount < maxBytes ? srcCount : maxBytes;
+ const XMLSize_t countToDo = srcCount < maxBytes ? srcCount : maxBytes;
const XMLCh* srcPtr = srcData;
XMLByte* outPtr = toFill;
- for (unsigned int index = 0; index < countToDo; index++)
+ for (XMLSize_t index = 0; index < countToDo; index++)
{
// If its legal, do it and jump back to the top
if (*srcPtr < 0x80)
Modified: xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLASCIITranscoder.hpp Fri Jul 6 08:20:53 2007
@@ -54,23 +54,23 @@
// -----------------------------------------------------------------------
// Implementation of the XMLTranscoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/XMLChTranscoder.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLChTranscoder.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLChTranscoder.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLChTranscoder.cpp Fri Jul 6 08:20:53 2007
@@ -45,25 +45,20 @@
// ---------------------------------------------------------------------------
// XMLChTranscoder: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
+XMLSize_t
XMLChTranscoder::transcodeFrom( const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the number of chars in the source.
//
- const unsigned int srcChars = srcCount / sizeof(XMLCh);
- const unsigned int countToDo = srcChars < maxChars ? srcChars : maxChars;
+ const XMLSize_t srcChars = srcCount / sizeof(XMLCh);
+ const XMLSize_t countToDo = srcChars < maxChars ? srcChars : maxChars;
//
// Copy over the count of chars that we precalculated. Notice we
@@ -82,27 +77,21 @@
}
-unsigned int
+XMLSize_t
XMLChTranscoder::transcodeTo(const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxBytes);
- #endif
-
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max chars we can store in the output byte buffer, and the number
// of chars in the source.
//
- const unsigned int maxOutChars = maxBytes / sizeof(XMLCh);
- const unsigned int countToDo = maxOutChars < srcCount
+ const XMLSize_t maxOutChars = maxBytes / sizeof(XMLCh);
+ const XMLSize_t countToDo = maxOutChars < srcCount
? maxOutChars : srcCount;
//
Modified: xerces/c/trunk/src/xercesc/util/XMLChTranscoder.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLChTranscoder.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLChTranscoder.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLChTranscoder.hpp Fri Jul 6 08:20:53 2007
@@ -51,23 +51,23 @@
// -----------------------------------------------------------------------
// Implementation of the XMLTranscoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.cpp Fri Jul 6 08:20:53 2007
@@ -48,19 +48,14 @@
// ---------------------------------------------------------------------------
// XMLUCS4Transcoder: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
+XMLSize_t
XMLUCS4Transcoder::transcodeFrom(const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Get pointers to the start and end of the source buffer in terms of
// UCS-4 characters.
@@ -143,19 +138,14 @@
}
-unsigned int
+XMLSize_t
XMLUCS4Transcoder::transcodeTo( const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxBytes);
- #endif
-
//
// Get pointers to the start and end of the source buffer, which
// is in terms of XMLCh chars.
Modified: xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUCS4Transcoder.hpp Fri Jul 6 08:20:53 2007
@@ -55,23 +55,23 @@
// -----------------------------------------------------------------------
// Implementation of the XMLTranscoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.cpp Fri Jul 6 08:20:53 2007
@@ -50,25 +50,20 @@
// ---------------------------------------------------------------------------
// XMLUTF16Transcoder: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
+XMLSize_t
XMLUTF16Transcoder::transcodeFrom( const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// max output chars and the number of chars in the source.
//
- const unsigned int srcChars = srcCount / sizeof(UTF16Ch);
- const unsigned int countToDo = srcChars < maxChars ? srcChars : maxChars;
+ const XMLSize_t srcChars = srcCount / sizeof(UTF16Ch);
+ const XMLSize_t countToDo = srcChars < maxChars ? srcChars : maxChars;
// Look at the source data as UTF16 chars
const UTF16Ch* asUTF16 = (const UTF16Ch*)srcData;
@@ -88,7 +83,7 @@
// that this also handles size conversion as well if XMLCh is not the
// same size as UTF16Ch.
//
- for (unsigned int index = 0; index < countToDo; index++)
+ for (XMLSize_t index = 0; index < countToDo; index++)
*outPtr++ = BitOps::swapBytes(*asUTF16++);
}
else
@@ -107,7 +102,7 @@
}
else
{
- for (unsigned int index = 0; index < countToDo; index++)
+ for (XMLSize_t index = 0; index < countToDo; index++)
*outPtr++ = XMLCh(*asUTF16++);
}
}
@@ -123,26 +118,21 @@
}
-unsigned int
+XMLSize_t
XMLUTF16Transcoder::transcodeTo(const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts)
{
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxBytes);
- #endif
-
//
// Calculate the max chars we can do here. Its the lesser of the
// chars that we can fit into the output buffer, and the source
// chars available.
//
- const unsigned int maxOutChars = maxBytes / sizeof(UTF16Ch);
- const unsigned int countToDo = srcCount < maxOutChars ? srcCount : maxOutChars;
+ const XMLSize_t maxOutChars = maxBytes / sizeof(UTF16Ch);
+ const XMLSize_t countToDo = srcCount < maxOutChars ? srcCount : maxOutChars;
//
// Get a pointer tot he output buffer in the UTF-16 character format
@@ -163,7 +153,7 @@
// that this also handles size conversion as well if XMLCh is not the
// same size as UTF16Ch.
//
- for (unsigned int index = 0; index < countToDo; index++)
+ for (XMLSize_t index = 0; index < countToDo; index++)
{
// To avoid flakey compilers, use a temp
const UTF16Ch tmpCh = UTF16Ch(*srcPtr++);
@@ -184,7 +174,7 @@
}
else
{
- for (unsigned int index = 0; index < countToDo; index++)
+ for (XMLSize_t index = 0; index < countToDo; index++)
*outPtr++ = UTF16Ch(*srcPtr++);
}
}
Modified: xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUTF16Transcoder.hpp Fri Jul 6 08:20:53 2007
@@ -56,23 +56,23 @@
// -----------------------------------------------------------------------
// Implementation of the XMLTranscoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
Modified: xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.cpp Fri Jul 6 08:20:53 2007
@@ -112,23 +112,18 @@
// ---------------------------------------------------------------------------
// XMLUTF8Transcoder: Implementation of the transcoder API
// ---------------------------------------------------------------------------
-unsigned int
+XMLSize_t
XMLUTF8Transcoder::transcodeFrom(const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes)
{
// Watch for pathological scenario. Shouldn't happen, but...
if (!srcCount || !maxChars)
return 0;
- // If debugging, make sure that the block size is legal
- #if defined(XERCES_DEBUG)
- checkBlockSize(maxChars);
- #endif
-
//
// Get pointers to our start and end points of the input and output
// buffers.
@@ -429,12 +424,12 @@
}
-unsigned int
+XMLSize_t
XMLUTF8Transcoder::transcodeTo( const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options)
{
// Watch for pathological scenario. Shouldn't happen, but...
Modified: xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp?view=diff&rev=553923&r1=553922&r2=553923
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUTF8Transcoder.hpp Fri Jul 6 08:20:53 2007
@@ -55,23 +55,23 @@
// -----------------------------------------------------------------------
// Implementation of the XMLTranscoder interface
// -----------------------------------------------------------------------
- virtual unsigned int transcodeFrom
+ virtual XMLSize_t transcodeFrom
(
const XMLByte* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLCh* const toFill
- , const unsigned int maxChars
- , unsigned int& bytesEaten
+ , const XMLSize_t maxChars
+ , XMLSize_t& bytesEaten
, unsigned char* const charSizes
);
- virtual unsigned int transcodeTo
+ virtual XMLSize_t transcodeTo
(
const XMLCh* const srcData
- , const unsigned int srcCount
+ , const XMLSize_t srcCount
, XMLByte* const toFill
- , const unsigned int maxBytes
- , unsigned int& charsEaten
+ , const XMLSize_t maxBytes
+ , XMLSize_t& charsEaten
, const UnRepOpts options
);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org