From cf15b1ff18a33cb57baf6270e5cad9ef245a363c Mon Sep 17 00:00:00 2001
From: Alberto Massari <amassari@apache.org>
Date: Tue, 10 Jul 2007 10:07:31 +0000
Subject: [PATCH] XMLTransService should use XMLSize_t (XERCESC-1531)
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@554896 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/util/TransService.hpp | 6 +++---
.../Transcoders/Cygwin/CygwinTransService.cpp | 8 ++++----
.../Transcoders/Cygwin/CygwinTransService.hpp | 6 +++---
.../util/Transcoders/ICU/ICUTransService.cpp | 6 +++---
.../util/Transcoders/ICU/ICUTransService.hpp | 6 +++---
.../Transcoders/Iconv/IconvTransService.cpp | 6 +++---
.../Transcoders/Iconv/IconvTransService.hpp | 6 +++---
.../Iconv390/Iconv390TransService.cpp | 6 +++---
.../Iconv390/Iconv390TransService.hpp | 6 +++---
.../Iconv400/Iconv400TransService.cpp | 8 ++++----
.../Iconv400/Iconv400TransService.hpp | 6 +++---
.../IconvFBSD/IconvFBSDTransService.cpp | 6 +++---
.../IconvFBSD/IconvFBSDTransService.hpp | 6 +++---
.../IconvGNU/IconvGNUTransService.cpp | 8 ++++----
.../IconvGNU/IconvGNUTransService.hpp | 6 +++---
.../MacOSUnicodeConverter.cpp | 6 +++---
.../MacOSUnicodeConverter.hpp | 6 +++---
.../Uniconv390/Uniconv390TransService.cpp | 6 +++---
.../Uniconv390/Uniconv390TransService.hpp | 6 +++---
.../Transcoders/Win32/Win32TransService.cpp | 20 +++++++++----------
.../Transcoders/Win32/Win32TransService.hpp | 6 +++---
21 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/src/xercesc/util/TransService.hpp b/src/xercesc/util/TransService.hpp
index eb4b4b928..7270a8d12 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 f745aa1d4..cb8d6d0e5 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 bc55d4b3c..023498f6c 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 24d9ab311..88baa77ee 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 173bd0a87..95913ab6c 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 5850c3bab..f10b218c5 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 77209d508..91982ec06 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 7eaacb81f..fb756b7ac 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 d3eab9daf..5140932c9 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 54be61d4b..4b576ebd7 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 15f56a23a..fc9d1d2f7 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 7b10518c3..a031b5cf4 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 ba0b398de..ae7c653f5 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 367eda041..b3c816bfa 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 9591c63bf..3e6b0f5e9 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 8348ef4d7..b918da6ba 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 4599d1c46..6f1a57aba 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 65f1adae9..afb604577 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 4d7674a02..369987b72 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 7d61b56e7..b25d3d26b 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 d68e17e98..eecf00135 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
);
--
GitLab