cargilld 2003/12/17 07:16:10
Modified: c/src/xercesc/util/Platforms/AIX AIXPlatformUtils.cpp
c/src/xercesc/util/Platforms/BeOS BeOSPlatformUtils.cpp
c/src/xercesc/util/Platforms/FreeBSD
FreeBSDPlatformUtils.cpp
c/src/xercesc/util/Platforms/HPUX HPPlatformUtils.cpp
c/src/xercesc/util/Platforms/IRIX IRIXPlatformUtils.cpp
c/src/xercesc/util/Platforms/Linux LinuxPlatformUtils.cpp
c/src/xercesc/util/Platforms/MacOS MacOSPlatformUtils.cpp
c/src/xercesc/util/Platforms/NetBSD NetBSDPlatformUtils.cpp
c/src/xercesc/util/Platforms/OpenServer
OpenServerPlatformUtils.cpp
c/src/xercesc/util/Platforms/OS2 OS2PlatformUtils.cpp
c/src/xercesc/util/Platforms/OS400 OS400PlatformUtils.cpp
c/src/xercesc/util/Platforms/QNX QNXPlatformUtils.cpp
c/src/xercesc/util/Platforms/Solaris
SolarisPlatformUtils.cpp
c/src/xercesc/util/Platforms/Tandem TandemPlatformUtils.cpp
c/src/xercesc/util/Platforms/Tru64 Tru64PlatformUtils.cpp
c/src/xercesc/util/Platforms/UnixWare
UnixWarePlatformUtils.cpp
Log:
Platform update for memory management so that the static memory manager (one
used to call Initialize) is only for static data.
Revision Changes Path
1.19 +13 -9 xml-xerces/c/src/xercesc/util/Platforms/AIX/AIXPlatformUtils.cpp
Index: AIXPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/AIX/AIXPlatformUtils.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AIXPlatformUtils.cpp 17 Dec 2003 13:58:02 -0000 1.18
+++ AIXPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.19
@@ -225,10 +225,11 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
if (retVal == NULL)
@@ -236,7 +237,8 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
FileHandle retVal = (FILE*)fopen( fileName , "rb" );
@@ -245,14 +247,16 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "wb" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName , "wb" );
}
1.10 +16 -8
xml-xerces/c/src/xercesc/util/Platforms/BeOS/BeOSPlatformUtils.cpp
Index: BeOSPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/BeOS/BeOSPlatformUtils.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BeOSPlatformUtils.cpp 17 Dec 2003 13:58:02 -0000 1.9
+++ BeOSPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.10
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.10 2003/12/17 15:16:10 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.9 2003/12/17 13:58:02 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -285,10 +289,11 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
if (retVal == NULL)
@@ -296,7 +301,8 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
FileHandle retVal = (FILE*)fopen( fileName , "rb" );
@@ -305,14 +311,16 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "wb" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName , "wb" );
}
1.17 +16 -8
xml-xerces/c/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp
Index: FreeBSDPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FreeBSDPlatformUtils.cpp 17 Dec 2003 13:58:02 -0000 1.16
+++ FreeBSDPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.17
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.17 2003/12/17 15:16:10 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.16 2003/12/17 13:58:02 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -308,18 +312,20 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
if (fileName == NULL)
ThrowXML(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero);
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FileHandle)fopen( tmpFileName , "r" );
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
if (fileName == NULL)
ThrowXML(XMLPlatformUtilsException,
@@ -328,17 +334,19 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
if (fileName == NULL)
ThrowXML(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero);
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "w" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
if (fileName == NULL)
ThrowXML(XMLPlatformUtilsException,
1.16 +17 -10 xml-xerces/c/src/xercesc/util/Platforms/HPUX/HPPlatformUtils.cpp
Index: HPPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/HPUX/HPPlatformUtils.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- HPPlatformUtils.cpp 17 Dec 2003 13:58:02 -0000 1.15
+++ HPPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.16
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.16 2003/12/17 15:16:10 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.15 2003/12/17 13:58:02 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -372,28 +376,31 @@
return (unsigned int) retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
FileHandle retVal = (FILE*) fopen(fileName , "rb");
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- FileHandle retVal = (FILE*) fopen(tmpFileName , "rb");
- fgMemoryManager->deallocate(tmpFileName);//delete [] tmpFileName;
- return retVal;
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
+ return fopen(tmpFileName , "rb");
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "wb" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName , "wb" );
}
1.15 +16 -8
xml-xerces/c/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp
Index: IRIXPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- IRIXPlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.14
+++ IRIXPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.15
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.15 2003/12/17 15:16:10 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.14 2003/12/17 13:58:03 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -331,10 +335,11 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
if (retVal == NULL)
@@ -342,7 +347,8 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
FileHandle retVal = (FILE*)fopen( fileName , "rb" );
@@ -353,14 +359,16 @@
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "wb" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName , "wb" );
}
1.19 +16 -8
xml-xerces/c/src/xercesc/util/Platforms/Linux/LinuxPlatformUtils.cpp
Index: LinuxPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Linux/LinuxPlatformUtils.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LinuxPlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.18
+++ LinuxPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.19
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.19 2003/12/17 15:16:10 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.18 2003/12/17 13:58:03 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -382,10 +386,11 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
if (retVal == NULL)
@@ -393,7 +398,8 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
FileHandle retVal = (FILE*)fopen( fileName , "rb" );
@@ -402,14 +408,16 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "wb" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName , "wb" );
}
1.21 +12 -9
xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp
Index: MacOSPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MacOSPlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.20
+++ MacOSPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.21
@@ -219,11 +219,12 @@
FileHandle
-XMLPlatformUtils::openFile(const char* const fileName)
+XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
// Check to make sure the file system is in a state where we can use it
if (!gFileSystemCompatible)
- ThrowXML1(XMLPlatformUtilsException, XMLExcepts::File_CouldNotOpenFile,
fileName);
+ ThrowXMLwithMemMgr1(XMLPlatformUtilsException,
XMLExcepts::File_CouldNotOpenFile, fileName, manager);
Janitor<XMLMacAbstractFile> file(XMLMakeMacFile());
@@ -232,11 +233,11 @@
FileHandle
-XMLPlatformUtils::openFile(const XMLCh* const fileName)
+XMLPlatformUtils::openFile(const XMLCh* const fileName, MemoryManager* const
manager)
{
// Check to make sure the file system is in a state where we can use it
if (!gFileSystemCompatible)
- ThrowXML1(XMLPlatformUtilsException, XMLExcepts::File_CouldNotOpenFile,
fileName);
+ ThrowXMLwithMemMgr1(XMLPlatformUtilsException,
XMLExcepts::File_CouldNotOpenFile, fileName, manager);
Janitor<XMLMacAbstractFile> file(XMLMakeMacFile());
@@ -245,11 +246,12 @@
FileHandle
-XMLPlatformUtils::openFileToWrite(const char* const fileName)
+XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
// Check to make sure the file system is in a state where we can use it
if (!gFileSystemCompatible)
- ThrowXML1(XMLPlatformUtilsException, XMLExcepts::File_CouldNotOpenFile,
fileName);
+ ThrowXMLwithMemMgr1(XMLPlatformUtilsException,
XMLExcepts::File_CouldNotOpenFile, fileName, manager);
Janitor<XMLMacAbstractFile> file(XMLMakeMacFile());
@@ -258,11 +260,12 @@
FileHandle
-XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
// Check to make sure the file system is in a state where we can use it
if (!gFileSystemCompatible)
- ThrowXML1(XMLPlatformUtilsException, XMLExcepts::File_CouldNotOpenFile,
fileName);
+ ThrowXMLwithMemMgr1(XMLPlatformUtilsException,
XMLExcepts::File_CouldNotOpenFile, fileName, manager);
Janitor<XMLMacAbstractFile> file(XMLMakeMacFile());
1.8 +20 -16
xml-xerces/c/src/xercesc/util/Platforms/NetBSD/NetBSDPlatformUtils.cpp
Index: NetBSDPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/NetBSD/NetBSDPlatformUtils.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetBSDPlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.7
+++ NetBSDPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.8
@@ -280,13 +280,14 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
if (fileName == NULL)
- ThrowXML(XMLPlatformUtilsException,
- XMLExcepts::CPtr_PointerIsZero);
- const char* tmpFileName = XMLString::transcode(fileName,
XMLPlatformUtils::fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName,
XMLPlatformUtils::fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+ XMLExcepts::CPtr_PointerIsZero, manager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "r+" );
if (retVal == NULL)
@@ -294,11 +295,12 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
if (fileName == NULL)
- ThrowXML(XMLPlatformUtilsException,
- XMLExcepts::CPtr_PointerIsZero);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+ XMLExcepts::CPtr_PointerIsZero, manager);
FileHandle retVal = (FILE*)fopen( fileName , "r+" );
if (retVal == NULL)
@@ -306,13 +308,14 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
if (fileName == NULL)
- ThrowXML(XMLPlatformUtilsException,
- XMLExcepts::CPtr_PointerIsZero);
- const char* tmpFileName = XMLString::transcode(fileName,
XMLPlatformUtils::fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName,
XMLPlatformUtils::fgMemoryManager);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+ XMLExcepts::CPtr_PointerIsZero, manager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen( tmpFileName, "r+" );
if (retVal == NULL)
@@ -320,11 +323,12 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
if (fileName == NULL)
- ThrowXML(XMLPlatformUtilsException,
- XMLExcepts::CPtr_PointerIsZero);
+ ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+ XMLExcepts::CPtr_PointerIsZero, manager);
FileHandle retVal = (FILE*)fopen( fileName, "r+" );
if (retVal == NULL)
1.11 +16 -8
xml-xerces/c/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
Index: OpenServerPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OpenServerPlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.10
+++ OpenServerPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.11
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.11 2003/12/17 15:16:10 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.10 2003/12/17 13:58:03 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -262,10 +266,11 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen(tmpFileName , "rb");
if (retVal == NULL)
@@ -274,7 +279,8 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
FileHandle retVal = (FILE*)fopen(fileName, "rb");
@@ -284,14 +290,16 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "wb" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName , "wb" );
}
1.8 +7 -5 xml-xerces/c/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp
Index: OS2PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- OS2PlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.7
+++ OS2PlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.8
@@ -140,7 +140,8 @@
return (unsigned int)filelength(fileno((FILE *)theFile));
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
FileHandle retVal = (FILE*)fopen( fileName , "rb" );
@@ -149,10 +150,11 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
if (retVal == NULL)
1.14 +13 -9
xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
Index: OS400PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- OS400PlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.13
+++ OS400PlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.14
@@ -254,10 +254,11 @@
#include <qmhrtvm.h>
#include <qusec.h>
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{ char errno_id[7];
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
errno = 0;
FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
@@ -271,7 +272,8 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{ char errno_id[7];
errno = 0;
FileHandle retVal = (FILE*)fopen( fileName , "rb" );
@@ -286,15 +288,17 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return openFileToWrite(tmpFileName);
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
char errno_id[7];
errno = 0;
1.7 +13 -9 xml-xerces/c/src/xercesc/util/Platforms/QNX/QNXPlatformUtils.cpp
Index: QNXPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/QNX/QNXPlatformUtils.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- QNXPlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.6
+++ QNXPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.7
@@ -153,27 +153,31 @@
return sbuf.st_size;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName, "rb" );
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return openFile( tmpFileName );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName, "wb" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return openFileToWrite(tmpFileName);
}
1.19 +13 -9
xml-xerces/c/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
Index: SolarisPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SolarisPlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.18
+++ SolarisPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.19
@@ -248,7 +248,8 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
int retVal = open( fileName , O_RDONLY );
@@ -257,10 +258,11 @@
return (FileHandle)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
int retVal = open( tmpFileName , O_RDONLY );
if (retVal == -1)
@@ -268,14 +270,16 @@
return (FileHandle)retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return (FileHandle)open( tmpFileName , O_WRONLY | O_CREAT );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return (FileHandle)open( fileName , O_WRONLY | O_CREAT );
}
1.12 +8 -3
xml-xerces/c/src/xercesc/util/Platforms/Tandem/TandemPlatformUtils.cpp
Index: TandemPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Tandem/TandemPlatformUtils.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TandemPlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.11
+++ TandemPlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.12
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.12 2003/12/17 15:16:10 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.11 2003/12/17 13:58:03 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -223,10 +227,11 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const unsigned short* const fileName)
+FileHandle XMLPlatformUtils::openFile(const unsigned short* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> tmpFileNameJan((char*)tmpFileName , fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> tmpFileNameJan((char*)tmpFileName , manager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
if (retVal == NULL)
1.13 +13 -9
xml-xerces/c/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
Index: Tru64PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Tru64PlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.12
+++ Tru64PlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.13
@@ -245,7 +245,8 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
FileHandle retVal = (FILE*)fopen( fileName , "rb" );
@@ -254,10 +255,11 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
if (retVal == NULL)
@@ -265,14 +267,16 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "wb" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName , "wb" );
}
1.13 +16 -8
xml-xerces/c/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
Index: UnixWarePlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- UnixWarePlatformUtils.cpp 17 Dec 2003 13:58:03 -0000 1.12
+++ UnixWarePlatformUtils.cpp 17 Dec 2003 15:16:10 -0000 1.13
@@ -56,6 +56,10 @@
/*
* $Log$
+ * Revision 1.13 2003/12/17 15:16:10 cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
* Revision 1.12 2003/12/17 13:58:03 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -315,10 +319,11 @@
return (unsigned int)retVal;
}
-FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "rb" );
if (retVal == NULL)
@@ -326,7 +331,8 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFile(const char* const fileName)
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+ , MemoryManager* const manager)
{
FileHandle retVal = (FILE*)fopen( fileName , "rb" );
@@ -335,14 +341,16 @@
return retVal;
}
-FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+ , MemoryManager* const manager)
{
- const char* tmpFileName = XMLString::transcode(fileName, fgMemoryManager);
- ArrayJanitor<char> janText((char*)tmpFileName, fgMemoryManager);
+ const char* tmpFileName = XMLString::transcode(fileName, manager);
+ ArrayJanitor<char> janText((char*)tmpFileName, manager);
return fopen( tmpFileName , "wb" );
}
-FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName)
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+ , MemoryManager* const manager)
{
return fopen( fileName , "wb" );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
