[Expat-checkins] CVS: expat/lib Makefile.in,1.1,1.2 ascii.h,1.1,1.2 asciitab.h,1.1,1.2 expat.h,1.1,1.2 iasciitab.h,1.1,1.2 latin1tab.h,1.1,1.2 utf8tab.h,1.1,1.2 xmldef.h,1.1,1.2 xmlparse.c,1.1,1.2 xmlrole.c,1.1,1.2 xmlrole.h,1.1,1.2 xmltok.c,1.1,1.2 xmltok.h,1.1,1.2 xmltok_impl.c,1.1,1.2 xmltok_impl.h,1.1,1.2 xmltok_ns.c,1.1,1.2

Clark Cooper coopercc@users.sourceforge.net
Thu, 21 Sep 2000 14:20:22 -0700


Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6917/lib

Modified Files:
	Makefile.in ascii.h asciitab.h expat.h iasciitab.h latin1tab.h 
	utf8tab.h xmldef.h xmlparse.c xmlrole.c xmlrole.h xmltok.c 
	xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c 
Log Message:
Merged in modifications from perl-expat. Also fiddled around with more
configuration issues.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.in	2000/09/18 16:26:22	1.1
--- Makefile.in	2000/09/21 21:20:18	1.2
***************
*** 134,139 ****
  
  clean:
! 	rm -f $(LIBRARY) *.o *.lo
! 	rm -rf .libs _libs
  
  distclean: clean
--- 134,139 ----
  
  clean:
! 	rm -f $(LIBRARY) *.o *.lo *~
! 	rm -rf .libs _libs .deps
  
  distclean: clean

Index: ascii.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/ascii.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ascii.h	2000/09/18 16:26:22	1.1
--- ascii.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: asciitab.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/asciitab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** asciitab.h	2000/09/18 16:26:22	1.1
--- asciitab.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** expat.h	2000/09/18 16:26:22	1.1
--- expat.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 49,53 ****
--- 49,156 ----
  #endif /* not XML_UNICODE_WCHAR_T */
  
+ enum XML_Content_Type {
+   XML_CTYPE_EMPTY = 1,
+   XML_CTYPE_ANY,
+   XML_CTYPE_MIXED,
+   XML_CTYPE_NAME,
+   XML_CTYPE_CHOICE,
+   XML_CTYPE_SEQ
+ };
+ 
+ enum XML_Content_Quant {
+   XML_CQUANT_NONE,
+   XML_CQUANT_OPT,
+   XML_CQUANT_REP,
+   XML_CQUANT_PLUS
+ };
+ 
+ /* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be
+    XML_CQUANT_NONE, and the other fields will be zero or NULL.
+    If type == XML_CTYPE_MIXED, then quant will be NONE or REP and
+    numchildren will contain number of elements that may be mixed in
+    and children point to an array of XML_Content cells that will be
+    all of XML_CTYPE_NAME type with no quantification.
+ 
+    If type == XML_CTYPE_NAME, then the name points to the name, and
+    the numchildren field will be zero and children will be NULL. The
+    quant fields indicates any quantifiers placed on the name.
+ 
+    CHOICE and SEQ will have name NULL, the number of children in
+    numchildren and children will point, recursively, to an array
+    of XML_Content cells.
+ 
+    The EMPTY, ANY, and MIXED types will only occur at top level.
+ */
+ 
+ typedef struct XML_cp XML_Content;
+ 
+ struct XML_cp {
+   enum XML_Content_Type		type;
+   enum XML_Content_Quant	quant;
+   const XML_Char *		name;
+   unsigned int			numchildren;
+   XML_Content *			children;
+ };
+ 
+ 
+ /* This is called for an element declaration. See above for
+    description of the model argument. It's the caller's responsibility
+    to free model when finished with it by calling XML_ContentFree.
+ */
+ 
+ typedef void (*XML_ElementDeclHandler) (void *userData,
+ 					const XML_Char *name,
+ 					XML_Content *model);
+ 
+ void XMLPARSEAPI
+ XML_SetElementDeclHandler(XML_Parser parser,
+ 			  XML_ElementDeclHandler eldecl);
+ 
+ 
+ void XMLPARSEAPI
+ XML_ContentFree(XML_Content *content);
+ 
+ /*
+   The Attlist declaration handler is called for *each* attribute. So
+   a single Attlist declaration with multiple attributes declared will
+   generate multiple calls to this handler. The "default" parameter
+   may be NULL in the case of the "#IMPLIED" or "#REQUIRED" keyword.
+   The "isrequired" parameter will be true and the default value will
+   be NULL in the case of "#REQUIRED". If "isrequired" is true and
+   default is non-NULL, then this is a "#FIXED" default.
+  */
+ 
+ typedef void (*XML_AttlistDeclHandler) (void		*userData,
+ 					const XML_Char	*elname,
+ 					const XML_Char	*attname,
+ 					const XML_Char	*att_type,
+ 					const XML_Char	*dflt,
+ 					int		isrequired);
+ 
+ void XMLPARSEAPI
+ XML_SetAttlistDeclHandler(XML_Parser parser,
+ 			  XML_AttlistDeclHandler attdecl);
+ 
+ 
+   /* The XML declaration handler is called for *both* XML declarations and
+      text declarations. The way to distinguish is that the version parameter
+      will be null for text declarations. The encoding parameter may be null
+      for XML declarations. The standalone parameter will be -1, 0, or 1
+      indicating respectively that there was no standalone parameter in
+      the declaration, that it was given as no, or that it was given as yes.
+   */
+ 
+ typedef void (*XML_XmlDeclHandler) (void		*userData,
+ 				    const XML_Char	*version,
+ 				    const XML_Char	*encoding,
+ 				    int			standalone);
+ 
+ 
  
