[Expat-checkins] CVS: expat/lib expat.h.in,1.10,1.11 xmlparse.c,1.19,1.20
Fred L. Drake
fdrake@users.sourceforge.net
Fri, 27 Jul 2001 10:03:03 -0700
Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv22971
Modified Files:
expat.h.in xmlparse.c
Log Message:
Try again.
Index: expat.h.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** expat.h.in 2001/07/27 16:30:56 1.10
--- expat.h.in 2001/07/27 17:03:01 1.11
***************
*** 12,19 ****
# if defined(__declspec) && !defined(__BEOS__)
# define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl
! # define XMLCALLBACK(type) type __cdecl
# else
# define XMLPARSEAPI(type) type
! # define XMLCALLBACK(type) type
# endif
#endif /* not defined XMLPARSEAPI */
--- 12,19 ----
# if defined(__declspec) && !defined(__BEOS__)
# define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl
! # define XMLCALLBACK(type,name) type (* __cdecl name)
# else
# define XMLPARSEAPI(type) type
! # define XMLCALLBACK(type,name) type (* name)
# endif
#endif /* not defined XMLPARSEAPI */
***************
*** 79,85 ****
*/
! typedef XMLCALLBACK(void) (*XML_ElementDeclHandler) (void *userData,
! const XML_Char *name,
! XML_Content *model);
XMLPARSEAPI(void)
--- 79,85 ----
*/
! typedef XMLCALLBACK(void, XML_ElementDeclHandler) (void *userData,
! const XML_Char *name,
! XML_Content *model);
XMLPARSEAPI(void)
***************
*** 97,106 ****
*/
! typedef XMLCALLBACK(void) (*XML_AttlistDeclHandler) (void *userData,
! const XML_Char *elname,
! const XML_Char *attname,
! const XML_Char *att_type,
! const XML_Char *dflt,
! int isrequired);
XMLPARSEAPI(void)
--- 97,106 ----
*/
! typedef XMLCALLBACK(void, XML_AttlistDeclHandler) (void *userData,
! const XML_Char *elname,
! const XML_Char *attname,
! const XML_Char *att_type,
! const XML_Char *dflt,
! int isrequired);
XMLPARSEAPI(void)
***************
*** 117,124 ****
*/
! typedef XMLCALLBACK(void) (*XML_XmlDeclHandler) (void *userData,
! const XML_Char *version,
! const XML_Char *encoding,
! int standalone);
XMLPARSEAPI(void)
--- 117,124 ----
*/
! typedef XMLCALLBACK(void, XML_XmlDeclHandler) (void *userData,
! const XML_Char *version,
! const XML_Char *encoding,
! int standalone);
XMLPARSEAPI(void)
***************
*** 171,197 ****
names and values are 0 terminated. */
! typedef XMLCALLBACK(void) (*XML_StartElementHandler)(void *userData,
! const XML_Char *name,
! const XML_Char **atts);
! typedef XMLCALLBACK(void) (*XML_EndElementHandler)(void *userData,
! const XML_Char *name);
/* s is not 0 terminated. */
! typedef XMLCALLBACK(void) (*XML_CharacterDataHandler)(void *userData,
! const XML_Char *s,
! int len);
/* target and data are 0 terminated */
! typedef XMLCALLBACK(void) (*XML_ProcessingInstructionHandler)(void *userData,
! const XML_Char *target,
! const XML_Char *data);
/* data is 0 terminated */
! typedef XMLCALLBACK(void) (*XML_CommentHandler)(void *userData, const XML_Char *data);
! typedef XMLCALLBACK(void) (*XML_StartCdataSectionHandler)(void *userData);
! typedef XMLCALLBACK(void) (*XML_EndCdataSectionHandler)(void *userData);
/* This is called for any characters in the XML document for
--- 171,197 ----
names and values are 0 terminated. */
! typedef XMLCALLBACK(void, XML_StartElementHandler)(void *userData,
! const XML_Char *name,
! const XML_Char **atts);
! typedef XMLCALLBACK(void, XML_EndElementHandler)(void *userData,
! const XML_Char *name);
/* s is not 0 terminated. */
! typedef XMLCALLBACK(void, XML_CharacterDataHandler)(void *userData,
! const XML_Char *s,
! int len);
/* target and data are 0 terminated */
! typedef XMLCALLBACK(void, XML_ProcessingInstructionHandler)(void *userData,
! const XML_Char *target,
! const XML_Char *data);
/* data is 0 terminated */
! typedef XMLCALLBACK(void, XML_CommentHandler)(void *userData, const XML_Char *data);
! typedef XMLCALLBACK(void, XML_StartCdataSectionHandler)(void *userData);
! typedef XMLCALLBACK(void, XML_EndCdataSectionHandler)(void *userData);
/* This is called for any characters in the XML document for
***************
*** 208,227 ****
multiple calls. */
! typedef XMLCALLBACK(void) (*XML_DefaultHandler)(void *userData,
! const XML_Char *s,
! int len);
/* This is called for the start of the DOCTYPE declaration, before
any DTD or internal subset is parsed. */
! typedef XMLCALLBACK(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 XMLCALLBACK(void) (*XML_EndDoctypeDeclHandler)(void *userData);
/* This is called for entity declarations. The is_parameter_entity
--- 208,227 ----
multiple calls. */
! typedef XMLCALLBACK(void, XML_DefaultHandler)(void *userData,
! const XML_Char *s,
! int len);
/* This is called for the start of the DOCTYPE declaration, before
any DTD or internal subset is parsed. */
! typedef XMLCALLBACK(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 XMLCALLBACK(void, XML_EndDoctypeDeclHandler)(void *userData);
/* This is called for entity declarations. The is_parameter_entity
***************
*** 241,253 ****
*/
! typedef XMLCALLBACK(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);
XMLPARSEAPI(void)
--- 241,253 ----
*/
! typedef XMLCALLBACK(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);
XMLPARSEAPI(void)
***************
*** 263,272 ****
The other arguments may be. */
! typedef XMLCALLBACK(void) (*XML_UnparsedEntityDeclHandler)(void *userData,
! const XML_Char *entityName,
! const XML_Char *base,
! const XML_Char *systemId,
! const XML_Char *publicId,
! const XML_Char *notationName);
/* This is called for a declaration of notation.
--- 263,272 ----
The other arguments may be. */
! typedef XMLCALLBACK(void, XML_UnparsedEntityDeclHandler)(void *userData,
! const XML_Char *entityName,
! const XML_Char *base,
! const XML_Char *systemId,
! const XML_Char *publicId,
! const XML_Char *notationName);
/* This is called for a declaration of notation.
***************
*** 274,282 ****
The notationName will never be null. The other arguments can be. */
! typedef XMLCALLBACK(void) (*XML_NotationDeclHandler)(void *userData,
! const XML_Char *notationName,
! const XML_Char *base,
! const XML_Char *systemId,
! const XML_Char *publicId);
/* When namespace processing is enabled, these are called once for
--- 274,282 ----
The notationName will never be null. The other arguments can be. */
! typedef XMLCALLBACK(void, XML_NotationDeclHandler)(void *userData,
! const XML_Char *notationName,
! const XML_Char *base,
! const XML_Char *systemId,
! const XML_Char *publicId);
/* When namespace processing is enabled, these are called once for
***************
*** 286,295 ****
For an xmlns="" attribute, uri will be null. */
! typedef XMLCALLBACK(void) (*XML_StartNamespaceDeclHandler)(void *userData,
! const XML_Char *prefix,
! const XML_Char *uri);
! typedef XMLCALLBACK(void) (*XML_EndNamespaceDeclHandler)(void *userData,
! const XML_Char *prefix);
/* This is called if the document is not standalone (it has an
--- 286,295 ----
For an xmlns="" attribute, uri will be null. */
! typedef XMLCALLBACK(void, XML_StartNamespaceDeclHandler)(void *userData,
! const XML_Char *prefix,
! const XML_Char *uri);
! typedef XMLCALLBACK(void, XML_EndNamespaceDeclHandler)(void *userData,
! const XML_Char *prefix);
/* This is called if the document is not standalone (it has an
***************
*** 299,303 ****
XML_ERROR_NOT_STANDALONE error. */
! typedef XMLCALLBACK(int) (*XML_NotStandaloneHandler)(void *userData);
/* This is called for a reference to an external parsed general entity.
--- 299,303 ----
XML_ERROR_NOT_STANDALONE error. */
! typedef XMLCALLBACK(int, XML_NotStandaloneHandler)(void *userData);
/* This is called for a reference to an external parsed general entity.
***************
*** 326,334 ****
userData. */
! typedef XMLCALLBACK(int) (*XML_ExternalEntityRefHandler)(XML_Parser parser,
! const XML_Char *context,
! const XML_Char *base,
! const XML_Char *systemId,
! const XML_Char *publicId);
/* This structure is filled in by the XML_UnknownEncodingHandler
--- 326,334 ----
userData. */
! typedef XMLCALLBACK(int, XML_ExternalEntityRefHandler)(XML_Parser parser,
! const XML_Char *context,
! const XML_Char *base,
! const XML_Char *systemId,
! const XML_Char *publicId);
/* This structure is filled in by the XML_UnknownEncodingHandler
***************
*** 392,398 ****
then the parser will return an XML_UNKNOWN_ENCODING error. */
! typedef XMLCALLBACK(int) (*XML_UnknownEncodingHandler)(void *encodingHandlerData,
! const XML_Char *name,
! XML_Encoding *info);
XMLPARSEAPI(void)
--- 392,398 ----
then the parser will return an XML_UNKNOWN_ENCODING error. */
! typedef XMLCALLBACK(int, XML_UnknownEncodingHandler)(void *encodingHandlerData,
! const XML_Char *name,
! XML_Encoding *info);
XMLPARSEAPI(void)
Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** xmlparse.c 2001/07/27 16:30:56 1.19
--- xmlparse.c 2001/07/27 17:03:01 1.20
***************
*** 7,11 ****
# include "winconfig.h"
# define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
! # define XMLCALLBACK(type) type __cdecl
# include "expat.h"
# undef XMLPARSEAPI
--- 7,11 ----
# include "winconfig.h"
# define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
! # define XMLCALLBACK(type,name) type (* __cdecl name)
# include "expat.h"
# undef XMLPARSEAPI
***************
*** 16,20 ****
#ifdef __declspec
# define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
! # define XMLCALLBACK(type) type __cdecl
#endif
--- 16,20 ----
#ifdef __declspec
# define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
! # define XMLCALLBACK(type,name) type (* __cdecl name)
#endif