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/10 12:07:42 UTC
svn commit: r554896 - in /xerces/c/trunk/src/xercesc/util: ./
Transcoders/Cygwin/ Transcoders/ICU/ Transcoders/Iconv/
Transcoders/Iconv390/ Transcoders/Iconv400/ Transcoders/IconvFBSD/
Transcoders/IconvGNU/ Transcoders/MacOSUnicodeConverter/ Transcoder...
Author: amassari
Date: Tue Jul 10 03:07:31 2007
New Revision: 554896
URL: http://svn.apache.org/viewvc?view=rev&rev=554896
Log:
XMLTransService should use XMLSize_t (XERCESC-1531)
Modified:
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/Iconv/IconvTransService.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.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/Uniconv390TransService.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/TransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/TransService.hpp Tue Jul 10 03:07:31 2007
@@ -116,7 +116,7 @@
(
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 @@
(
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 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxBytes
+ , const XMLSize_t maxBytes
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
) = 0;
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp Tue Jul 10 03:07:31 2007
@@ -516,9 +516,9 @@
}
-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 @@
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 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
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.hpp Tue Jul 10 03:07:31 2007
@@ -60,7 +60,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -244,7 +244,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp Tue Jul 10 03:07:31 2007
@@ -227,7 +227,7 @@
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 @@
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 XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Watch for a few psycho corner cases
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp Tue Jul 10 03:07:31 2007
@@ -53,7 +53,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -208,7 +208,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp?view=diff&rev=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp Tue Jul 10 03:07:31 2007
@@ -123,7 +123,7 @@
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 @@
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 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
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp?view=diff&rev=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Iconv/IconvTransService.hpp Tue Jul 10 03:07:31 2007
@@ -49,7 +49,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -124,7 +124,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp?view=diff&rev=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.cpp Tue Jul 10 03:07:31 2007
@@ -204,7 +204,7 @@
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 @@
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 @@
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
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp?view=diff&rev=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Iconv390/Iconv390TransService.hpp Tue Jul 10 03:07:31 2007
@@ -61,7 +61,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -135,7 +135,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp?view=diff&rev=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp Tue Jul 10 03:07:31 2007
@@ -123,9 +123,9 @@
}
-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 @@
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 XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager)
{
// Watch for a few psycho corner cases
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp?view=diff&rev=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.hpp Tue Jul 10 03:07:31 2007
@@ -63,7 +63,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -225,7 +225,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp Tue Jul 10 03:07:31 2007
@@ -643,7 +643,7 @@
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 @@
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 @@
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
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp Tue Jul 10 03:07:31 2007
@@ -177,7 +177,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -354,7 +354,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.cpp Tue Jul 10 03:07:31 2007
@@ -530,9 +530,9 @@
}
-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 @@
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 @@
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
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp Tue Jul 10 03:07:31 2007
@@ -166,7 +166,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -328,7 +328,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp Tue Jul 10 03:07:31 2007
@@ -188,7 +188,7 @@
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 @@
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 @@
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).
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp Tue Jul 10 03:07:31 2007
@@ -63,7 +63,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -253,7 +253,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp?view=diff&rev=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp Tue Jul 10 03:07:31 2007
@@ -294,7 +294,7 @@
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 @@
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 @@
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");
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.hpp?view=diff&rev=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.hpp Tue Jul 10 03:07:31 2007
@@ -64,7 +64,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -212,7 +212,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp?view=diff&rev=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp Tue Jul 10 03:07:31 2007
@@ -198,7 +198,7 @@
, 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 @@
//
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 @@
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::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 @@
{
//
// 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 @@
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 @@
}
// 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 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 @@
}
// 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
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=554896&r1=554895&r2=554896
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.hpp Tue Jul 10 03:07:31 2007
@@ -60,7 +60,7 @@
(
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 @@
(
const char* const toTranscode
, XMLCh* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -235,7 +235,7 @@
(
const XMLCh* const toTranscode
, char* const toFill
- , const unsigned int maxChars
+ , const XMLSize_t maxChars
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org