auriemma 01/02/14 10:51:25
Modified: c/src/XalanTransformer XalanCAPI.cpp XalanTransformer.cpp
XalanTransformer.hpp
Log:
Moved xerces intialization and terminate out of XalanTransformer class.
Revision Changes Path
1.9 +18 -0 xml-xalan/c/src/XalanTransformer/XalanCAPI.cpp
Index: XalanCAPI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanCAPI.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanCAPI.cpp 2001/02/08 15:38:54 1.8
+++ XalanCAPI.cpp 2001/02/14 18:51:24 1.9
@@ -54,6 +54,10 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+#include <util/PlatformUtils.hpp>
+
+
+
#include <XalanTransformer/XalanCAPI.h>
#include <XalanTransformer/XalanTransformer.hpp>
@@ -70,6 +74,10 @@
XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
XalanInitialize()
{
+ // Call the static initializer for Xerces.
+ XMLPlatformUtils::Initialize();
+
+ // Initialize Xalan.
XalanTransformer::initialize();
}
@@ -78,7 +86,11 @@
XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
XalanTerminate()
{
+ // Terminate Xalan.
XalanTransformer::terminate();
+
+ // Call the static terminator for Xerces.
+ XMLPlatformUtils::Terminate();
}
@@ -86,6 +98,7 @@
XALAN_TRANSFORMER_EXPORT_FUNCTION(XalanHandle)
CreateXalanTransformer()
{
+ // Create a XalanTransformer object.
return new XalanTransformer();
}
@@ -94,6 +107,7 @@
XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
DeleteXalanTransformer(XalanHandle theXalanHandle)
{
+ // Delete a XalanTransformer object.
#if defined(XALAN_OLD_STYLE_CASTS)
delete (XalanTransformer*)theXalanHandle;
#else
@@ -110,6 +124,7 @@
const char* theOutFileName,
XalanHandle theXalanHandle)
{
+ // Do the transformation...
#if defined(XALAN_OLD_STYLE_CASTS)
return ((XalanTransformer*)theXalanHandle)->transform(theXMLFileName,
theXSLFileName, theOutFileName);
#else
@@ -153,6 +168,7 @@
XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
XalanFreeData(char* theStream)
{
+ // Delete the data.
delete[] theStream;
}
@@ -167,6 +183,7 @@
XalanOutputHandlerType theOutputHandler,
XalanFlushHandlerType theFlushHandler)
{
+ // Do the transformation...
#if defined(XALAN_OLD_STYLE_CASTS)
return ((XalanTransformer*)theXalanHandle)->transform(theXMLFileName,
theXSLFileName, theOutputHandle, theOutputHandler, theFlushHandler);
#else
@@ -179,6 +196,7 @@
XALAN_TRANSFORMER_EXPORT_FUNCTION(XalanCCharPtr)
XalanGetLastError(XalanHandle theXalanHandle)
{
+ // Get the last error.
#if defined(XALAN_OLD_STYLE_CASTS)
return ((XalanTransformer*)theXalanHandle)->getLastError();
#else
1.8 +0 -12 xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp
Index: XalanTransformer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanTransformer.cpp 2001/02/14 16:28:57 1.7
+++ XalanTransformer.cpp 2001/02/14 18:51:24 1.8
@@ -54,10 +54,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-#include <util/PlatformUtils.hpp>
-
-
-
#include <sax/SAXException.hpp>
@@ -117,9 +113,6 @@
void
XalanTransformer::initialize()
{
- // Call the static initializer for Xerces.
- XMLPlatformUtils::Initialize();
-
// Initialize Xalan.
m_xsltInit = new XSLTInit;
}
@@ -131,11 +124,6 @@
{
// Terminate Xalan and release memory.
delete m_xsltInit;
-
- // Call the static terminator for Xerces.
- // We do not call terminate to Xerces because we have no way
- // of knowing if it is being used elsewhere in the process.
- //XMLPlatformUtils::Terminate();
}
1.10 +2 -2 xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp
Index: XalanTransformer.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XalanTransformer.hpp 2001/02/13 16:41:43 1.9
+++ XalanTransformer.hpp 2001/02/14 18:51:24 1.10
@@ -123,7 +123,7 @@
virtual ~XalanTransformer();
/**
- * Initialize Xerces and Xalan.
+ * Initialize Xalan.
* Should be called only once per process before creating any
* instances of XalanTransformer. See class XSLTInit.
*/
@@ -131,7 +131,7 @@
initialize();
/**
- * Terminate Xalan and Xerces.
+ * Terminate Xalan.
* Should be called only once per process after deleting all
* instances of XalanTransformer. See class XSLTInit.
*/
