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 16:43:44 UTC
svn commit: r553903 - in /xerces/c/trunk: m4/ src/xercesc/util/
src/xercesc/util/FileManagers/ src/xercesc/util/NetAccessors/Curl/
src/xercesc/util/NetAccessors/MacOSURLAccess/
src/xercesc/util/NetAccessors/MacOSURLAccessCF/
src/xercesc/util/NetAccesso...
Author: amassari
Date: Fri Jul 6 07:43:42 2007
New Revision: 553903
URL: http://svn.apache.org/viewvc?view=rev&rev=553903
Log:
Changed BinInputStream interface to have curPos return a 64-bit integer, and use XMLSize_t in readBytes (XERCESC-1531)
Modified:
xerces/c/trunk/m4/xerces_int_types.m4
xerces/c/trunk/src/xercesc/util/BinFileInputStream.cpp
xerces/c/trunk/src/xercesc/util/BinFileInputStream.hpp
xerces/c/trunk/src/xercesc/util/BinInputStream.hpp
xerces/c/trunk/src/xercesc/util/BinMemInputStream.cpp
xerces/c/trunk/src/xercesc/util/BinMemInputStream.hpp
xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.cpp
xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp
xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp
xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp
xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp
xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp
xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp
xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
Modified: xerces/c/trunk/m4/xerces_int_types.m4
URL: http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_int_types.m4?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/m4/xerces_int_types.m4 (original)
+++ xerces/c/trunk/m4/xerces_int_types.m4 Fri Jul 6 07:43:42 2007
@@ -16,10 +16,13 @@
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(long long)
+ AC_CHECK_SIZEOF(__int64)
AC_CHECK_TYPE(int16_t)
AC_CHECK_TYPE(int32_t)
AC_CHECK_TYPE(uint16_t)
AC_CHECK_TYPE(uint32_t)
+ AC_CHECK_TYPE(uint64_t)
#
# Select a signed 16 bit integer type
@@ -98,10 +101,40 @@
])
])
+ #
+ # Select an unsigned 64 bit integer type
+ #
+ AC_CACHE_CHECK([for an appropriate unsigned 64 bit integer type], [xerces_cv_type_u64bit_int], [
+ AS_IF([test x$ac_cv_header_inttypes_h = xyes && test x$ac_cv_type_uint64_t = xyes],
+ [xerces_cv_type_u64bit_int=uint64_t],
+ [
+ case $ac_cv_sizeof_int in
+ 8*) xerces_cv_type_u64bit_int="unsigned int";;
+ *)
+ case $ac_cv_sizeof_long in
+ 8*) xerces_cv_type_u64bit_int="unsigned long";;
+ *)
+ case $ac_cv_sizeof_long_long in
+ 8*) xerces_cv_type_u64bit_int="unsigned long long";;
+ *)
+ case $ac_cv_sizeof___int64 in
+ 8*) xerces_cv_type_u64bit_int="unsigned __int64";;
+ *) xerces_cv_type_u64bit_int=$xerces_cv_type_u32bit_int;;
+ esac
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ esac
+ ])
+ ])
+
AC_DEFINE_UNQUOTED([XERCES_S16BIT_INT], $xerces_cv_type_s16bit_int, [An appropriate signed 16 bit integer type])
AC_DEFINE_UNQUOTED([XERCES_U16BIT_INT], $xerces_cv_type_u16bit_int, [An appropriate unsigned 16 bit integer type])
AC_DEFINE_UNQUOTED([XERCES_S32BIT_INT], $xerces_cv_type_s32bit_int, [An appropriate signed 32 bit integer type])
AC_DEFINE_UNQUOTED([XERCES_U32BIT_INT], $xerces_cv_type_u32bit_int, [An appropriate unsigned 32 bit integer type])
+ AC_DEFINE_UNQUOTED([XERCES_U64BIT_INT], $xerces_cv_type_u64bit_int, [An appropriate unsigned 64 bit integer type])
]
)
Modified: xerces/c/trunk/src/xercesc/util/BinFileInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BinFileInputStream.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BinFileInputStream.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/BinFileInputStream.cpp Fri Jul 6 07:43:42 2007
@@ -68,7 +68,7 @@
// ---------------------------------------------------------------------------
// BinFileInputStream: Getter methods
// ---------------------------------------------------------------------------
-unsigned int BinFileInputStream::getSize() const
+XMLFilePos BinFileInputStream::getSize() const
{
return XMLPlatformUtils::fileSize(fSource, fMemoryManager);
}
@@ -86,14 +86,14 @@
// ---------------------------------------------------------------------------
// BinFileInputStream: Implementation of the input stream interface
// ---------------------------------------------------------------------------
-unsigned int BinFileInputStream::curPos() const
+XMLFilePos BinFileInputStream::curPos() const
{
return XMLPlatformUtils::curFilePos(fSource, fMemoryManager);
}
-unsigned int
+XMLSize_t
BinFileInputStream::readBytes( XMLByte* const toFill
- , const unsigned int maxToRead)
+ , const XMLSize_t maxToRead)
{
//
// Read up to the maximum bytes requested. We return the number
Modified: xerces/c/trunk/src/xercesc/util/BinFileInputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BinFileInputStream.hpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BinFileInputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/BinFileInputStream.hpp Fri Jul 6 07:43:42 2007
@@ -58,19 +58,19 @@
// Getter methods
// -----------------------------------------------------------------------
bool getIsOpen() const;
- unsigned int getSize() const;
+ XMLFilePos getSize() const;
void reset();
// -----------------------------------------------------------------------
// Implementation of the input stream interface
// -----------------------------------------------------------------------
- virtual unsigned int curPos() const;
+ virtual XMLFilePos curPos() const;
- virtual unsigned int readBytes
+ virtual XMLSize_t readBytes
(
XMLByte* const toFill
- , const unsigned int maxToRead
+ , const XMLSize_t maxToRead
);
Modified: xerces/c/trunk/src/xercesc/util/BinInputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BinInputStream.hpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BinInputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/BinInputStream.hpp Fri Jul 6 07:43:42 2007
@@ -38,12 +38,12 @@
// -----------------------------------------------------------------------
// The virtual input stream interface
// -----------------------------------------------------------------------
- virtual unsigned int curPos() const = 0;
+ virtual XMLFilePos curPos() const = 0;
- virtual unsigned int readBytes
+ virtual XMLSize_t readBytes
(
XMLByte* const toFill
- , const unsigned int maxToRead
+ , const XMLSize_t maxToRead
) = 0;
Modified: xerces/c/trunk/src/xercesc/util/BinMemInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BinMemInputStream.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BinMemInputStream.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/BinMemInputStream.cpp Fri Jul 6 07:43:42 2007
@@ -33,7 +33,7 @@
// BinMemInputStream: Constructors and Destructor
// ---------------------------------------------------------------------------
BinMemInputStream::BinMemInputStream( const XMLByte* const initData
- , const unsigned int capacity
+ , const XMLSize_t capacity
, const BufOpts bufOpt
, MemoryManager* const manager) :
fBuffer(0)
@@ -72,19 +72,18 @@
// ---------------------------------------------------------------------------
// MemBinInputStream: Implementation of the input stream interface
// ---------------------------------------------------------------------------
-unsigned int BinMemInputStream::readBytes( XMLByte* const toFill
- , const unsigned int maxToRead)
+XMLSize_t BinMemInputStream::readBytes( XMLByte* const toFill
+ , const XMLSize_t maxToRead)
{
//
// Figure out how much we can really read. Its the smaller of the
// amount available and the amount asked for.
//
- const unsigned int available = (fCapacity - fCurIndex);
+ const XMLSize_t available = (fCapacity - fCurIndex);
if (!available)
return 0;
- const unsigned int actualToRead = available < maxToRead ?
- available : maxToRead;
+ const XMLSize_t actualToRead = available < maxToRead ? available : maxToRead;
memcpy(toFill, &fBuffer[fCurIndex], actualToRead);
fCurIndex += actualToRead;
Modified: xerces/c/trunk/src/xercesc/util/BinMemInputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BinMemInputStream.hpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BinMemInputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/BinMemInputStream.hpp Fri Jul 6 07:43:42 2007
@@ -47,7 +47,7 @@
BinMemInputStream
(
const XMLByte* const initData
- , const unsigned int capacity
+ , const XMLSize_t capacity
, const BufOpts bufOpt = BufOpt_Copy
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -63,15 +63,15 @@
// -----------------------------------------------------------------------
// Implementation of the input stream interface
// -----------------------------------------------------------------------
- virtual unsigned int curPos() const;
+ virtual XMLFilePos curPos() const;
- virtual unsigned int readBytes
+ virtual XMLSize_t readBytes
(
XMLByte* const toFill
- , const unsigned int maxToRead
+ , const XMLSize_t maxToRead
);
- inline unsigned int getSize() const;
+ inline XMLSize_t getSize() const;
private :
// -----------------------------------------------------------------------
@@ -99,8 +99,8 @@
// -----------------------------------------------------------------------
const XMLByte* fBuffer;
BufOpts fBufOpt;
- unsigned int fCapacity;
- unsigned int fCurIndex;
+ XMLSize_t fCapacity;
+ XMLSize_t fCurIndex;
MemoryManager* fMemoryManager;
};
@@ -117,12 +117,12 @@
// ---------------------------------------------------------------------------
// BinMemInputStream: Implementation of the input stream interface
// ---------------------------------------------------------------------------
-inline unsigned int BinMemInputStream::curPos() const
+inline XMLFilePos BinMemInputStream::curPos() const
{
return fCurIndex;
}
-inline unsigned int BinMemInputStream::getSize() const
+inline XMLSize_t BinMemInputStream::getSize() const
{
return fCapacity;
}
Modified: xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.cpp Fri Jul 6 07:43:42 2007
@@ -249,11 +249,12 @@
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, manager);
// Get the current position
- const unsigned int curPos = ::SetFilePointer(f, 0, 0, FILE_CURRENT);
- if (curPos == 0xFFFFFFFF)
+ LONG high=0;
+ DWORD low = ::SetFilePointer(f, 0, &high, FILE_CURRENT);
+ if (low == INVALID_SET_FILE_POINTER && GetLastError()!=NO_ERROR)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::File_CouldNotGetCurPos, manager);
- return curPos;
+ return (((XMLFilePos)high) << 32) | low;
}
@@ -263,13 +264,13 @@
if (!f)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, manager);
- DWORD high;
+ DWORD high=0;
DWORD low=GetFileSize(f, &high);
- if(low==INVALID_FILE_SIZE)
+ if(low==INVALID_FILE_SIZE && GetLastError()!=NO_ERROR)
// TODO: find a better exception
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::File_CouldNotGetCurPos, manager);
- return low;
+ return (((XMLFilePos)high) << 32) | low;
}
@@ -279,7 +280,7 @@
if (!f || !buffer)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, manager);
- unsigned long bytesRead = 0;
+ DWORD bytesRead = 0;
if (!::ReadFile(f, buffer, byteCount, &bytesRead, 0))
{
//
@@ -303,7 +304,7 @@
while (byteCount > 0)
{
- unsigned long bytesWritten = 0;
+ DWORD bytesWritten = 0;
if (!::WriteFile(f, tmpFlush, byteCount, &bytesWritten, 0))
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::File_CouldNotWriteToFile, manager);
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp Fri Jul 6 07:43:42 2007
@@ -141,10 +141,9 @@
}
-
-unsigned int
-CurlURLInputStream::readBytes(XMLByte* const toFill
- , const unsigned int maxToRead)
+XMLSize_t
+CurlURLInputStream::readBytes(XMLByte* const toFill
+ , constXMLSize_t maxToRead)
{
fBytesRead = 0;
fBytesToRead = maxToRead;
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp Fri Jul 6 07:43:42 2007
@@ -45,11 +45,11 @@
CurlURLInputStream(const XMLURL& urlSource, const XMLNetHTTPInfo* httpInfo=0);
~CurlURLInputStream();
- unsigned int curPos() const;
- unsigned int readBytes
+ XMLFilePos curPos() const;
+ XMLSize_t readBytes
(
XMLByte* const toFill
- , const unsigned int maxToRead
+ , const XMLSize_t maxToRead
);
@@ -109,7 +109,7 @@
}; // CurlURLInputStream
-inline unsigned int
+inline XMLFilePos
CurlURLInputStream::curPos() const
{
return fTotalBytesRead;
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp Fri Jul 6 07:43:42 2007
@@ -123,9 +123,9 @@
// passes us back buffers full of data, our object maintains
// a partial buffer across calls.
//
-unsigned int
-URLAccessBinInputStream::readBytes(XMLByte* const toFill
- , const unsigned int maxToRead)
+XMLSize_t
+URLAccessBinInputStream::readBytes(XMLByte* const toFill
+ , const XMLSize_t maxToRead)
{
OSStatus status = noErr;
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.hpp Fri Jul 6 07:43:42 2007
@@ -48,11 +48,11 @@
URLAccessBinInputStream(const XMLURL& urlSource);
~URLAccessBinInputStream();
- unsigned int curPos() const;
- unsigned int readBytes
+ XMLFilePos curPos() const;
+ XMLSize_t readBytes
(
XMLByte* const toFill
- , const unsigned int maxToRead
+ , const XMLSize_t maxToRead
);
@@ -65,7 +65,7 @@
};
-inline unsigned int
+inline XMLFilePos
URLAccessBinInputStream::curPos() const
{
return mBytesProcessed;
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp Fri Jul 6 07:43:42 2007
@@ -136,9 +136,9 @@
// We've already read the data into a dataRef.
// Just spoon it out to the caller as they ask for it.
//
-unsigned int
+XMLSize_t
URLAccessCFBinInputStream::readBytes(XMLByte* const toFill
- , const unsigned int maxToRead)
+ , const XMLSize_t maxToRead)
{
// If we don't have a dataRef, we can't return any data
if (!mDataRef)
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp Fri Jul 6 07:43:42 2007
@@ -49,11 +49,11 @@
URLAccessCFBinInputStream(const XMLURL& urlSource);
~URLAccessCFBinInputStream();
- unsigned int curPos() const;
- unsigned int readBytes
+ XMLFilePos curPos() const;
+ XMLSize_t readBytes
(
XMLByte* const toFill
- , const unsigned int maxToRead
+ , const XMLSize_t maxToRead
);
@@ -63,7 +63,7 @@
};
-inline unsigned int
+inline XMLFilePos
URLAccessCFBinInputStream::curPos() const
{
return mBytesProcessed;
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp Fri Jul 6 07:43:42 2007
@@ -499,10 +499,10 @@
}
-unsigned int UnixHTTPURLInputStream::readBytes(XMLByte* const toFill
- , const unsigned int maxToRead)
+XMLSize_t UnixHTTPURLInputStream::readBytes(XMLByte* const toFill
+ , const XMLSize_t maxToRead)
{
- unsigned int len = fBufferEnd - fBufferPos;
+ XMLSize_t len = fBufferEnd - fBufferPos;
if (len > 0)
{
// If there's any data left over in the buffer into which we first
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp Fri Jul 6 07:43:42 2007
@@ -41,11 +41,11 @@
UnixHTTPURLInputStream(const XMLURL& urlSource, const XMLNetHTTPInfo* httpInfo=0);
~UnixHTTPURLInputStream();
- unsigned int curPos() const;
- unsigned int readBytes
+ XMLFilePos curPos() const;
+ XMLSize_t readBytes
(
XMLByte* const toFill
- , const unsigned int maxToRead
+ , const XMLSize_t maxToRead
);
@@ -82,7 +82,7 @@
}; // UnixHTTPURLInputStream
-inline unsigned int UnixHTTPURLInputStream::curPos() const
+inline XMLFilePos UnixHTTPURLInputStream::curPos() const
{
return fBytesProcessed;
}
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp Fri Jul 6 07:43:42 2007
@@ -604,10 +604,10 @@
//
// readBytes
//
-unsigned int BinHTTPURLInputStream::readBytes(XMLByte* const toFill
- , const unsigned int maxToRead)
+XMLSize_t BinHTTPURLInputStream::readBytes(XMLByte* const toFill
+ , const XMLSize_t maxToRead)
{
- unsigned int len = fBufferEnd - fBufferPos;
+ XMLSize_t len = fBufferEnd - fBufferPos;
if (len > 0)
{
// If there's any data left over in the buffer into which we first
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp Fri Jul 6 07:43:42 2007
@@ -42,11 +42,11 @@
BinHTTPURLInputStream(const XMLURL& urlSource, const XMLNetHTTPInfo* httpInfo=0);
~BinHTTPURLInputStream();
- unsigned int curPos() const;
- unsigned int readBytes
+ XMLFilePos curPos() const;
+ XMLSize_t readBytes
(
XMLByte* const toFill
- , const unsigned int maxToRead
+ , const XMLSize_t maxToRead
);
static void Cleanup();
@@ -78,7 +78,7 @@
// -----------------------------------------------------------------------
MemoryManager* fMemoryManager;
unsigned int fSocketHandle;
- unsigned int fBytesProcessed;
+ XMLSize_t fBytesProcessed;
char fBuffer[4000];
char * fBufferEnd;
char * fBufferPos;
@@ -90,7 +90,7 @@
};
-inline unsigned int BinHTTPURLInputStream::curPos() const
+inline XMLFilePos BinHTTPURLInputStream::curPos() const
{
return fBytesProcessed;
}
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp Fri Jul 6 07:43:42 2007
@@ -141,7 +141,7 @@
}
-unsigned int BinURLInputStream::curPos() const
+XMLFilePos BinURLInputStream::curPos() const
{
return fBytesProcessed;
}
@@ -154,12 +154,12 @@
}
-unsigned int BinURLInputStream::readBytes(XMLByte* const toFill
- , const unsigned int maxToRead)
+XMLSize_t BinURLInputStream::readBytes(XMLByte* const toFill
+ , const XMLSize_t maxToRead)
{
- unsigned int retval = 0;
- unsigned int bytesAsked = maxToRead;
- unsigned int bytesForCopy = 0;
+ XMLSize_t retval = 0;
+ XMLSize_t bytesAsked = maxToRead;
+ XMLSize_t bytesForCopy = 0;
// Wipe out the old stuff from the destination buffer to fill.
@@ -193,7 +193,7 @@
else
{
// ...will need to read some more bytes out of the stream.
- unsigned int bufToFillIndex = 0;
+ XMLSize_t bufToFillIndex = 0;
HTRequest* request = HTRequest_new();
HTChunk* result = NULL;
char ranges[64];
@@ -211,7 +211,7 @@
retval = bytesForCopy;
}
- unsigned int bytesRemainingForCopy = bytesAsked - bytesForCopy;
+ XMLSize_t bytesRemainingForCopy = bytesAsked - bytesForCopy;
// Now read a new chunk from the stream. HTTP lets you specify the
// range of bytes that you would like.
Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp Fri Jul 6 07:43:42 2007
@@ -48,11 +48,11 @@
BinURLInputStream(const XMLURL& urlSource);
~BinURLInputStream();
- unsigned int curPos() const;
- unsigned int readBytes
+ XMLFilePos curPos() const;
+ XMLSize_t readBytes
(
XMLByte* const toFill
- , const unsigned int maxToRead
+ , const XMLSize_t maxToRead
);
void reset();
unsigned int bytesAvail() const;
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=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp Fri Jul 6 07:43:42 2007
@@ -633,12 +633,12 @@
// ---------------------------------------------------------------------------
// Win32Transcoder: The virtual transcoder API
// ---------------------------------------------------------------------------
-unsigned int
+XMLSize_t
Win32Transcoder::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)
{
// Get temp pointers to the in and out buffers, and the chars sizes one
@@ -716,12 +716,12 @@
}
-unsigned int
+XMLSize_t
Win32Transcoder::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/xinclude/XIncludeUtils.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp?view=diff&rev=553903&r1=553902&r2=553903
==============================================================================
--- xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp (original)
+++ xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp Fri Jul 6 07:43:42 2007
@@ -547,11 +547,11 @@
throw OutOfMemoryException();
ArrayJanitor<unsigned char> janCharSizes(charSizes, XMLPlatformUtils::fgMemoryManager);
- unsigned int nRead, nOffset=0;
+ XMLSize_t nRead, nOffset=0;
XMLBuffer repository;
while((nRead=stream->readBytes(buffer+nOffset, maxToRead-nOffset))>0){
- unsigned int bytesEaten=0;
- unsigned int nCount = transcoder->transcodeFrom(buffer, nRead, xmlChars, maxToRead*2, bytesEaten, charSizes);
+ XMLSize_t bytesEaten=0;
+ XMLSize_t nCount = transcoder->transcodeFrom(buffer, nRead, xmlChars, maxToRead*2, bytesEaten, charSizes);
repository.append(xmlChars, nCount);
if(bytesEaten<nRead) {
nOffset=nRead-bytesEaten;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org