neilg 2003/12/16 21:16:59
Modified: c/src/xercesc/validators/DTD DTDValidator.cpp
c/src/xercesc/validators/schema SchemaValidator.cpp
c/src/xercesc/util/Platforms/NetBSD NetBSDPlatformUtils.cpp
c/src/xercesc/util/regx RegularExpression.cpp
c/src/xercesc/internal IGXMLScanner.cpp SGXMLScanner.cpp
Log:
ensure all uses of ArrayJanitor use a memory manager
Revision Changes Path
1.17 +6 -6 xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.cpp
Index: DTDValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DTDValidator.cpp 17 Dec 2003 00:18:40 -0000 1.16
+++ DTDValidator.cpp 17 Dec 2003 05:16:59 -0000 1.17
@@ -166,8 +166,8 @@
// There is a colon, so we have to split apart the name and prefix
// part.
//
- XMLCh* tmpNameBuf = XMLString::replicate(fullName);
- ArrayJanitor<XMLCh> janNameBuf(tmpNameBuf);
+ XMLCh* tmpNameBuf = XMLString::replicate(fullName, fMemoryManager);
+ ArrayJanitor<XMLCh> janNameBuf(tmpNameBuf, fMemoryManager);
// Put a null where the colon is, to split it into two strings
tmpNameBuf[colonInd] = chNull;
@@ -297,7 +297,7 @@
}
else
{
- janTmpVal.reset(XMLString::replicate(attrValue));
+ janTmpVal.reset(XMLString::replicate(attrValue, fMemoryManager),
fMemoryManager);
pszTmpVal = janTmpVal.get();
}
@@ -553,8 +553,8 @@
// We need to verify that all of its possible values
// (in the enum list) refer to valid notations.
//
- XMLCh* list = XMLString::replicate(curAttDef.getEnumeration());
- ArrayJanitor<XMLCh> janList(list);
+ XMLCh* list = XMLString::replicate(curAttDef.getEnumeration(),
fMemoryManager);
+ ArrayJanitor<XMLCh> janList(list, fMemoryManager);
//
// Search forward for a space or a null. If a null,
1.49 +5 -2 xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp
Index: SchemaValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- SchemaValidator.cpp 17 Dec 2003 00:18:40 -0000 1.48
+++ SchemaValidator.cpp 17 Dec 2003 05:16:59 -0000 1.49
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.49 2003/12/17 05:16:59 neilg
+ * ensure all uses of ArrayJanitor use a memory manager
+ *
* Revision 1.48 2003/12/17 00:18:40 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -1090,7 +1093,7 @@
// (in the enum list) refer to valid notations.
//
XMLCh* list =
XMLString::replicate(curAttDef.getEnumeration(), fMemoryManager);
- ArrayJanitor<XMLCh> janList(list);
+ ArrayJanitor<XMLCh> janList(list, fMemoryManager);
//
// Search forward for a space or a null. If a null,
1.6 +8 -8
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NetBSDPlatformUtils.cpp 1 Oct 2003 16:32:39 -0000 1.5
+++ NetBSDPlatformUtils.cpp 17 Dec 2003 05:16:59 -0000 1.6
@@ -128,8 +128,8 @@
static void WriteUStrStdErr( const XMLCh* const toWrite)
{
- char* tmpVal = XMLString::transcode(toWrite);
- ArrayJanitor<char> janText(tmpVal);
+ char* tmpVal = XMLString::transcode(toWrite, XMLPlatformUtils::fgMemoryManager);
+ ArrayJanitor<char> janText(tmpVal, XMLPlatformUtils::fgMemoryManager);
if (fputs(tmpVal, stderr) == EOF)
{
ThrowXML(XMLPlatformUtilsException,
@@ -139,8 +139,8 @@
static void WriteUStrStdOut( const XMLCh* const toWrite)
{
- char* tmpVal = XMLString::transcode(toWrite);
- ArrayJanitor<char> janText(tmpVal);
+ char* tmpVal = XMLString::transcode(toWrite, XMLPlatformUtils::fgMemoryManager);
+ ArrayJanitor<char> janText(tmpVal, XMLPlatformUtils::fgMemoryManager);
if (fputs(tmpVal, stdout) == EOF)
{
ThrowXML(XMLPlatformUtilsException,
@@ -282,8 +282,8 @@
if (fileName == NULL)
ThrowXML(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero);
- const char* tmpFileName = XMLString::transcode(fileName);
- ArrayJanitor<char> janText((char*)tmpFileName);
+ const char* tmpFileName = XMLString::transcode(fileName,
XMLPlatformUtils::fgMemoryManager);
+ ArrayJanitor<char> janText((char*)tmpFileName,
XMLPlatformUtils::fgMemoryManager);
FileHandle retVal = (FILE*)fopen( tmpFileName , "r+" );
if (retVal == NULL)
@@ -308,8 +308,8 @@
if (fileName == NULL)
ThrowXML(XMLPlatformUtilsException,
XMLExcepts::CPtr_PointerIsZero);
- const char* tmpFileName = XMLString::transcode(fileName);
- ArrayJanitor<char> janText((char*)tmpFileName);
+ const char* tmpFileName = XMLString::transcode(fileName,
XMLPlatformUtils::fgMemoryManager);
+ ArrayJanitor<char> janText((char*)tmpFileName,
XMLPlatformUtils::fgMemoryManager);
FileHandle retVal = (FILE*)fopen( tmpFileName, "r+" );
if (retVal == NULL)
1.18 +18 -17 xml-xerces/c/src/xercesc/util/regx/RegularExpression.cpp
Index: RegularExpression.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegularExpression.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RegularExpression.cpp 17 Dec 2003 00:18:37 -0000 1.17
+++ RegularExpression.cpp 17 Dec 2003 05:16:59 -0000 1.18
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.18 2003/12/17 05:16:59 neilg
+ * ensure all uses of ArrayJanitor use a memory manager
+ *
* Revision 1.17 2003/12/17 00:18:37 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -729,16 +732,16 @@
// ---------------------------------------------------------------------------
RefArrayVectorOf<XMLCh>* RegularExpression::tokenize(const char* const expression) {
- XMLCh* tmpBuf = XMLString::transcode(expression);
- ArrayJanitor<XMLCh> janBuf(tmpBuf);
+ XMLCh* tmpBuf = XMLString::transcode(expression, fMemoryManager);
+ ArrayJanitor<XMLCh> janBuf(tmpBuf, fMemoryManager);
return tokenize(tmpBuf, 0, XMLString::stringLen(tmpBuf));
}
RefArrayVectorOf<XMLCh>* RegularExpression::tokenize(const char* const expression,
const int start, const
int end) {
- XMLCh* tmpBuf = XMLString::transcode(expression);
- ArrayJanitor<XMLCh> janBuf(tmpBuf);
+ XMLCh* tmpBuf = XMLString::transcode(expression, fMemoryManager);
+ ArrayJanitor<XMLCh> janBuf(tmpBuf, fMemoryManager);
return tokenize(tmpBuf, start, end);
}
@@ -897,10 +900,10 @@
XMLCh* RegularExpression::replace(const char* const matchString,
const char* const replaceString){
- XMLCh* tmpBuf = XMLString::transcode(matchString);
- ArrayJanitor<XMLCh> janBuf(tmpBuf);
- XMLCh* tmpBuf2 = XMLString::transcode(replaceString);
- ArrayJanitor<XMLCh> janBuf2(tmpBuf2);
+ XMLCh* tmpBuf = XMLString::transcode(matchString, fMemoryManager);
+ ArrayJanitor<XMLCh> janBuf(tmpBuf, fMemoryManager);
+ XMLCh* tmpBuf2 = XMLString::transcode(replaceString, fMemoryManager);
+ ArrayJanitor<XMLCh> janBuf2(tmpBuf2, fMemoryManager);
return replace(tmpBuf, tmpBuf2, 0, XMLString::stringLen(tmpBuf));
}
@@ -909,10 +912,10 @@
const char* const replaceString,
const int start, const int end){
- XMLCh* tmpBuf = XMLString::transcode(matchString);
- ArrayJanitor<XMLCh> janBuf(tmpBuf);
- XMLCh* tmpBuf2 = XMLString::transcode(replaceString);
- ArrayJanitor<XMLCh> janBuf2(tmpBuf2);
+ XMLCh* tmpBuf = XMLString::transcode(matchString, fMemoryManager);
+ ArrayJanitor<XMLCh> janBuf(tmpBuf, fMemoryManager);
+ XMLCh* tmpBuf2 = XMLString::transcode(replaceString, fMemoryManager);
+ ArrayJanitor<XMLCh> janBuf2(tmpBuf2, fMemoryManager);
return replace(tmpBuf, tmpBuf2, start, end);
}
@@ -932,8 +935,6 @@
const XMLCh* const replaceString,
const int start, const int end)
{
- // REVISIT:: cargillmem - subEx is temporary... replicate was modified below
- // but there is also a call to delete[]!!!
//check if matches zero length string - throw error if so
if (matches(XMLUni::fgZeroLenString, fMemoryManager)){
@@ -967,14 +968,14 @@
//if there are subExpressions, then determine the string we want to
//substitute in.
if (numSubEx != 0) {
- delete[] (XMLCh*)curRepString;
+ fMemoryManager->deallocate((XMLCh*)curRepString);
curRepString = subInExp(replaceString, matchString,
subEx->elementAt(i));
}
result.append(curRepString);
}
}
- delete[] (XMLCh*)curRepString;
+ fMemoryManager->deallocate((XMLCh*)curRepString);
return XMLString::replicate(result.getRawBuffer(), fMemoryManager);
}
1.49 +2 -2 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- IGXMLScanner.cpp 17 Dec 2003 00:18:34 -0000 1.48
+++ IGXMLScanner.cpp 17 Dec 2003 05:16:59 -0000 1.49
@@ -3483,7 +3483,7 @@
: 0;
XMLCh* canonicalValue = 0;
- if (fPSVIElemContext.fNormalizedValue)
+ if (fPSVIElemContext.fNormalizedValue )
{
if (memberDV)
canonicalValue = (XMLCh*)
memberDV->getCanonicalRepresentation(fPSVIElemContext.fNormalizedValue,
fMemoryManager);
1.67 +2 -2 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- SGXMLScanner.cpp 17 Dec 2003 00:18:34 -0000 1.66
+++ SGXMLScanner.cpp 17 Dec 2003 05:16:59 -0000 1.67
@@ -2313,7 +2313,7 @@
// We have to split the name into its prefix and name parts. Then
// we map the prefix to its URI.
const XMLCh* const namePtr = curPair->getKey();
- ArrayJanitor<XMLCh> janName(0);
+ ArrayJanitor <XMLCh> janName(0);
// use a stack-based buffer when possible.
XMLCh tempBuffer[100];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
