From ff2d660227c0c2803d3c5a9a0320fce7254f98ef Mon Sep 17 00:00:00 2001
From: Alberto Massari <amassari@apache.org>
Date: Wed, 18 Oct 2006 12:37:58 +0000
Subject: [PATCH] Rename XMLFileMgr APIs open/close/reset/read/write to avoid
commonly defined macros
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@465238 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/util/FileManagers/PosixFileMgr.cpp | 16 ++++++++--------
src/xercesc/util/FileManagers/PosixFileMgr.hpp | 14 +++++++-------
.../util/FileManagers/WindowsFileMgr.cpp | 16 ++++++++--------
.../util/FileManagers/WindowsFileMgr.hpp | 14 +++++++-------
src/xercesc/util/PlatformUtils.cpp | 18 +++++++++---------
src/xercesc/util/XMLFileMgr.hpp | 14 +++++++-------
6 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/xercesc/util/FileManagers/PosixFileMgr.cpp b/src/xercesc/util/FileManagers/PosixFileMgr.cpp
index a483f6c6b..057c2920d 100644
--- a/src/xercesc/util/FileManagers/PosixFileMgr.cpp
+++ b/src/xercesc/util/FileManagers/PosixFileMgr.cpp
@@ -45,16 +45,16 @@ PosixFileMgr::~PosixFileMgr()
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 @@ PosixFileMgr::openStdIn(MemoryManager* const /*manager*/)
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 @@ PosixFileMgr::close(FileHandle f, MemoryManager* const manager)
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 @@ PosixFileMgr::curPos(FileHandle f, MemoryManager* const manager)
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 @@ PosixFileMgr::size(FileHandle f, MemoryManager* const manager)
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 @@ PosixFileMgr::read(FileHandle f, XMLSize_t byteCount, XMLByte* buffer, MemoryMan
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);
diff --git a/src/xercesc/util/FileManagers/PosixFileMgr.hpp b/src/xercesc/util/FileManagers/PosixFileMgr.hpp
index 1ae39c941..f2b33ac40 100644
--- a/src/xercesc/util/FileManagers/PosixFileMgr.hpp
+++ b/src/xercesc/util/FileManagers/PosixFileMgr.hpp
@@ -34,18 +34,18 @@ class PosixFileMgr : public XMLFileMgr
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);
diff --git a/src/xercesc/util/FileManagers/WindowsFileMgr.cpp b/src/xercesc/util/FileManagers/WindowsFileMgr.cpp
index d7eefdda7..c18d7e834 100644
--- a/src/xercesc/util/FileManagers/WindowsFileMgr.cpp
+++ b/src/xercesc/util/FileManagers/WindowsFileMgr.cpp
@@ -50,7 +50,7 @@ WindowsFileMgr::~WindowsFileMgr()
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 @@ WindowsFileMgr::open(const XMLCh* fileName, bool toWrite, MemoryManager* const m
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 @@ WindowsFileMgr::openStdIn(MemoryManager* const manager)
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 @@ WindowsFileMgr::close(FileHandle f, MemoryManager* const manager)
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 @@ WindowsFileMgr::curPos(FileHandle f, MemoryManager* const manager)
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 @@ WindowsFileMgr::size(FileHandle f, MemoryManager* const manager)
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 @@ WindowsFileMgr::read(FileHandle f, XMLSize_t byteCount, XMLByte* buffer, MemoryM
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);
diff --git a/src/xercesc/util/FileManagers/WindowsFileMgr.hpp b/src/xercesc/util/FileManagers/WindowsFileMgr.hpp
index 66d4447f6..1d160dce5 100644
--- a/src/xercesc/util/FileManagers/WindowsFileMgr.hpp
+++ b/src/xercesc/util/FileManagers/WindowsFileMgr.hpp
@@ -34,18 +34,18 @@ class WindowsFileMgr : public XMLFileMgr
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);
diff --git a/src/xercesc/util/PlatformUtils.cpp b/src/xercesc/util/PlatformUtils.cpp
index e2da0c7c5..1d9ca178c 100644
--- a/src/xercesc/util/PlatformUtils.cpp
+++ b/src/xercesc/util/PlatformUtils.cpp
@@ -521,7 +521,7 @@ XMLPlatformUtils::openFile(const char* const fileName
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->open(fileName, false, memmgr);
+ return fgFileMgr->fileOpen(fileName, false, memmgr);
}
@@ -531,7 +531,7 @@ XMLPlatformUtils::openFile(const XMLCh* const fileName, MemoryManager* const mem
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->open(fileName, false, memmgr);
+ return fgFileMgr->fileOpen(fileName, false, memmgr);
}
@@ -542,7 +542,7 @@ XMLPlatformUtils::openFileToWrite(const char* const fileName
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->open(fileName, true, memmgr);
+ return fgFileMgr->fileOpen(fileName, true, memmgr);
}
@@ -553,7 +553,7 @@ XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->open(fileName, true, memmgr);
+ return fgFileMgr->fileOpen(fileName, true, memmgr);
}
@@ -574,7 +574,7 @@ XMLPlatformUtils::closeFile(const FileHandle theFile
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, memmgr);
- fgFileMgr->close(theFile, memmgr);
+ fgFileMgr->fileClose(theFile, memmgr);
}
void
@@ -584,7 +584,7 @@ XMLPlatformUtils::resetFile(FileHandle theFile
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, memmgr);
- fgFileMgr->reset(theFile, memmgr);
+ fgFileMgr->fileReset(theFile, memmgr);
}
@@ -605,7 +605,7 @@ XMLPlatformUtils::fileSize(const FileHandle theFile
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, memmgr);
- return fgFileMgr->size(theFile, memmgr);
+ return fgFileMgr->fileSize(theFile, memmgr);
}
@@ -618,7 +618,7 @@ XMLPlatformUtils::readFileBuffer( const FileHandle theFile
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 @@ XMLPlatformUtils::writeBufferToFile( const FileHandle theFile
if (!fgFileMgr)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::CPtr_PointerIsZero, memmgr);
- fgFileMgr->write(theFile, toWrite, toFlush, memmgr);
+ fgFileMgr->fileWrite(theFile, toWrite, toFlush, memmgr);
}
diff --git a/src/xercesc/util/XMLFileMgr.hpp b/src/xercesc/util/XMLFileMgr.hpp
index 3efbde21d..d3e5877b3 100644
--- a/src/xercesc/util/XMLFileMgr.hpp
+++ b/src/xercesc/util/XMLFileMgr.hpp
@@ -37,18 +37,18 @@ class XMLFileMgr : public XMemory
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;
--
GitLab