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/17 07:54:19 UTC
cvs commit: xml-xerces/c/src/xercesc/util/NetAccessors/libWWW BinURLInputStream.cpp BinURLInputStream.hpp LibWWWNetAccessor.cpp
knoaman 2003/05/16 22:54:19
Modified: c/src/xercesc/util/NetAccessors/MacOSURLAccess
MacOSURLAccess.cpp URLAccessBinInputStream.cpp
c/src/xercesc/util/NetAccessors/MacOSURLAccessCF
MacOSURLAccessCF.cpp
c/src/xercesc/util/NetAccessors/Socket SocketNetAccessor.cpp
UnixHTTPURLInputStream.cpp
c/src/xercesc/util/NetAccessors/WinSock
BinHTTPURLInputStream.cpp WinSockNetAccessor.cpp
c/src/xercesc/util/NetAccessors/libWWW BinURLInputStream.cpp
BinURLInputStream.hpp LibWWWNetAccessor.cpp
Log:
Update NetAccessors to use the memory manager.
Revision Changes Path
1.3 +2 -2 xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.cpp
Index: MacOSURLAccess.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MacOSURLAccess.cpp 4 Nov 2002 15:11:38 -0000 1.2
+++ MacOSURLAccess.cpp 17 May 2003 05:54:18 -0000 1.3
@@ -101,7 +101,7 @@
// from this source. That's the correct place to verify
// whether or not we can really handle this URL type...
// if it throws, well, it throws ;)
- BinInputStream* result = new URLAccessBinInputStream(urlSource);
+ BinInputStream* result = new (urlSource.getMemoryManager()) URLAccessBinInputStream(urlSource);
return result;
}
1.5 +3 -3 xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp
Index: URLAccessBinInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccess/URLAccessBinInputStream.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- URLAccessBinInputStream.cpp 9 Dec 2002 13:11:07 -0000 1.4
+++ URLAccessBinInputStream.cpp 17 May 2003 05:54:18 -0000 1.5
@@ -83,8 +83,8 @@
OSStatus status = noErr;
// Get the full URL from the source
- char* url = XMLString::transcode(urlSource.getURLText());
- ArrayJanitor<char> janBuf(url);
+ char* url = XMLString::transcode(urlSource.getURLText(), urlSource.getMemoryManager());
+ ArrayJanitor<char> janBuf(url, urlSource.getMemoryManager());
// Create a URL reference from the URL
status = URLNewReference(url, &mURLReference);
1.3 +2 -2 xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.cpp
Index: MacOSURLAccessCF.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccessCF/MacOSURLAccessCF.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MacOSURLAccessCF.cpp 4 Nov 2002 15:11:38 -0000 1.2
+++ MacOSURLAccessCF.cpp 17 May 2003 05:54:18 -0000 1.3
@@ -94,7 +94,7 @@
BinInputStream*
MacOSURLAccessCF::makeNew(const XMLURL& urlSource)
{
- BinInputStream* result = new URLAccessCFBinInputStream(urlSource);
+ BinInputStream* result = new (urlSource.getMemoryManager()) URLAccessCFBinInputStream(urlSource);
return result;
}
1.3 +2 -2 xml-xerces/c/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp
Index: SocketNetAccessor.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SocketNetAccessor.cpp 4 Nov 2002 15:11:38 -0000 1.2
+++ SocketNetAccessor.cpp 17 May 2003 05:54:18 -0000 1.3
@@ -96,7 +96,7 @@
case XMLURL::HTTP:
{
UnixHTTPURLInputStream* retStrm =
- new UnixHTTPURLInputStream(urlSource);
+ new (urlSource.getMemoryManager()) UnixHTTPURLInputStream(urlSource);
return retStrm;
break;
}
1.12 +31 -12 xml-xerces/c/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
Index: UnixHTTPURLInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- UnixHTTPURLInputStream.cpp 16 May 2003 14:03:28 -0000 1.11
+++ UnixHTTPURLInputStream.cpp 17 May 2003 05:54:18 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2003/05/17 05:54:18 knoaman
+ * Update NetAccessors to use the memory manager.
+ *
* Revision 1.11 2003/05/16 14:03:28 knoaman
* Pass memory manager to makeNewTranscoder.
*
@@ -214,14 +217,15 @@
const XMLCh* path = urlSource.getPath();
const XMLCh* fragment = urlSource.getFragment();
const XMLCh* query = urlSource.getQuery();
+ MemoryManager* manager = urlSource.getMemoryManager();
//
// Convert the hostName to the platform's code page for gethostbyname and
// inet_addr functions.
//
- char* hostNameAsCharStar = XMLString::transcode(hostName);
- ArrayJanitor<char> janBuf1(hostNameAsCharStar);
+ char* hostNameAsCharStar = XMLString::transcode(hostName, manager);
+ ArrayJanitor<char> janBuf1(hostNameAsCharStar, manager);
//
// Convert all the parts of the urlSource object to ASCII so they can be
@@ -229,32 +233,44 @@
//
transSize = XMLString::stringLen(hostName)+1;
- char* hostNameAsASCII = new char[transSize+1];
- ArrayJanitor<char> janBuf2(hostNameAsASCII);
+ char* hostNameAsASCII = (char*) manager->allocate
+ (
+ (transSize+1) * sizeof(char)
+ );//new char[transSize+1];
+ ArrayJanitor<char> janBuf2(hostNameAsASCII, manager);
- XMLTranscoder* trans = XMLPlatformUtils::fgTransService->makeNewTranscoderFor("ISO8859-1", failReason, blockSize, urlSource.getMemoryManager());
+ XMLTranscoder* trans = XMLPlatformUtils::fgTransService->makeNewTranscoderFor("ISO8859-1", failReason, blockSize, manager);
trans->transcodeTo(hostName, transSize, (unsigned char *) hostNameAsASCII, transSize, charsEaten, XMLTranscoder::UnRep_Throw);
transSize = XMLString::stringLen(path)+1;
- char* pathAsASCII = new char[transSize+1];
- ArrayJanitor<char> janBuf3(pathAsASCII);
+ char* pathAsASCII = (char*) manager->allocate
+ (
+ (transSize+1) * sizeof(char)
+ );//new char[transSize+1];
+ ArrayJanitor<char> janBuf3(pathAsASCII, manager);
trans->transcodeTo(path, transSize, (unsigned char *) pathAsASCII, transSize, charsEaten, XMLTranscoder::UnRep_Throw);
char* fragmentAsASCII = 0;
if (fragment)
{
transSize = XMLString::stringLen(fragment)+1;
- fragmentAsASCII = new char[transSize+1];
- ArrayJanitor<char> janBuf4(fragmentAsASCII);
+ fragmentAsASCII = (char*) manager->allocate
+ (
+ (transSize+1) * sizeof(char)
+ );//new char[transSize+1];
+ ArrayJanitor<char> janBuf4(fragmentAsASCII, manager);
trans->transcodeTo(fragment, transSize, (unsigned char *) fragmentAsASCII, transSize, charsEaten, XMLTranscoder::UnRep_Throw);
}
char* queryAsASCII = 0;
- ArrayJanitor<char> janBuf5(queryAsASCII);
+ ArrayJanitor<char> janBuf5(queryAsASCII, manager);
if (query)
{
transSize = XMLString::stringLen(query)+1;
- queryAsASCII = new char[transSize+1];
+ queryAsASCII = (char*) manager->allocate
+ (
+ (transSize+1) * sizeof(char)
+ );//new char[transSize+1];
trans->transcodeTo(query, transSize, (unsigned char *) queryAsASCII, transSize, charsEaten, XMLTranscoder::UnRep_Throw);
}
@@ -266,7 +282,10 @@
XMLString::binToText((unsigned int) portNumber, portBuffer, bufSize, 10);
transSize = XMLString::stringLen(portBuffer)+1;
- char* portAsASCII = new char[transSize+1];
+ char* portAsASCII = (char*) manager->allocate
+ (
+ (transSize+1) * sizeof(char)
+ );//new char[transSize+1];
trans->transcodeTo(portBuffer, transSize, (unsigned char *) portAsASCII, transSize, charsEaten, XMLTranscoder::UnRep_Throw);
delete trans;
1.4 +11 -8 xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
Index: BinHTTPURLInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BinHTTPURLInputStream.cpp 6 Dec 2002 16:43:55 -0000 1.3
+++ BinHTTPURLInputStream.cpp 17 May 2003 05:54:18 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2003/05/17 05:54:18 knoaman
+ * Update NetAccessors to use the memory manager.
+ *
* Revision 1.3 2002/12/06 16:43:55 tng
* Fix the error messages thrown from net accessor module.
*
@@ -313,24 +316,24 @@
// and transcode them back to ASCII.
//
const XMLCh* hostName = urlSource.getHost();
- char* hostNameAsCharStar = XMLString::transcode(hostName);
- ArrayJanitor<char> janBuf1(hostNameAsCharStar);
+ char* hostNameAsCharStar = XMLString::transcode(hostName, urlSource.getMemoryManager());
+ ArrayJanitor<char> janBuf1(hostNameAsCharStar, urlSource.getMemoryManager());
const XMLCh* path = urlSource.getPath();
- char* pathAsCharStar = XMLString::transcode(path);
- ArrayJanitor<char> janBuf2(pathAsCharStar);
+ char* pathAsCharStar = XMLString::transcode(path, urlSource.getMemoryManager());
+ ArrayJanitor<char> janBuf2(pathAsCharStar, urlSource.getMemoryManager());
const XMLCh* fragment = urlSource.getFragment();
char* fragmentAsCharStar = 0;
if (fragment)
- fragmentAsCharStar = XMLString::transcode(fragment);
- ArrayJanitor<char> janBuf3(fragmentAsCharStar);
+ fragmentAsCharStar = XMLString::transcode(fragment, urlSource.getMemoryManager());
+ ArrayJanitor<char> janBuf3(fragmentAsCharStar, urlSource.getMemoryManager());
const XMLCh* query = urlSource.getQuery();
char* queryAsCharStar = 0;
if (query)
- queryAsCharStar = XMLString::transcode(query);
- ArrayJanitor<char> janBuf4(queryAsCharStar);
+ queryAsCharStar = XMLString::transcode(query, urlSource.getMemoryManager());
+ ArrayJanitor<char> janBuf4(queryAsCharStar, urlSource.getMemoryManager());
unsigned short portNumber = (unsigned short) urlSource.getPortNum();
1.3 +2 -2 xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
Index: WinSockNetAccessor.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WinSockNetAccessor.cpp 4 Nov 2002 15:11:39 -0000 1.2
+++ WinSockNetAccessor.cpp 17 May 2003 05:54:18 -0000 1.3
@@ -100,7 +100,7 @@
case XMLURL::HTTP:
{
BinHTTPURLInputStream* retStrm =
- new BinHTTPURLInputStream(urlSource);
+ new (urlSource.getMemoryManager()) BinHTTPURLInputStream(urlSource);
return retStrm;
break;
}
1.4 +13 -3 xml-xerces/c/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp
Index: BinURLInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BinURLInputStream.cpp 6 Dec 2002 16:42:13 -0000 1.3
+++ BinURLInputStream.cpp 17 May 2003 05:54:18 -0000 1.4
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.4 2003/05/17 05:54:18 knoaman
+ * Update NetAccessors to use the memory manager.
+ *
* Revision 1.3 2002/12/06 16:42:13 tng
* Fix the error messages thrown from net accessor module.
*
@@ -151,7 +154,10 @@
static char* localTranscode(const XMLCh* latinStrInUnicode)
{
unsigned int lent = XMLString::stringLen(latinStrInUnicode);
- char* retval = new char[lent + 1];
+ char* retval = (char*) XMLPlatformUtils::fgMemoryManager->allocate
+ (
+ (lent + 1) * sizeof(char)
+ );//new char[lent + 1];
unsigned int i = 0;
for (i = 0; i < lent; i++)
retval[i] = (char) latinStrInUnicode[i]; // drop the leading byte.
@@ -168,8 +174,12 @@
, fRemoteFileSize(0)
, fAnchor(0)
, fBytesProcessed(0)
+ , fMemoryManager(urlSource.getMemoryManager())
{
- fBuffer = new XMLByte[URLISBUFMAXSIZE];
+ fBuffer = (XMLByte*) fMemoryManager->allocate
+ (
+ URLISBUFMAXSIZE * sizeof(XMLByte)
+ );//new XMLByte[URLISBUFMAXSIZE];
const XMLCh* uri = urlSource.getURLText();
char* uriAsCharStar = localTranscode(uri);
@@ -213,7 +223,7 @@
BinURLInputStream::~BinURLInputStream()
{
- delete [] fBuffer;
+ fMemoryManager->deallocate(fBuffer);//delete [] fBuffer;
fBuffer = 0;
// Do not delete the fAnchor. Its deleted when the destructor of
// libWWWNetAccessor is called.
1.3 +4 -0 xml-xerces/c/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
Index: BinURLInputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BinURLInputStream.hpp 4 Nov 2002 15:11:39 -0000 1.2
+++ BinURLInputStream.hpp 17 May 2003 05:54:18 -0000 1.3
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2003/05/17 05:54:18 knoaman
+ * Update NetAccessors to use the memory manager.
+ *
* Revision 1.2 2002/11/04 15:11:39 tng
* C++ Namespace Support.
*
@@ -152,6 +155,7 @@
unsigned int fBufferSize;
unsigned int fRemoteFileSize;
unsigned int fBytesProcessed;
+ MemoryManager* fMemoryManager;
};
XERCES_CPP_NAMESPACE_END
1.3 +2 -2 xml-xerces/c/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp
Index: LibWWWNetAccessor.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LibWWWNetAccessor.cpp 4 Nov 2002 15:11:39 -0000 1.2
+++ LibWWWNetAccessor.cpp 17 May 2003 05:54:18 -0000 1.3
@@ -112,7 +112,7 @@
case XMLURL::HTTP:
{
BinURLInputStream* retStrm =
- new BinURLInputStream(urlSource);
+ new (urlSource.getMemoryManager()) BinURLInputStream(urlSource);
return retStrm;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org