You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/06/06 22:39:16 UTC

cvs commit: xml-xerces/c/src/xercesc/sax EntityResolver.hpp HandlerBase.hpp

tng         2002/06/06 13:39:16

  Modified:    c/src/xercesc/sax EntityResolver.hpp HandlerBase.hpp
  Log:
  Document Fix: document that the returned object from resolveEntity is owned by the parser
  
  Revision  Changes    Path
  1.2       +20 -15    xml-xerces/c/src/xercesc/sax/EntityResolver.hpp
  
  Index: EntityResolver.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/EntityResolver.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EntityResolver.hpp	1 Feb 2002 22:22:08 -0000	1.1
  +++ EntityResolver.hpp	6 Jun 2002 20:39:16 -0000	1.2
  @@ -1,37 +1,37 @@
   /*
    * The Apache Software License, Version 1.1
  - * 
  + *
    * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights
    * reserved.
  - * 
  + *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
  - * 
  + *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  - * 
  + *    notice, this list of conditions and the following disclaimer.
  + *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
    *    the documentation and/or other materials provided with the
    *    distribution.
  - * 
  + *
    * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:  
  + *    if any, must include the following acknowledgment:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
  - * 
  + *
    * 4. The names "Xerces" and "Apache Software Foundation" must
    *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written 
  + *    software without prior written permission. For written
    *    permission, please contact apache\@apache.org.
  - * 
  + *
    * 5. Products derived from this software may not be called "Apache",
    *    nor may "Apache" appear in their name, without prior written
    *    permission of the Apache Software Foundation.
  - * 
  + *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
    * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  @@ -45,7 +45,7 @@
    * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    * SUCH DAMAGE.
    * ====================================================================
  - * 
  + *
    * This software consists of voluntary contributions made by many
    * individuals on behalf of the Apache Software Foundation, and was
    * originally based on software copyright (c) 1999, International
  @@ -56,8 +56,11 @@
   
   /*
    * $Log: EntityResolver.hpp,v $
  - * Revision 1.1  2002/02/01 22:22:08  peiyongz
  - * Initial revision
  + * Revision 1.2  2002/06/06 20:39:16  tng
  + * Document Fix: document that the returned object from resolveEntity is owned by the parser
  + *
  + * Revision 1.1.1.1  2002/02/01 22:22:08  peiyongz
  + * sane_include
    *
    * Revision 1.6  2000/03/02 19:54:34  roddey
    * This checkin includes many changes done while waiting for the
  @@ -119,7 +122,7 @@
     *
     *class MyResolver : public EntityResolver {
     *  public:
  -  *    InputSource resolveEntity (const XMLCh* const publicId, 
  +  *    InputSource resolveEntity (const XMLCh* const publicId,
     *                               const XMLCh* const systemId);
     *   ...
     *   };
  @@ -145,7 +148,7 @@
     *
     * @see Parser#setEntityResolver
     * @see InputSource#InputSource
  -  * @see HandlerBase#HandlerBase 
  +  * @see HandlerBase#HandlerBase
     */
   class SAX_EXPORT EntityResolver
   {
  @@ -195,6 +198,8 @@
       * @return An InputSource object describing the new input source,
       *         or null to request that the parser open a regular
       *         URI connection to the system identifier.
  +    *         The returned InputSource is owned by the parser which is
  +    *         responsible to clean up the memory.
       * @exception SAXException Any SAX exception, possibly
       *            wrapping another exception.
       * @exception IOException An IO exception,
  @@ -213,7 +218,7 @@
   private :
       /* Unimplemented constructors and operators */
   
  -    
  +
       /* Copy constructor */
       EntityResolver(const EntityResolver&);
   
  
  
  
  1.3       +5 -0      xml-xerces/c/src/xercesc/sax/HandlerBase.hpp
  
  Index: HandlerBase.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/HandlerBase.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HandlerBase.hpp	20 Feb 2002 18:17:01 -0000	1.2
  +++ HandlerBase.hpp	6 Jun 2002 20:39:16 -0000	1.3
  @@ -56,6 +56,9 @@
   
   /*
    * $Log: HandlerBase.hpp,v $
  + * Revision 1.3  2002/06/06 20:39:16  tng
  + * Document Fix: document that the returned object from resolveEntity is owned by the parser
  + *
    * Revision 1.2  2002/02/20 18:17:01  tng
    * [Bug 5977] Warnings on generating apiDocs.
    *
  @@ -298,6 +301,8 @@
       *                 document.
       * @return The new input source, or null to require the
       *         default behaviour.
  +    *         The returned InputSource is owned by the parser which is
  +    *         responsible to clean up the memory.
       * @exception SAXException Any SAX exception, possibly
       *            wrapping another exception.
       * @see EntityResolver#resolveEntity
  
  
  

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