diff --git a/src/xercesc/util/TransService.hpp b/src/xercesc/util/TransService.hpp
index eb4b4b928bf5f67efd57faf9559bf4377677419b..7270a8d12110a7f83b16186db49f230297bdcc90 100644
--- a/src/xercesc/util/TransService.hpp
+++ b/src/xercesc/util/TransService.hpp
@@ -116,7 +116,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
) = 0;
virtual const XMLCh* getId() const = 0;
@@ -428,7 +428,7 @@ public :
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) = 0;
@@ -436,7 +436,7 @@ public :
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxBytes
+ , const XMLSize_t maxBytes
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) = 0;
diff --git a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
index f745aa1d4e69f4a02bcba3d5c73fe9a0cac0e552..cb8d6d0e5e5e76391c97398c5bc7fe981185024d 100644
--- a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
+++ b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
@@ -516,9 +516,9 @@ int CygwinTransService::compareIString( const XMLCh* const comp1
}
-int CygwinTransService::compareNIString( const XMLCh* const comp1
+int CygwinTransService::compareNIString( const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
// Promote maxChars to signed long. Avoid any conceivable
// portability issue from a simple C cast with extension
@@ -975,7 +975,7 @@ XMLCh* CygwinLCPTranscoder::transcode(const char* const toTranscode,
bool CygwinLCPTranscoder::transcode( const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const /*manager*/)
{
// Check for a couple of psycho corner cases
@@ -1000,7 +1000,7 @@ bool CygwinLCPTranscoder::transcode( const char* const toTranscode
bool CygwinLCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxBytes
+ , const XMLSize_t maxBytes
, MemoryManager* const /*manager*/)
{
// Watch for a couple of pyscho corner cases
diff --git a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
index bc55d4b3ce868c88c0555a87a2d06736c8c4ce6f..023498f6c799bcf0b468e92f2636ff27d30a90fe 100644
--- a/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
+++ b/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp
@@ -60,7 +60,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -236,7 +236,7 @@ public :
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -244,7 +244,7 @@ public :
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
diff --git a/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp b/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
index 24d9ab31151fc208ce9120d8fd6629d0aa420cbb..88baa77eed4aea6e49138ea80d41304209fbdb5e 100644
--- a/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
+++ b/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
@@ -227,7 +227,7 @@ int ICUTransService::compareIString(const XMLCh* const comp1
int ICUTransService::compareNIString(const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
if (maxChars > 0)
{
@@ -1086,7 +1086,7 @@ XMLCh* ICULCPTranscoder::transcode(const char* const toTranscode,
bool ICULCPTranscoder::transcode(const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Check for a couple of psycho corner cases
@@ -1162,7 +1162,7 @@ bool ICULCPTranscoder::transcode(const char* const toTranscode
bool ICULCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Watch for a few psycho corner cases
diff --git a/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp b/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
index 173bd0a87dfa905f8bdc2638fe8caa82d4c7c9dd..95913ab6cbc36872364e09f6381252adc611eb79 100644
--- a/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
+++ b/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
@@ -53,7 +53,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -200,7 +200,7 @@ public :
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -208,7 +208,7 @@ public :
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
diff --git a/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp b/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
index 5850c3babaaea4fcfc09073e3ee712d97c09efe1..f10b218c53f0b3a7cf55eb5bfae6599cdd9aee85 100644
--- a/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
+++ b/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
@@ -123,7 +123,7 @@ int IconvTransService::compareIString( const XMLCh* const comp1
int IconvTransService::compareNIString( const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
unsigned int n = 0;
const XMLCh* cptr1 = comp1;
@@ -284,7 +284,7 @@ unsigned int IconvLCPTranscoder::calcRequiredSize(const XMLCh* const srcText
bool IconvLCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxBytes
+ , const XMLSize_t maxBytes
, MemoryManager* const manager)
{
// Watch for a couple of pyscho corner cases
@@ -342,7 +342,7 @@ bool IconvLCPTranscoder::transcode( const XMLCh* const toTranscode
bool IconvLCPTranscoder::transcode( const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Check for a couple of psycho corner cases
diff --git a/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp b/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
index 77209d50886b29ae2b93dfa5223bf36b8f1ce453..91982ec060feac42563d83cca0cd3a49320dab1e 100644
--- a/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
+++ b/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
@@ -49,7 +49,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -116,7 +116,7 @@ public :
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -124,7 +124,7 @@ public :
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
diff --git a/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp b/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp
index 7eaacb81ff99ff1d4701167fa92b2991fb152531..fb756b7ac571b0373562635744034236cb621aed 100644
--- a/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp
+++ b/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp
@@ -204,7 +204,7 @@ int Iconv390TransService::compareIString( const XMLCh* const comp1
int Iconv390TransService::compareNIString( const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
unsigned int n = 0;
const XMLCh* cptr1 = comp1;
@@ -385,7 +385,7 @@ char* Iconv390LCPTranscoder::transcode(const XMLCh* const toTranscode,
bool Iconv390LCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxBytes
+ , const XMLSize_t maxBytes
, MemoryManager* const manager)
{
// Watch for a couple of pyscho corner cases
@@ -462,7 +462,7 @@ XMLCh* Iconv390LCPTranscoder::transcode(const char* const toTranscode,
bool Iconv390LCPTranscoder::transcode( const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Check for a couple of psycho corner cases
diff --git a/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp b/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp
index d3eab9daf2ec9d49fad7d5f1ccf585f15d23c91d..5140932c97452ae25b18fbee64016b16c0a8b762 100644
--- a/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp
+++ b/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp
@@ -61,7 +61,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -127,7 +127,7 @@ public :
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -135,7 +135,7 @@ public :
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
diff --git a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
index 54be61d4beb1bb710667b639430b553fe4ad9d48..4b576ebd771f782667e541acd18dbc40ebbafddd 100644
--- a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
+++ b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
@@ -123,9 +123,9 @@ int Iconv400TransService::compareIString(const XMLCh* const comp1
}
-int Iconv400TransService::compareNIString(const XMLCh* const comp1
+int Iconv400TransService::compareNIString(const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
const XMLCh* psz1 = comp1;
const XMLCh* psz2 = comp2;
@@ -805,7 +805,7 @@ XMLCh* Iconv400LCPTranscoder::transcode(const char* const toTranscode,
bool Iconv400LCPTranscoder::transcode(const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Check for a couple of psycho corner cases
@@ -846,7 +846,7 @@ bool Iconv400LCPTranscoder::transcode(const char* const toTranscode
bool Iconv400LCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Watch for a few psycho corner cases
diff --git a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp
index 15f56a23a6ae96114b818ed018f30fff26ca78f8..fc9d1d2f7ece9c5be05724aa2a70d159cb971c15 100644
--- a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp
+++ b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp
@@ -63,7 +63,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -217,7 +217,7 @@ public :
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -225,7 +225,7 @@ public :
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
diff --git a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
index 7b10518c331a7fd452dae88f64767c23b306c7c9..a031b5cf47f2b5088c29aae5dac87213138cfb11 100644
--- a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
+++ b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp
@@ -643,7 +643,7 @@ int IconvFBSDTransService::compareIString(const XMLCh* const comp1
int IconvFBSDTransService::compareNIString(const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
unsigned int n = 0;
const XMLCh* cptr1 = comp1;
@@ -1046,7 +1046,7 @@ char* IconvFBSDLCPTranscoder::transcode(const XMLCh* const toTranscode,
bool IconvFBSDLCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxBytes
+ , const XMLSize_t maxBytes
, MemoryManager* const manager)
{
// Watch for a couple of pyscho corner cases
@@ -1228,7 +1228,7 @@ XMLCh* IconvFBSDLCPTranscoder::transcode(const char* const toTranscode,
bool IconvFBSDLCPTranscoder::transcode(const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Check for a couple of psycho corner cases
diff --git a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
index ba0b398ded498e758fdcd27081cfb179d8087e5f..ae7c653f51661cb929890f266097048410f2ab2c 100644
--- a/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
+++ b/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp
@@ -177,7 +177,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -346,7 +346,7 @@ public:
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -354,7 +354,7 @@ public:
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
diff --git a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
index 367eda041a26a9885cd54eab553d50afe7202f1a..b3c816bfaba42cbc10c4e01d704294c953408f90 100644
--- a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
+++ b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp
@@ -530,9 +530,9 @@ int IconvGNUTransService::compareIString(const XMLCh* const comp1
}
-int IconvGNUTransService::compareNIString(const XMLCh* const comp1
+int IconvGNUTransService::compareNIString(const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
unsigned int n = 0;
const XMLCh* cptr1 = comp1;
@@ -777,7 +777,7 @@ char* IconvGNULCPTranscoder::transcode(const XMLCh* const toTranscode,
bool IconvGNULCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxBytes
+ , const XMLSize_t maxBytes
, MemoryManager* const manager)
{
// Watch for a couple of pyscho corner cases
@@ -878,7 +878,7 @@ XMLCh* IconvGNULCPTranscoder::transcode(const char* const toTranscode,
bool IconvGNULCPTranscoder::transcode(const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Check for a couple of psycho corner cases
diff --git a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
index 9591c63bfe5a5b88aeeda057a1d4993b47092489..3e6b0f5e97c23a9b11e83a321389b9d834846182 100644
--- a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
+++ b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
@@ -166,7 +166,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -320,7 +320,7 @@ public:
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -328,7 +328,7 @@ public:
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
diff --git a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
index 8348ef4d7ed82f23e3f878692b31f3f1f6f080f3..b918da6ba112ec91c8d3622a1bea94baed30e80a 100644
--- a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
+++ b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
@@ -188,7 +188,7 @@ int MacOSUnicodeConverter::compareIString( const XMLCh* const comp1
int MacOSUnicodeConverter::compareNIString( const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
// If unicode collation routines are available, use them.
// This should be the case on Mac OS 8.6 and later,
@@ -941,7 +941,7 @@ MacOSLCPTranscoder::transcode(const char* const srcText,
bool
MacOSLCPTranscoder::transcode( const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// toFill must contain space for maxChars XMLCh characters + 1 (for terminating NULL).
@@ -976,7 +976,7 @@ MacOSLCPTranscoder::transcode( const char* const toTranscode
bool
MacOSLCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// toFill must contain space for maxChars bytes + 1 (for terminating NULL).
diff --git a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
index 4599d1c468415a804b2bfefd53dd17918a3bc0bc..6f1a57abafeb8559d9b1521876550d99068dddfa 100644
--- a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
+++ b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
@@ -63,7 +63,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -245,7 +245,7 @@ public :
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -253,7 +253,7 @@ public :
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
diff --git a/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp b/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp
index 65f1adae96da4de263582c716e5bcb3d764d3f0e..afb6045775a0b93fc4b4674079eb26dfadd2498f 100644
--- a/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp
+++ b/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp
@@ -294,7 +294,7 @@ int Uniconv390TransService::compareIString(const XMLCh* const comp1
int Uniconv390TransService::compareNIString(const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
//char localname1[500];
//XMLString::transcode(comp1,localname1,400);
@@ -1516,7 +1516,7 @@ DBGPRINTF2("Uniconv390LCPTranscoder::transcode(const char* const toTranscode):%s
bool Uniconv390LCPTranscoder::transcode(const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
DBGPRINTF1("Uniconv390LCPTranscoder::transcode(const char* const toTranscode, etc.... \n");
@@ -1556,7 +1556,7 @@ DBGPRINTF1("Uniconv390LCPTranscoder::transcode(const char* const toTranscod
bool Uniconv390LCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxBytes
+ , const XMLSize_t maxBytes
, MemoryManager* const manager)
{
DBGPRINTF1("Uniconv390LCPTranscoder::transcode(const XMLCh* const toTranscode, etc.... \n");
diff --git a/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.hpp b/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.hpp
index 4d7674a020b08963c6abe8e989f5b855d90efbcb..369987b7276b6c0c18aaa6413c1e847eac8b8420 100644
--- a/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.hpp
+++ b/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.hpp
@@ -64,7 +64,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -204,7 +204,7 @@ public :
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -212,7 +212,7 @@ public :
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
diff --git a/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp b/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
index 7d61b56e73fcd3f189d83e07ffd1afc3e8239cbb..b25d3d26bc788d40a994a7a5b3e8aac6a9055795 100644
--- a/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
+++ b/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
@@ -198,7 +198,7 @@ CPMapEntry::CPMapEntry( const char* const encodingName
, fIEId(ieId)
{
// Transcode the name to Unicode and store that copy
- const unsigned int srcLen = strlen(encodingName);
+ const XMLSize_t srcLen = strlen(encodingName);
const unsigned charLen = ::mblen(encodingName, MB_CUR_MAX);
if (charLen != -1) {
const unsigned int targetLen = srcLen/charLen;
@@ -431,7 +431,7 @@ Win32TransService::Win32TransService()
//
if (isAlias(encodingKey, aliasBuf, nameBufSz))
{
- const unsigned int srcLen = strlen(aliasBuf);
+ const XMLSize_t srcLen = strlen(aliasBuf);
size_t targetLen=::mbstowcs(NULL, aliasBuf, srcLen);
if(targetLen!=-1)
{
@@ -447,7 +447,7 @@ Win32TransService::Win32TransService()
CPMapEntry* aliasedEntry = fCPMap->get(uniAlias);
if (aliasedEntry)
{
- const unsigned int srcLen = strlen(nameBuf);
+ const XMLSize_t srcLen = strlen(nameBuf);
size_t targetLen=::mbstowcs(NULL, nameBuf, srcLen);
if(targetLen!=-1)
{
@@ -504,7 +504,7 @@ int Win32TransService::compareIString( const XMLCh* const comp1
int Win32TransService::compareNIString( const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars)
+ , const XMLSize_t maxChars)
{
return wcsnicmp(comp1, comp2, maxChars);
}
@@ -743,14 +743,14 @@ Win32Transcoder::transcodeTo(const XMLCh* const srcData
{
//
// Do one char and see if it made it.
- const unsigned int bytesStored = ::WideCharToMultiByte
+ const int bytesStored = ::WideCharToMultiByte
(
fIECP
, WC_COMPOSITECHECK | WC_SEPCHARS
, srcPtr
, 1
, (char*)outPtr
- , outEnd - outPtr
+ , (int)(outEnd - outPtr)
, 0
, &usedDef
);
@@ -940,7 +940,7 @@ XMLCh* Win32LCPTranscoder::transcode(const char* const toTranscode,
bool Win32LCPTranscoder::transcode( const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const /*manager*/)
{
// Check for a couple of psycho corner cases
@@ -957,7 +957,7 @@ bool Win32LCPTranscoder::transcode( const char* const toTranscode
}
// This one has a fixed size output, so try it and if it fails it fails
- if ( 0 == ::MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, toTranscode, -1, (LPWSTR)toFill, maxChars + 1) )
+ if ( 0 == ::MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, toTranscode, -1, (LPWSTR)toFill, (int)(maxChars + 1)) )
return false;
return true;
}
@@ -965,7 +965,7 @@ bool Win32LCPTranscoder::transcode( const char* const toTranscode
bool Win32LCPTranscoder::transcode( const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxBytes
+ , const XMLSize_t maxBytes
, MemoryManager* const /*manager*/)
{
// Watch for a couple of pyscho corner cases
@@ -982,7 +982,7 @@ bool Win32LCPTranscoder::transcode( const XMLCh* const toTranscode
}
// This one has a fixed size output, so try it and if it fails it fails
- if ( 0 == ::WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)toTranscode, -1, toFill, maxBytes + 1, NULL, NULL) )
+ if ( 0 == ::WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)toTranscode, -1, toFill, (int)(maxBytes + 1), NULL, NULL) )
return false;
// Cap it off just in case
diff --git a/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp b/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
index d68e17e9891c65eb614d7ff5d6897f6b49d280ba..eecf00135c803ee4a7cfcc9adeecaa3604c4dc37 100644
--- a/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
+++ b/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
@@ -60,7 +60,7 @@ public :
(
const XMLCh* const comp1
, const XMLCh* const comp2
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
);
virtual const XMLCh* getId() const;
@@ -227,7 +227,7 @@ public :
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -235,7 +235,7 @@ public :
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);