+ void XMLPARSEAPI
+ XML_SetXmlDeclHandler(XML_Parser parser,
+ 		      XML_XmlDeclHandler xmldecl);
+ 
+ 
  /* Constructs a new parser; encoding is the encoding specified by the external
  protocol or null if there is none specified. */
***************
*** 113,126 ****
  				   int len);
  
! /* This is called for the start of the DOCTYPE declaration when the
! name of the DOCTYPE is encountered. */
  typedef void (*XML_StartDoctypeDeclHandler)(void *userData,
! 					    const XML_Char *doctypeName);
  
  /* This is called for the start of the DOCTYPE declaration when the
  closing > is encountered, but after processing any external subset. */
  typedef void (*XML_EndDoctypeDeclHandler)(void *userData);
  
! /* This is called for a declaration of an unparsed (NDATA)
  entity.  The base argument is whatever was set by XML_SetBase.
  The entityName, systemId and notationName arguments will never be null.
--- 216,267 ----
  				   int len);
  
! /* This is called for the start of the DOCTYPE declaration, before
!    any DTD or internal subset is parsed. */
! 
  typedef void (*XML_StartDoctypeDeclHandler)(void *userData,
! 					    const XML_Char *doctypeName,
! 					    const XML_Char *sysid,
! 					    const XML_Char *pubid,
! 					    int has_internal_subset
! 					    );
  
  /* This is called for the start of the DOCTYPE declaration when the
  closing > is encountered, but after processing any external subset. */
  typedef void (*XML_EndDoctypeDeclHandler)(void *userData);
+ 
+ /* This is called for entity declarations. The is_parameter_entity
+    argument will be non-zero if the entity is a parameter entity, zero
+    otherwise.
+ 
+    For internal entities (<!ENTITY foo "bar">), value will
+    be non-null and systemId, publicID, and notationName will be null.
+    The value string is NOT null terminated; the length is provided in
+    the value_length argument. Since it is legal to have zero-length
+    values, do not use this argument to test for internal entities.
+ 
+    For external entities, value will be null and systemId will be non-null.
+    The publicId argument will be null unless a public identifier was
+    provided. The notationName argument will have a non-null value only
+    for unparsed entity declarations.
+ */
  
