[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xerces-cvs
Subject:    svn commit: r649576 -
From:       amassari () apache ! org
Date:       2008-04-18 15:32:00
Message-ID: 20080418153200.9B8121A9832 () eris ! apache ! org
[Download RAW message or body]

Author: amassari
Date: Fri Apr 18 08:31:57 2008
New Revision: 649576

URL: http://svn.apache.org/viewvc?rev=649576&view=rev
Log:
Allocate using memory manager

Modified:
    xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp

Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp?rev=649576&r1=649575&r2=649576&view=diff
 ==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp Fri Apr 18 08:31:57 2008
@@ -48,7 +48,7 @@
                                                   , XMLGrammarPool* const gramPool)
 {
     SAX2XMLReaderImpl* pImpl=new (manager) SAX2XMLReaderImpl(manager, gramPool);
-	return pImpl;
+    return pImpl;
 }
 
 
@@ -138,18 +138,18 @@
         fAdvDHListSize * sizeof(XMLDocumentHandler*)
     );//new XMLDocumentHandler*[fAdvDHListSize];
     memset(fAdvDHList, 0, sizeof(void*) * fAdvDHListSize);
-	
-	// SAX2 default is for namespaces (feature http://xml.org/sax/features/namespaces) \
                to be on
-	setDoNamespaces(true) ;
-
-	// default: schema is on
-	setDoSchema(true);
-	
+    
+    // SAX2 default is for namespaces (feature \
http://xml.org/sax/features/namespaces) to be on +    setDoNamespaces(true) ;
+
+    // default: schema is on
+    setDoSchema(true);
+    
     fPrefixesStorage = new (fMemoryManager) XMLStringPool(109, fMemoryManager) ;
-	fPrefixes        = new (fMemoryManager) ValueStackOf<unsigned int> (30, \
                fMemoryManager) ;
-	fTempAttrVec     = new (fMemoryManager) RefVectorOf<XMLAttr>  (10, false, \
                fMemoryManager) ;
-	fPrefixCounts    = new (fMemoryManager) ValueStackOf<unsigned int>(10, \
                fMemoryManager) ;
-    fTempQName       = new XMLBuffer(32, fMemoryManager);
+    fPrefixes        = new (fMemoryManager) ValueStackOf<unsigned int> (30, \
fMemoryManager) ; +    fTempAttrVec     = new (fMemoryManager) RefVectorOf<XMLAttr>  \
(10, false, fMemoryManager) ; +    fPrefixCounts    = new (fMemoryManager) \
ValueStackOf<unsigned int>(10, fMemoryManager) ; +    fTempQName       = new \
(fMemoryManager) XMLBuffer(32, fMemoryManager);  }
 
 
@@ -264,12 +264,12 @@
 void SAX2XMLReaderImpl::setValidator(XMLValidator* valueToAdopt)
 {
     fValidator = valueToAdopt;
-	fScanner->setValidator(valueToAdopt);
+    fScanner->setValidator(valueToAdopt);
 }
 
 XMLValidator* SAX2XMLReaderImpl::getValidator() const
 {
-	return fScanner->getValidator();
+    return fScanner->getValidator();
 }
 
 // ---------------------------------------------------------------------------
@@ -282,7 +282,7 @@
 
 void SAX2XMLReaderImpl::setContentHandler(ContentHandler* const handler)
 {
-	fDocHandler = handler;
+    fDocHandler = handler;
     if (fDocHandler)
     {
         //
@@ -1256,7 +1256,7 @@
 
     if (fParseInProgress)
         throw SAXNotSupportedException("Feature modification is not supported during \
                parse.", fMemoryManager);
-	
+    
     if (XMLString::compareIStringASCII(name, XMLUni::fgSAX2CoreNameSpaces) == 0)
     {
         setDoNamespaces(value);
@@ -1416,21 +1416,21 @@
 
 void SAX2XMLReaderImpl::setProperty(const XMLCh* const name, void* value)
 {
-	if (fParseInProgress)
-		throw SAXNotSupportedException("Property modification is not supported during \
parse.", fMemoryManager); +    if (fParseInProgress)
+        throw SAXNotSupportedException("Property modification is not supported \
during parse.", fMemoryManager);  
-	if (XMLString::compareIStringASCII(name, \
                XMLUni::fgXercesSchemaExternalSchemaLocation) == 0)
-	{
-		fScanner->setExternalSchemaLocation((XMLCh*)value);
-	}
-	else if (XMLString::compareIStringASCII(name, \
                XMLUni::fgXercesSchemaExternalNoNameSpaceSchemaLocation) == 0)
-	{
-		fScanner->setExternalNoNamespaceSchemaLocation((XMLCh*)value);
-	}
-	else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSecurityManager) == \
                0)
-	{
-		fScanner->setSecurityManager((SecurityManager*)value);
-	}
+    if (XMLString::compareIStringASCII(name, \
XMLUni::fgXercesSchemaExternalSchemaLocation) == 0) +    {
+        fScanner->setExternalSchemaLocation((XMLCh*)value);
+    }
+    else if (XMLString::compareIStringASCII(name, \
XMLUni::fgXercesSchemaExternalNoNameSpaceSchemaLocation) == 0) +    {
+        fScanner->setExternalNoNamespaceSchemaLocation((XMLCh*)value);
+    }
+    else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSecurityManager) \
== 0) +    {
+        fScanner->setSecurityManager((SecurityManager*)value);
+    }
     else if (XMLString::equals(name, XMLUni::fgXercesScannerName))
     {
         XMLScanner* tempScanner = XMLScannerResolver::resolveScanner



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]