You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2003/05/15 20:29:49 UTC
cvs commit: xml-xerces/c/src/xercesc/util/MsgLoaders/Win32 Win32MsgLoader.cpp
knoaman 2003/05/15 11:29:49
Modified: c/src/xercesc/util/MsgLoaders/ICU ICUMsgLoader.cpp
ICUMsgLoader.hpp
c/src/xercesc/util/MsgLoaders/InMemory InMemMsgLoader.cpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
MsgCatalogLoader.cpp
c/src/xercesc/util/MsgLoaders/MsgFile MsgLoader.cpp
c/src/xercesc/util/MsgLoaders/Win32 Win32MsgLoader.cpp
Log:
Partial implementation of the configurable memory manager.
Revision Changes Path
1.17 +13 -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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ICUMsgLoader.cpp 17 Mar 2003 19:28:05 -0000 1.16
+++ ICUMsgLoader.cpp 15 May 2003 18:29:48 -0000 1.17
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.17 2003/05/15 18:29:48 knoaman
+ * Partial implementation of the configurable memory manager.
+ *
* Revision 1.16 2003/03/17 19:28:05 peiyongz
* Build versioned XercesMessages on Windows
*
@@ -226,8 +229,8 @@
Resolve domainName
***/
int index = XMLString::lastIndexOf(msgDomain, chForwardSlash);
- char* domainName = XMLString::transcode(&(msgDomain[index + 1]));
- ArrayJanitor<char> jan1(domainName);
+ char* domainName = XMLString::transcode(&(msgDomain[index + 1]), XMLPlatformUtils::fgMemoryManager);
+ ArrayJanitor<char> jan1(domainName, XMLPlatformUtils::fgMemoryManager);
/***
Location resolution priority
@@ -406,24 +409,24 @@
bool bRet = false;
if (repText1)
- tmp1 = XMLString::transcode(repText1);
+ tmp1 = XMLString::transcode(repText1, XMLPlatformUtils::fgMemoryManager);
if (repText2)
- tmp2 = XMLString::transcode(repText2);
+ tmp2 = XMLString::transcode(repText2, XMLPlatformUtils::fgMemoryManager);
if (repText3)
- tmp3 = XMLString::transcode(repText3);
+ tmp3 = XMLString::transcode(repText3, XMLPlatformUtils::fgMemoryManager);
if (repText4)
- tmp4 = XMLString::transcode(repText4);
+ tmp4 = XMLString::transcode(repText4, XMLPlatformUtils::fgMemoryManager);
bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4);
if (tmp1)
- delete [] tmp1;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp1);//delete [] tmp1;
if (tmp2)
- delete [] tmp2;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp2);//delete [] tmp2;
if (tmp3)
- delete [] tmp3;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp3);//delete [] tmp3;
if (tmp4)
- delete [] tmp4;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp4);//delete [] tmp4;
return bRet;
}
1.6 +3 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ICUMsgLoader.hpp 7 Mar 2003 18:15:44 -0000 1.5
+++ ICUMsgLoader.hpp 15 May 2003 18:29:48 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/15 18:29:48 knoaman
+ * Partial implementation of the configurable memory manager.
+ *
* Revision 1.5 2003/03/07 18:15:44 tng
* Return a reference instead of void for operator=
*
@@ -101,7 +104,6 @@
#if !defined(ICUMSGLOADER_HPP)
#define ICUMSGLOADER_HPP
-#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
#include "unicode/ures.h"
1.8 +13 -11 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InMemMsgLoader.cpp 9 Mar 2003 16:41:40 -0000 1.7
+++ InMemMsgLoader.cpp 15 May 2003 18:29:49 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2003/05/15 18:29:49 knoaman
+ * Partial implementation of the configurable memory manager.
+ *
* Revision 1.7 2003/03/09 16:41:40 peiyongz
* PanicHandler
*
@@ -104,7 +107,6 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
-#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/BitOps.hpp>
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
@@ -129,12 +131,12 @@
XMLPlatformUtils::panic(PanicHandler::Panic_UnknownMsgDomain);
}
- fMsgDomain = XMLString::replicate(msgDomain);
+ fMsgDomain = XMLString::replicate(msgDomain, XMLPlatformUtils::fgMemoryManager);
}
InMemMsgLoader::~InMemMsgLoader()
{
- delete [] fMsgDomain;
+ XMLPlatformUtils::fgMemoryManager->deallocate(fMsgDomain);//delete [] fMsgDomain;
}
@@ -232,24 +234,24 @@
bool bRet = false;
if (repText1)
- tmp1 = XMLString::transcode(repText1);
+ tmp1 = XMLString::transcode(repText1, XMLPlatformUtils::fgMemoryManager);
if (repText2)
- tmp2 = XMLString::transcode(repText2);
+ tmp2 = XMLString::transcode(repText2, XMLPlatformUtils::fgMemoryManager);
if (repText3)
- tmp3 = XMLString::transcode(repText3);
+ tmp3 = XMLString::transcode(repText3, XMLPlatformUtils::fgMemoryManager);
if (repText4)
- tmp4 = XMLString::transcode(repText4);
+ tmp4 = XMLString::transcode(repText4, XMLPlatformUtils::fgMemoryManager);
bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4);
if (tmp1)
- delete [] tmp1;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp1);//delete [] tmp1;
if (tmp2)
- delete [] tmp2;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp2);//delete [] tmp2;
if (tmp3)
- delete [] tmp3;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp3);//delete [] tmp3;
if (tmp4)
- delete [] tmp4;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp4);//delete [] tmp4;
return bRet;
}
1.14 +11 -8 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MsgCatalogLoader.cpp 9 Mar 2003 16:42:05 -0000 1.13
+++ MsgCatalogLoader.cpp 15 May 2003 18:29:49 -0000 1.14
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2003/05/15 18:29:49 knoaman
+ * Partial implementation of the configurable memory manager.
+ *
* Revision 1.13 2003/03/09 16:42:05 peiyongz
* PanicHandler
*
@@ -289,24 +292,24 @@
bool bRet = false;
if (repText1)
- tmp1 = XMLString::transcode(repText1);
+ tmp1 = XMLString::transcode(repText1, XMLPlatformUtils::fgMemoryManager);
if (repText2)
- tmp2 = XMLString::transcode(repText2);
+ tmp2 = XMLString::transcode(repText2, XMLPlatformUtils::fgMemoryManager);
if (repText3)
- tmp3 = XMLString::transcode(repText3);
+ tmp3 = XMLString::transcode(repText3, XMLPlatformUtils::fgMemoryManager);
if (repText4)
- tmp4 = XMLString::transcode(repText4);
+ tmp4 = XMLString::transcode(repText4, XMLPlatformUtils::fgMemoryManager);
bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4);
if (tmp1)
- delete [] tmp1;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp1);//delete [] tmp1;
if (tmp2)
- delete [] tmp2;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp2);//delete [] tmp2;
if (tmp3)
- delete [] tmp3;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp3);//delete [] tmp3;
if (tmp4)
- delete [] tmp4;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp4);//delete [] tmp4;
return bRet;
}
1.5 +11 -11 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MsgLoader.cpp 12 Nov 2002 17:27:23 -0000 1.4
+++ MsgLoader.cpp 15 May 2003 18:29:49 -0000 1.5
@@ -86,13 +86,13 @@
, fMsgDomain(0)
{
- fMsgDomain = XMLString::replicate(msgDomain);
+ fMsgDomain = XMLString::replicate(msgDomain, XMLPlatformUtils::fgMemoryManager);
}
MsgCatalogLoader::~MsgCatalogLoader()
{
- delete fMsgDomain;
+ XMLPlatformUtils::fgMemoryManager->deallocate(fMsgDomain);//delete[] fMsgDomain;
}
@@ -278,24 +278,24 @@
bool bRet = false;
if (repText1)
- tmp1 = XMLString::transcode(repText1);
+ tmp1 = XMLString::transcode(repText1, XMLPlatformUtils::fgMemoryManager);
if (repText2)
- tmp2 = XMLString::transcode(repText2);
+ tmp2 = XMLString::transcode(repText2, XMLPlatformUtils::fgMemoryManager);
if (repText3)
- tmp3 = XMLString::transcode(repText3);
+ tmp3 = XMLString::transcode(repText3, XMLPlatformUtils::fgMemoryManager);
if (repText4)
- tmp4 = XMLString::transcode(repText4);
+ tmp4 = XMLString::transcode(repText4, XMLPlatformUtils::fgMemoryManager);
bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4);
if (tmp1)
- delete [] tmp1;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp1);//delete [] tmp1;
if (tmp2)
- delete [] tmp2;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp2);//delete [] tmp2;
if (tmp3)
- delete [] tmp3;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp3);//delete [] tmp3;
if (tmp4)
- delete [] tmp4;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp4);//delete [] tmp4;
return bRet;
}
1.8 +11 -11 xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp
Index: Win32MsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Win32MsgLoader.cpp 10 May 2003 07:17:46 -0000 1.7
+++ Win32MsgLoader.cpp 15 May 2003 18:29:49 -0000 1.8
@@ -131,7 +131,7 @@
}
// Store the domain name
- fMsgDomain = XMLString::replicate(msgDomain);
+ fMsgDomain = XMLString::replicate(msgDomain, XMLPlatformUtils::fgMemoryManager);
// And precalc the id offset we use for this domain
if (XMLString::equals(fMsgDomain, XMLUni::fgXMLErrDomain))
@@ -148,7 +148,7 @@
Win32MsgLoader::~Win32MsgLoader()
{
- delete [] fMsgDomain;
+ XMLPlatformUtils::fgMemoryManager->deallocate(fMsgDomain);//delete [] fMsgDomain;
}
@@ -256,24 +256,24 @@
bool bRet = false;
if (repText1)
- tmp1 = XMLString::transcode(repText1);
+ tmp1 = XMLString::transcode(repText1, XMLPlatformUtils::fgMemoryManager);
if (repText2)
- tmp2 = XMLString::transcode(repText2);
+ tmp2 = XMLString::transcode(repText2, XMLPlatformUtils::fgMemoryManager);
if (repText3)
- tmp3 = XMLString::transcode(repText3);
+ tmp3 = XMLString::transcode(repText3, XMLPlatformUtils::fgMemoryManager);
if (repText4)
- tmp4 = XMLString::transcode(repText4);
+ tmp4 = XMLString::transcode(repText4, XMLPlatformUtils::fgMemoryManager);
bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4);
if (tmp1)
- delete [] tmp1;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp1);//delete [] tmp1;
if (tmp2)
- delete [] tmp2;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp2);//delete [] tmp2;
if (tmp3)
- delete [] tmp3;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp3);//delete [] tmp3;
if (tmp4)
- delete [] tmp4;
+ XMLPlatformUtils::fgMemoryManager->deallocate(tmp4);//delete [] tmp4;
return bRet;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org