! typedef void (*XML_EntityDeclHandler) (void *userData,
! 				       const XML_Char *entityName,
! 				       int is_parameter_entity,
! 				       const XML_Char *value,
! 				       int value_length,
! 				       const XML_Char *base,
! 				       const XML_Char *systemId,
! 				       const XML_Char *publicId,
! 				       const XML_Char *notationName);
! 				       
! void XMLPARSEAPI
! XML_SetEntityDeclHandler(XML_Parser parser,
! 			 XML_EntityDeclHandler handler);
! 
! /* OBSOLETE -- OBSOLETE -- OBSOLETE
!    This handler has been superceded by the EntityDeclHandler above.
!    It is provided here for backward compatibility.
! This is called for a declaration of an unparsed (NDATA)
  entity.  The base argument is whatever was set by XML_SetBase.
  The entityName, systemId and notationName arguments will never be null.
***************
*** 144,158 ****
  					const XML_Char *publicId);
  
- typedef void (*XML_ExternalParsedEntityDeclHandler)(void *userData,
- 						    const XML_Char *entityName,
- 						    const XML_Char *base,
- 						    const XML_Char *systemId,
- 						    const XML_Char *publicId);
- 
- typedef void (*XML_InternalParsedEntityDeclHandler)(void *userData,
- 						    const XML_Char *entityName,
- 						    const XML_Char *replacementText,
- 						    int replacementTextLength);
- 
  /* When namespace processing is enabled, these are called once for
  each namespace declaration. The call to the start and end element
--- 285,288 ----
***************
*** 275,278 ****
--- 405,414 ----
  
  void XMLPARSEAPI
+ XML_SetStartElementHandler(XML_Parser parser, XML_StartElementHandler);
+ 
+ void XMLPARSEAPI
+ XML_SetEndElementHandler(XML_Parser parser, XML_EndElementHandler);
+ 
+ void XMLPARSEAPI
  XML_SetCharacterDataHandler(XML_Parser parser,
  			    XML_CharacterDataHandler handler);
***************
*** 290,293 ****
--- 426,437 ----
  			   XML_EndCdataSectionHandler end);
  
+ void XMLPARSEAPI
+ XML_SetStartCdataSectionHandler(XML_Parser parser,
+                                 XML_StartCdataSectionHandler start);
+ 
+ void XMLPARSEAPI
+ XML_SetEndCdataSectionHandler(XML_Parser parser,
+                               XML_EndCdataSectionHandler end);
+ 
  /* This sets the default handler and also inhibits expansion of internal entities.
  The entity reference will be passed to the default handler. */
***************
*** 310,313 ****
--- 454,465 ----
  
  void XMLPARSEAPI
+ XML_SetStartDoctypeDeclHandler(XML_Parser parser,
+ 			       XML_StartDoctypeDeclHandler start);
+ 
+ void XMLPARSEAPI
+ XML_SetEndDoctypeDeclHandler(XML_Parser parser,
+ 			     XML_EndDoctypeDeclHandler end);
+ 
+ void XMLPARSEAPI
  XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
  				 XML_UnparsedEntityDeclHandler handler);
***************
*** 318,332 ****
  
  void XMLPARSEAPI
! XML_SetExternalParsedEntityDeclHandler(XML_Parser parser,
! 				       XML_ExternalParsedEntityDeclHandler handler);
  
  void XMLPARSEAPI
! XML_SetInternalParsedEntityDeclHandler(XML_Parser parser,
! 				       XML_InternalParsedEntityDeclHandler handler);
  
  void XMLPARSEAPI
! XML_SetNamespaceDeclHandler(XML_Parser parser,
! 			    XML_StartNamespaceDeclHandler start,
! 			    XML_EndNamespaceDeclHandler end);
  
  void XMLPARSEAPI
--- 470,484 ----
  
  void XMLPARSEAPI
! XML_SetNamespaceDeclHandler(XML_Parser parser,
! 			    XML_StartNamespaceDeclHandler start,
! 			    XML_EndNamespaceDeclHandler end);
  
  void XMLPARSEAPI
