You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2003/12/17 04:56:16 UTC
cvs commit: xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile MsgLoader.cpp MsgLoader.hpp
neilg 2003/12/16 19:56:16
Modified: c/src/xercesc/util/MsgLoaders/InMemory InMemMsgLoader.cpp
InMemMsgLoader.hpp
c/src/xercesc/util/MsgLoaders/ICU ICUMsgLoader.cpp
ICUMsgLoader.hpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
MsgCatalogLoader.cpp MsgCatalogLoader.hpp
c/src/xercesc/util/MsgLoaders/MsgFile MsgLoader.cpp
MsgLoader.hpp
Log:
add default memory manager parameter to loadMsg method that uses char * parameters
Revision Changes Path
1.9 +15 -10 xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp
Index: InMemMsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InMemMsgLoader.cpp 15 May 2003 18:29:49 -0000 1.8
+++ InMemMsgLoader.cpp 17 Dec 2003 03:56:15 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2003/12/17 03:56:15 neilg
+ * add default memory manager parameter to loadMsg method that uses char * parameters
+ *
* Revision 1.8 2003/05/15 18:29:49 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -221,7 +224,8 @@
, const char* const repText1
, const char* const repText2
, const char* const repText3
- , const char* const repText4)
+ , const char* const repText4
+ , MemoryManager * const manager)
{
//
// Transcode the provided parameters and call the other version,
@@ -231,27 +235,28 @@
XMLCh* tmp2 = 0;
XMLCh* tmp3 = 0;
XMLCh* tmp4 = 0;
+ MemoryManager *managerToUse = (manager)?manager:XMLPlatformUtils::fgMemoryManager;
bool bRet = false;
if (repText1)
- tmp1 = XMLString::transcode(repText1, XMLPlatformUtils::fgMemoryManager);
+ tmp1 = XMLString::transcode(repText1, managerToUse);
if (repText2)
- tmp2 = XMLString::transcode(repText2, XMLPlatformUtils::fgMemoryManager);
+ tmp2 = XMLString::transcode(repText2, managerToUse);
if (repText3)
- tmp3 = XMLString::transcode(repText3, XMLPlatformUtils::fgMemoryManager);
+ tmp3 = XMLString::transcode(repText3, managerToUse);
if (repText4)
- tmp4 = XMLString::transcode(repText4, XMLPlatformUtils::fgMemoryManager);
+ tmp4 = XMLString::transcode(repText4, managerToUse);
bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4);
if (tmp1)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp1);//delete [] tmp1;
+ managerToUse->deallocate(tmp1);//delete [] tmp1;
if (tmp2)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp2);//delete [] tmp2;
+ managerToUse->deallocate(tmp2);//delete [] tmp2;
if (tmp3)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp3);//delete [] tmp3;
+ managerToUse->deallocate(tmp3);//delete [] tmp3;
if (tmp4)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp4);//delete [] tmp4;
+ managerToUse->deallocate(tmp4);//delete [] tmp4;
return bRet;
}
1.4 +5 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp
Index: InMemMsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InMemMsgLoader.hpp 7 Mar 2003 18:15:44 -0000 1.3
+++ InMemMsgLoader.hpp 17 Dec 2003 03:56:15 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2003/12/17 03:56:15 neilg
+ * add default memory manager parameter to loadMsg method that uses char * parameters
+ *
* Revision 1.3 2003/03/07 18:15:44 tng
* Return a reference instead of void for operator=
*
@@ -140,6 +143,7 @@
, const char* const repText2 = 0
, const char* const repText3 = 0
, const char* const repText4 = 0
+ , MemoryManager * const manager = 0
);
1.19 +15 -10 xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
Index: ICUMsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ICUMsgLoader.cpp 19 Nov 2003 23:08:02 -0000 1.18
+++ ICUMsgLoader.cpp 17 Dec 2003 03:56:15 -0000 1.19
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.19 2003/12/17 03:56:15 neilg
+ * add default memory manager parameter to loadMsg method that uses char * parameters
+ *
* Revision 1.18 2003/11/19 23:08:02 peiyongz
* build xercesc2_4_0
*
@@ -399,7 +402,8 @@
, const char* const repText1
, const char* const repText2
, const char* const repText3
- , const char* const repText4)
+ , const char* const repText4
+ , MemoryManager * const manager)
{
//
// Transcode the provided parameters and call the other version,
@@ -409,27 +413,28 @@
XMLCh* tmp2 = 0;
XMLCh* tmp3 = 0;
XMLCh* tmp4 = 0;
+ MemoryManager *managerToUse = (manager)?manager:XMLPlatformUtils::fgMemoryManager;
bool bRet = false;
if (repText1)
- tmp1 = XMLString::transcode(repText1, XMLPlatformUtils::fgMemoryManager);
+ tmp1 = XMLString::transcode(repText1, managerToUse);
if (repText2)
- tmp2 = XMLString::transcode(repText2, XMLPlatformUtils::fgMemoryManager);
+ tmp2 = XMLString::transcode(repText2, managerToUse);
if (repText3)
- tmp3 = XMLString::transcode(repText3, XMLPlatformUtils::fgMemoryManager);
+ tmp3 = XMLString::transcode(repText3, managerToUse);
if (repText4)
- tmp4 = XMLString::transcode(repText4, XMLPlatformUtils::fgMemoryManager);
+ tmp4 = XMLString::transcode(repText4, managerToUse);
bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4);
if (tmp1)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp1);//delete [] tmp1;
+ managerToUse->deallocate(tmp1);//delete [] tmp1;
if (tmp2)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp2);//delete [] tmp2;
+ managerToUse->deallocate(tmp2);//delete [] tmp2;
if (tmp3)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp3);//delete [] tmp3;
+ managerToUse->deallocate(tmp3);//delete [] tmp3;
if (tmp4)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp4);//delete [] tmp4;
+ managerToUse->deallocate(tmp4);//delete [] tmp4;
return bRet;
}
1.7 +5 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
Index: ICUMsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ICUMsgLoader.hpp 15 May 2003 18:29:48 -0000 1.6
+++ ICUMsgLoader.hpp 17 Dec 2003 03:56:15 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/12/17 03:56:15 neilg
+ * add default memory manager parameter to loadMsg method that uses char * parameters
+ *
* Revision 1.6 2003/05/15 18:29:48 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -153,6 +156,7 @@
, const char* const repText2 = 0
, const char* const repText3 = 0
, const char* const repText4 = 0
+ , MemoryManager * const manager = 0
);
1.16 +15 -10 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
Index: MsgCatalogLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MsgCatalogLoader.cpp 21 Aug 2003 16:36:08 -0000 1.15
+++ MsgCatalogLoader.cpp 17 Dec 2003 03:56:15 -0000 1.16
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.16 2003/12/17 03:56:15 neilg
+ * add default memory manager parameter to loadMsg method that uses char * parameters
+ *
* Revision 1.15 2003/08/21 16:36:08 peiyongz
* use PlatformUtils::panic()
*
@@ -282,7 +285,8 @@
, const char* const repText1
, const char* const repText2
, const char* const repText3
- , const char* const repText4)
+ , const char* const repText4
+ , MemoryManager * const manager)
{
//
// Transcode the provided parameters and call the other version,
@@ -292,27 +296,28 @@
XMLCh* tmp2 = 0;
XMLCh* tmp3 = 0;
XMLCh* tmp4 = 0;
+ MemoryManager *managerOoUse = (manager)?manager:XMLPlatformUtils::fgMemoryManager;
bool bRet = false;
if (repText1)
- tmp1 = XMLString::transcode(repText1, XMLPlatformUtils::fgMemoryManager);
+ tmp1 = XMLString::transcode(repText1, managerToUse);
if (repText2)
- tmp2 = XMLString::transcode(repText2, XMLPlatformUtils::fgMemoryManager);
+ tmp2 = XMLString::transcode(repText2, managerToUse);
if (repText3)
- tmp3 = XMLString::transcode(repText3, XMLPlatformUtils::fgMemoryManager);
+ tmp3 = XMLString::transcode(repText3, managerToUse);
if (repText4)
- tmp4 = XMLString::transcode(repText4, XMLPlatformUtils::fgMemoryManager);
+ tmp4 = XMLString::transcode(repText4, managerToUse);
bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4);
if (tmp1)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp1);//delete [] tmp1;
+ managerToUse->deallocate(tmp1);//delete [] tmp1;
if (tmp2)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp2);//delete [] tmp2;
+ managerToUse->deallocate(tmp2);//delete [] tmp2;
if (tmp3)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp3);//delete [] tmp3;
+ managerToUse->deallocate(tmp3);//delete [] tmp3;
if (tmp4)
- XMLPlatformUtils::fgMemoryManager->deallocate(tmp4);//delete [] tmp4;
+ managerToUse->deallocate(tmp4);//delete [] tmp4;
return bRet;
}
1.6 +5 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp
Index: MsgCatalogLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MsgCatalogLoader.hpp 7 Mar 2003 18:15:44 -0000 1.5
+++ MsgCatalogLoader.hpp 17 Dec 2003 03:56:15 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/12/17 03:56:15 neilg
+ * add default memory manager parameter to loadMsg method that uses char * parameters
+ *
* Revision 1.5 2003/03/07 18:15:44 tng
* Return a reference instead of void for operator=
*
@@ -140,6 +143,7 @@
, const char* const repText2 = 0
, const char* const repText3 = 0
, const char* const repText4 = 0
+ , MemoryManager * const manager = 0
);
1.6 +4 -2 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.cpp
Index: MsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MsgLoader.cpp 15 May 2003 18:29:49 -0000 1.5
+++ MsgLoader.cpp 17 Dec 2003 03:56:15 -0000 1.6
@@ -231,7 +231,8 @@
, const char* const repText1
, const char* const repText2
, const char* const repText3
- , const char* const repText4)
+ , const char* const repText4
+ , MemoryManager * const manager)
{
char * msgId;
int size=0;
@@ -251,6 +252,7 @@
msgId = DOMMsg[msgToLoad - 2];
// Call the other version to load up the message
+ // note that no one is deleting repTexts...
if (!localMsg(msgId, toFill, maxChars, repTexts, size))
return false;
1.4 +2 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.hpp
Index: MsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgFile/MsgLoader.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MsgLoader.hpp 7 Mar 2003 18:15:44 -0000 1.3
+++ MsgLoader.hpp 17 Dec 2003 03:56:15 -0000 1.4
@@ -111,6 +111,7 @@
, const char* const repText2 = 0
, const char* const repText3 = 0
, const char* const repText4 = 0
+ , MemoryManager * const manager = 0
);
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org