Author: amassari
Date: Wed Oct 18 05:37:58 2006
New Revision: 465238
URL: http://svn.apache.org/viewvc?view=rev&rev=465238
Log:
Rename XMLFileMgr APIs open/close/reset/read/write to avoid commonly defined
macros
Modified:
xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.cpp
xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.hpp
xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.cpp
xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.hpp
xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp
xerces/c/trunk/src/xercesc/util/XMLFileMgr.hpp
Modified: xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.cpp?view=diff&rev=465238&r1=465237&r2=465238
==============================================================================
--- xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.cpp Wed Oct 18
05:37:58 2006
@@ -45,16 +45,16 @@
FileHandle
-PosixFileMgr::open(const XMLCh* path, bool toWrite, MemoryManager* const
manager)
+PosixFileMgr::fileOpen(const XMLCh* path, bool toWrite, MemoryManager* const
manager)
{
const char* tmpFileName = XMLString::transcode(path, manager);
ArrayJanitor<char> janText((char*)tmpFileName, manager);
- return open(tmpFileName, toWrite, manager);
+ return fileOpen(tmpFileName, toWrite, manager);
}
FileHandle
-PosixFileMgr::open(const char* path, bool toWrite, MemoryManager* const
/*manager*/)
+PosixFileMgr::fileOpen(const char* path, bool toWrite, MemoryManager* const
/*manager*/)
{
const char* perms = (toWrite) ? "wb" : "rb";
FileHandle result = (FileHandle)fopen(path , perms);
@@ -70,7 +70,7 @@
void
-PosixFileMgr::close(FileHandle f, MemoryManager* const manager)
+PosixFileMgr::fileClose(FileHandle f, MemoryManager* const manager)
{
if (!f)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
@@ -82,7 +82,7 @@
void
-PosixFileMgr::reset(FileHandle f, MemoryManager* const manager)
+PosixFileMgr::fileReset(FileHandle f, MemoryManager* const manager)
{
if (!f)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
@@ -110,7 +110,7 @@
XMLFilePos
-PosixFileMgr::size(FileHandle f, MemoryManager* const manager)
+PosixFileMgr::fileSize(FileHandle f, MemoryManager* const manager)
{
if (!f)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
@@ -137,7 +137,7 @@
XMLSize_t
-PosixFileMgr::read(FileHandle f, XMLSize_t byteCount, XMLByte* buffer,
MemoryManager* const manager)
+PosixFileMgr::fileRead(FileHandle f, XMLSize_t byteCount, XMLByte* buffer,
MemoryManager* const manager)
{
if (!f || !buffer)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
@@ -156,7 +156,7 @@
void
-PosixFileMgr::write(FileHandle f, XMLSize_t byteCount, const XMLByte* buffer,
MemoryManager* const manager)
+PosixFileMgr::fileWrite(FileHandle f, XMLSize_t byteCount, const XMLByte*
buffer, MemoryManager* const manager)
{
if (!f || !buffer)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
Modified: xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.hpp?view=diff&rev=465238&r1=465237&r2=465238
==============================================================================
--- xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/FileManagers/PosixFileMgr.hpp Wed Oct 18
05:37:58 2006
@@ -34,18 +34,18 @@
virtual ~PosixFileMgr();
// File access
- virtual FileHandle open(const XMLCh* path, bool toWrite,
MemoryManager* const manager);
- virtual FileHandle open(const char* path, bool toWrite,
MemoryManager* const manager);
+ virtual FileHandle fileOpen(const XMLCh* path, bool toWrite,
MemoryManager* const manager);
+ virtual FileHandle fileOpen(const char* path, bool toWrite,
MemoryManager* const manager);
virtual FileHandle openStdIn(MemoryManager* const manager);
- virtual void close(FileHandle f, MemoryManager* const
manager);
- virtual void reset(FileHandle f, MemoryManager* const
manager);
+ virtual void fileClose(FileHandle f, MemoryManager* const
manager);
+ virtual void fileReset(FileHandle f, MemoryManager* const
manager);
virtual XMLFilePos curPos(FileHandle f, MemoryManager* const
manager);
- virtual XMLFilePos size(FileHandle f, MemoryManager* const
manager);
+ virtual XMLFilePos fileSize(FileHandle f, MemoryManager* const
manager);
- virtual size_t read(FileHandle f, size_t byteCount, XMLByte*
buffer, MemoryManager* const manager);
- virtual void write(FileHandle f, size_t byteCount, const
XMLByte* buffer, MemoryManager* const manager);
+ virtual XMLSize_t fileRead(FileHandle f, XMLSize_t byteCount,
XMLByte* buffer, MemoryManager* const manager);
+ virtual void fileWrite(FileHandle f, XMLSize_t byteCount,
const XMLByte* buffer, MemoryManager* const manager);
// Ancillary path handling routines
virtual XMLCh* getFullPath(const XMLCh* const srcPath,
MemoryManager* const manager);
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=465238&r1=465237&r2=465238
==============================================================================
--- xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.cpp Wed Oct 18
05:37:58 2006
@@ -50,7 +50,7 @@
FileHandle
-WindowsFileMgr::open(const XMLCh* fileName, bool toWrite, MemoryManager* const
manager)
+WindowsFileMgr::fileOpen(const XMLCh* fileName, bool toWrite, MemoryManager*
const manager)
{
// Watch for obvious wierdness
if (!fileName)
@@ -178,11 +178,11 @@
FileHandle
-WindowsFileMgr::open(const char* path, bool toWrite, MemoryManager* const
manager)
+WindowsFileMgr::fileOpen(const char* path, bool toWrite, MemoryManager* const
manager)
{
XMLCh* tmpFileName = XMLString::transcode(path, manager);
ArrayJanitor<XMLCh> janText(tmpFileName, manager);
- return open(tmpFileName, toWrite, manager);
+ return fileOpen(tmpFileName, toWrite, manager);
}
@@ -219,7 +219,7 @@
void
-WindowsFileMgr::close(FileHandle f, MemoryManager* const manager)
+WindowsFileMgr::fileClose(FileHandle f, MemoryManager* const manager)
{
if (!f)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
@@ -230,7 +230,7 @@
void
-WindowsFileMgr::reset(FileHandle f, MemoryManager* const manager)
+WindowsFileMgr::fileReset(FileHandle f, MemoryManager* const manager)
{
if (!f)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
@@ -257,7 +257,7 @@
XMLFilePos
-WindowsFileMgr::size(FileHandle f, MemoryManager* const manager)
+WindowsFileMgr::fileSize(FileHandle f, MemoryManager* const manager)
{
if (!f)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
@@ -273,7 +273,7 @@
XMLSize_t
-WindowsFileMgr::read(FileHandle f, XMLSize_t byteCount, XMLByte* buffer,
MemoryManager* const manager)
+WindowsFileMgr::fileRead(FileHandle f, XMLSize_t byteCount, XMLByte* buffer,
MemoryManager* const manager)
{
if (!f || !buffer)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
@@ -293,7 +293,7 @@
void
-WindowsFileMgr::write(FileHandle f, XMLSize_t byteCount, const XMLByte*
buffer, MemoryManager* const manager)
+WindowsFileMgr::fileWrite(FileHandle f, XMLSize_t byteCount, const XMLByte*
buffer, MemoryManager* const manager)
{
if (!f || !buffer)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, manager);
Modified: xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.hpp?view=diff&rev=465238&r1=465237&r2=465238
==============================================================================
--- xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/FileManagers/WindowsFileMgr.hpp Wed Oct 18
05:37:58 2006
@@ -34,18 +34,18 @@
virtual ~WindowsFileMgr();
// File access
- virtual FileHandle open(const XMLCh* path, bool toWrite,
MemoryManager* const manager);
- virtual FileHandle open(const char* path, bool toWrite,
MemoryManager* const manager);
+ virtual FileHandle fileOpen(const XMLCh* path, bool toWrite,
MemoryManager* const manager);
+ virtual FileHandle fileOpen(const char* path, bool toWrite,
MemoryManager* const manager);
virtual FileHandle openStdIn(MemoryManager* const manager);
- virtual void close(FileHandle f, MemoryManager* const
manager);
- virtual void reset(FileHandle f, MemoryManager* const
manager);
+ virtual void fileClose(FileHandle f, MemoryManager* const
manager);
+ virtual void fileReset(FileHandle f, MemoryManager* const
manager);
virtual XMLFilePos curPos(FileHandle f, MemoryManager* const
manager);
- virtual XMLFilePos size(FileHandle f, MemoryManager* const
manager);
+ virtual XMLFilePos fileSize(FileHandle f, MemoryManager* const
manager);
- virtual XMLSize_t read(FileHandle f, XMLSize_t byteCount, XMLByte*
buffer, MemoryManager* const manager);
- virtual void write(FileHandle f, XMLSize_t byteCount, const
XMLByte* buffer, MemoryManager* const manager);
+ virtual XMLSize_t fileRead(FileHandle f, XMLSize_t byteCount,
XMLByte* buffer, MemoryManager* const manager);
+ virtual void fileWrite(FileHandle f, XMLSize_t byteCount,
const XMLByte* buffer, MemoryManager* const manager);
// Ancillary path handling routines
virtual XMLCh* getFullPath(const XMLCh* const srcPath,
MemoryManager* const manager);
Modified: xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp?view=diff&rev=465238&r1=465237&r2=465238
==============================================================================
--- xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp Wed Oct 18 05:37:58 2006
@@ -521,7 +521,7 @@
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->open(fileName, false, memmgr);
+ return fgFileMgr->fileOpen(fileName, false, memmgr);
}
@@ -531,7 +531,7 @@
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->open(fileName, false, memmgr);
+ return fgFileMgr->fileOpen(fileName, false, memmgr);
}
@@ -542,7 +542,7 @@
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->open(fileName, true, memmgr);
+ return fgFileMgr->fileOpen(fileName, true, memmgr);
}
@@ -553,7 +553,7 @@
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->open(fileName, true, memmgr);
+ return fgFileMgr->fileOpen(fileName, true, memmgr);
}
@@ -574,7 +574,7 @@
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, memmgr);
- fgFileMgr->close(theFile, memmgr);
+ fgFileMgr->fileClose(theFile, memmgr);
}
void
@@ -584,7 +584,7 @@
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, memmgr);
- fgFileMgr->reset(theFile, memmgr);
+ fgFileMgr->fileReset(theFile, memmgr);
}
@@ -605,7 +605,7 @@
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->size(theFile, memmgr);
+ return fgFileMgr->fileSize(theFile, memmgr);
}
@@ -618,7 +618,7 @@
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->read(theFile, toRead, toFill, memmgr);
+ return fgFileMgr->fileRead(theFile, toRead, toFill, memmgr);
}
@@ -631,7 +631,7 @@
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero, memmgr);
- fgFileMgr->write(theFile, toWrite, toFlush, memmgr);
+ fgFileMgr->fileWrite(theFile, toWrite, toFlush, memmgr);
}
Modified: xerces/c/trunk/src/xercesc/util/XMLFileMgr.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLFileMgr.hpp?view=diff&rev=465238&r1=465237&r2=465238
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLFileMgr.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLFileMgr.hpp Wed Oct 18 05:37:58 2006
@@ -37,18 +37,18 @@
virtual ~XMLFileMgr() {}
// File access
- virtual FileHandle open(const XMLCh* path, bool toWrite,
MemoryManager* const manager) = 0;
- virtual FileHandle open(const char* path, bool toWrite,
MemoryManager* const manager) = 0;
+ virtual FileHandle fileOpen(const XMLCh* path, bool toWrite,
MemoryManager* const manager) = 0;
+ virtual FileHandle fileOpen(const char* path, bool toWrite,
MemoryManager* const manager) = 0;
virtual FileHandle openStdIn(MemoryManager* const manager) = 0;
- virtual void close(FileHandle f, MemoryManager* const
manager) = 0;
- virtual void reset(FileHandle f, MemoryManager* const
manager) = 0;
+ virtual void fileClose(FileHandle f, MemoryManager* const
manager) = 0;
+ virtual void fileReset(FileHandle f, MemoryManager* const
manager) = 0;
virtual XMLFilePos curPos(FileHandle f, MemoryManager* const
manager) = 0;
- virtual XMLFilePos size(FileHandle f, MemoryManager* const
manager) = 0;
+ virtual XMLFilePos fileSize(FileHandle f, MemoryManager* const
manager) = 0;
- virtual XMLSize_t read(FileHandle f, XMLSize_t byteCount,
XMLByte* buffer, MemoryManager* const manager) = 0;
- virtual void write(FileHandle f, XMLSize_t byteCount, const
XMLByte* buffer, MemoryManager* const manager) = 0;
+ virtual XMLSize_t fileRead(FileHandle f, XMLSize_t byteCount,
XMLByte* buffer, MemoryManager* const manager) = 0;
+ virtual void fileWrite(FileHandle f, XMLSize_t byteCount,
const XMLByte* buffer, MemoryManager* const manager) = 0;
// Ancillary path handling routines
virtual XMLCh* getFullPath(const XMLCh* const srcPath,
MemoryManager* const manager) = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