! XML_SetStartNamespaceDeclHandler(XML_Parser parser,
! 				 XML_StartNamespaceDeclHandler start);
  
  void XMLPARSEAPI
! XML_SetEndNamespaceDeclHandler(XML_Parser parser,
! 			       XML_EndNamespaceDeclHandler end);
  
  void XMLPARSEAPI
***************
*** 508,511 ****
--- 660,676 ----
  
  int XMLPARSEAPI XML_GetCurrentByteCount(XML_Parser parser);
+ 
+ /* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
+    the integer pointed to by offset to the offset within this buffer
+    of the current parse position, and sets the integer pointed to by size
+    to the size of this buffer (the number of input bytes). Otherwise
+    returns a null pointer. Also returns a null pointer if a parse isn't active.
+ 
+    NOTE: The character pointer returned should not be used outside
+    the handler that makes the call. */
+ 
+ const char XMLPARSEAPI * XML_GetInputContext(XML_Parser parser,
+ 					     int *offset,
+ 					     int *size);
  
  /* For backwards compatibility with previous versions. */

Index: iasciitab.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/iasciitab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** iasciitab.h	2000/09/18 16:26:22	1.1
--- iasciitab.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: latin1tab.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/latin1tab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** latin1tab.h	2000/09/18 16:26:22	1.1
--- latin1tab.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: utf8tab.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/utf8tab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** utf8tab.h	2000/09/18 16:26:22	1.1
--- utf8tab.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmldef.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmldef.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmldef.h	2000/09/18 16:26:22	1.1
--- xmldef.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmlparse.c	2000/09/18 16:26:22	1.1
--- xmlparse.c	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
[...1219 lines suppressed...]
+ 	       const char *ptr,
+ 	       const char *end)
+ {
+   const XML_Char *name = poolStoreString(&dtd.pool, enc, ptr, end);
+   ELEMENT_TYPE *ret;
+ 
+   if (! name)
+     return 0;
+   ret = (ELEMENT_TYPE *) lookup(&dtd.elementTypes, name, sizeof(ELEMENT_TYPE));
+   if (! ret)
+     return 0;
+   if (ret->name != name)
+     poolDiscard(&dtd.pool);
+   else {
+     poolFinish(&dtd.pool);
+     if (!setElementTypePrefix(parser, ret))
+       return 0;
+   }
+   return ret;
+ }  /* End getElementType */

Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmlrole.c	2000/09/18 16:26:22	1.1
--- xmlrole.c	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 195,199 ****
    case XML_TOK_OPEN_BRACKET:
      state->handler = internalSubset;
!     return XML_ROLE_NONE;
    case XML_TOK_DECL_CLOSE:
      state->handler = prolog2;
--- 195,199 ----
    case XML_TOK_OPEN_BRACKET:
      state->handler = internalSubset;
!     return XML_ROLE_DOCTYPE_INTERNAL_SUBSET;
    case XML_TOK_DECL_CLOSE:
      state->handler = prolog2;
***************
*** 259,263 ****
    case XML_TOK_OPEN_BRACKET:
      state->handler = internalSubset;
!     return XML_ROLE_NONE;
    case XML_TOK_DECL_CLOSE:
      state->handler = prolog2;
--- 259,263 ----
    case XML_TOK_OPEN_BRACKET:
      state->handler = internalSubset;
!     return XML_ROLE_DOCTYPE_INTERNAL_SUBSET;
    case XML_TOK_DECL_CLOSE:
      state->handler = prolog2;
***************
*** 494,498 ****
    case XML_TOK_DECL_CLOSE:
      setTopLevel(state);
