Ignore:
Timestamp:
May 19, 2013, 9:20:51 AM (6 years ago)
Author:
cameron
Message:

Fixes for icXML 0.9

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icXML/icXML-devel/src/icxercesc/internal/XMLScanner.cpp

    r3150 r3157  
    314314                        }
    315315                }
    316                 else {
    317 
     316        else
     317        {
    318318                        if (!fStandardUriConformant)
    319319                                srcToUse = new (fMemoryManager) LocalFileInputSource(systemId, fMemoryManager);
     
    681681void XMLScanner::cleanUp()
    682682{
    683         delete fValidationContext;
    684         fMemoryManager->deallocate(fExternalSchemaLocation);
    685         fMemoryManager->deallocate(fExternalNoNamespaceSchemaLocation);
    686     fMemoryManager->deallocate(fRootElemName);
     683    delete fValidationContext; fValidationContext = 0;
     684    fMemoryManager->deallocate(fExternalSchemaLocation); fExternalSchemaLocation = 0;
     685    fMemoryManager->deallocate(fExternalNoNamespaceSchemaLocation); fExternalNoNamespaceSchemaLocation = 0;
     686    fMemoryManager->deallocate(fRootElemName); fRootElemName = 0;
    687687}
    688688
     
    19381938
    19391939                // Watch for EOF
    1940                 if (!nextCh)
     1940        if (unlikely(nextCh == 0))
     1941        {
    19411942                        ThrowXMLwithMemMgr(UnexpectedEOFException, XMLExcepts::Gen_UnexpectedEOF, fMemoryManager);
    1942 
     1943        }
    19431944                // Break out on the terminating semicolon
    19441945                if (nextCh == chSemiColon)
     
    20272028}
    20282029
     2030const XMLCh* XMLScanner::getURIText(const unsigned int uriId) const
     2031{
     2032    return (*fUriResolver)[uriId];
     2033}
     2034
    20292035//  Most equal signs can have white space around them, so this little guy
    20302036//  just makes the calling code cleaner by eating whitespace.
     
    20682074}
    20692075
    2070 
    2071 
    2072 unsigned int
    2073 XMLScanner::resolveQName(  const XMLCh* const           qName
    2074                                                  ,       XMLBuffer&             prefixBuf
    2075                                                  , const ElemStack::MapModes    mode
    2076                                                  ,       int&                   prefixColonPos)
    2077 {
    2078         DEPRECATED_FEATURE_IN_ICXML;
    2079 }
    2080 
    2081 unsigned int
    2082 XMLScanner::resolveQNameWithColon(  const XMLCh* const          qName
    2083                                                                   ,       XMLBuffer&            prefixBuf
    2084                                                                   , const ElemStack::MapModes   mode
    2085                                                                   , const int                   prefixColonPos)
    2086 {
    2087         DEPRECATED_FEATURE_IN_ICXML;
    2088 }
    2089 
    2090 // ---------------------------------------------------------------------------
    2091 //  XMLScanner: Private scanning methods
    2092 // ---------------------------------------------------------------------------
    2093 
    2094 //  This method is called after the end of the root element, to handle
    2095 //  any miscellaneous stuff hanging around.
    2096 void XMLScanner::scanMiscellaneous()
    2097 {
    2098         DEPRECATED_FEATURE_IN_ICXML;
    2099 }
    2100 
    21012076/******************************************************************************************************
    21022077  ICXML - DEPRECATED FUNCTIONS
     
    21422117}
    21432118
     2119unsigned int XMLScanner::resolveQName(const XMLCh* const, XMLBuffer& , const ElemStack::MapModes, int&)
     2120{
     2121    DEPRECATED_FEATURE_IN_ICXML;
     2122}
     2123
     2124unsigned int XMLScanner::resolveQNameWithColon(const XMLCh* const, XMLBuffer&, const ElemStack::MapModes, const int)
     2125{
     2126    DEPRECATED_FEATURE_IN_ICXML;
     2127}
     2128
     2129void XMLScanner::scanMiscellaneous()
     2130{
     2131    DEPRECATED_FEATURE_IN_ICXML;
     2132}
    21442133
    21452134XERCES_CPP_NAMESPACE_END
Note: See TracChangeset for help on using the changeset viewer.