!     return XML_ROLE_EXTERNAL_GENERAL_ENTITY_NO_NOTATION;
    case XML_TOK_NAME:
      if (XmlNameMatchesAscii(enc, ptr, end, KW_NDATA)) {
--- 494,498 ----
    case XML_TOK_DECL_CLOSE:
      setTopLevel(state);
!     return XML_ROLE_ENTITY_COMPLETE;
    case XML_TOK_NAME:
      if (XmlNameMatchesAscii(enc, ptr, end, KW_NDATA)) {
***************
*** 1007,1010 ****
--- 1007,1012 ----
      return XML_ROLE_NONE;
    case XML_TOK_CLOSE_PAREN:
+     state->handler = declClose;
+     return XML_ROLE_GROUP_CLOSE;
    case XML_TOK_CLOSE_PAREN_ASTERISK:
      state->handler = declClose;

Index: xmlrole.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmlrole.h	2000/09/18 16:26:22	1.1
--- xmlrole.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 21,24 ****
--- 21,25 ----
    XML_ROLE_DOCTYPE_SYSTEM_ID,
    XML_ROLE_DOCTYPE_PUBLIC_ID,
+   XML_ROLE_DOCTYPE_INTERNAL_SUBSET,
    XML_ROLE_DOCTYPE_CLOSE,
    XML_ROLE_GENERAL_ENTITY_NAME,
***************
*** 27,30 ****
--- 28,32 ----
    XML_ROLE_ENTITY_SYSTEM_ID,
    XML_ROLE_ENTITY_PUBLIC_ID,
+   XML_ROLE_ENTITY_COMPLETE,
    XML_ROLE_ENTITY_NOTATION_NAME,
    XML_ROLE_NOTATION_NAME,
***************
*** 68,73 ****
    XML_ROLE_INNER_PARAM_ENTITY_REF,
  #endif /* XML_DTD */
!   XML_ROLE_PARAM_ENTITY_REF,
!   XML_ROLE_EXTERNAL_GENERAL_ENTITY_NO_NOTATION
  };
  
--- 70,74 ----
    XML_ROLE_INNER_PARAM_ENTITY_REF,
  #endif /* XML_DTD */
!   XML_ROLE_PARAM_ENTITY_REF
  };
  

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok.c	2000/09/18 16:26:22	1.1
--- xmltok.c	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 1021,1024 ****
--- 1021,1025 ----
  		   const char **badPtr,
  		   const char **versionPtr,
+ 		   const char **versionEndPtr,
  		   const char **encodingName,
  		   const ENCODING **encoding,
***************
*** 1043,1046 ****
--- 1044,1049 ----
      if (versionPtr)
        *versionPtr = val;
+     if (versionEndPtr)
+       *versionEndPtr = ptr;
      if (!parsePseudoAttribute(enc, ptr, end, &name, &nameEnd, &val, &ptr)) {
        *badPtr = ptr;

Index: xmltok.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok.h	2000/09/18 16:26:22	1.1
--- xmltok.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 261,264 ****
--- 261,265 ----
  			      const char **badPtr,
  			      const char **versionPtr,
+ 			      const char **versionEndPtr,
  			      const char **encodingNamePtr,
  			      const ENCODING **namedEncodingPtr,
***************
*** 284,287 ****
--- 285,289 ----
  			        const char **badPtr,
  			        const char **versionPtr,
+ 				const char **versionEndPtr,
  			        const char **encodingNamePtr,
  			        const ENCODING **namedEncodingPtr,

Index: xmltok_impl.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_impl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok_impl.c	2000/09/18 16:26:22	1.1
--- xmltok_impl.c	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmltok_impl.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_impl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok_impl.h	2000/09/18 16:26:22	1.1
--- xmltok_impl.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmltok_ns.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_ns.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok_ns.c	2000/09/18 16:26:22	1.1
--- xmltok_ns.c	2000/09/21 21:20:18	1.2
***************
*** 80,83 ****
--- 80,84 ----
  			const char **badPtr,
  			const char **versionPtr,
+ 			const char **versionEndPtr,
  			const char **encodingName,
  			const ENCODING **encoding,
***************
*** 91,94 ****
--- 92,96 ----
  			badPtr,
  			versionPtr,
+ 			versionEndPtr,
  			encodingName,
  			encoding,