Ignore:
Timestamp:
Aug 21, 2001, 7:29:38 PM (24 years ago)
Author:
umoeller
Message:

Misc updates.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/expat/expat.h

    r97 r98  
    1313                        // to save the app from having to include this as well
    1414
    15 #ifndef XMLPARSEAPI
     15/* #ifndef XMLPARSEAPI
    1616    #ifdef EXPATENTRY
    17         #define XMLPARSEAPI(type) type EXPATENTRY
     17        // #define XMLPARSEAPI(type) type EXPATENTRY
     18        #define XMLPARSEAPI(type)
    1819            // V0.9.14 (2001-08-09) [umoeller]
    1920    #else
    2021        #define XMLPARSEAPI(type) type
    2122    #endif
    22 #endif
     23#endif */
     24
     25#ifndef XMLPARSEAPI
     26#  ifdef __declspec
     27#    define XMLPARSEAPI __declspec(dllimport)
     28#  else
     29#    define XMLPARSEAPI /* nothing */
     30#  endif
     31#endif  /* not defined XMLPARSEAPI */
    2332
    2433#ifdef __cplusplus
     
    119128*/
    120129
    121 typedef void (*XML_ElementDeclHandler) (void *userData,
     130typedef void (* EXPATENTRY XML_ElementDeclHandler) (void *userData,
    122131                                        const XML_Char *name,
    123132                                        XMLCONTENT *model);
    124133
    125 XMLPARSEAPI(void)
    126 XML_SetElementDeclHandler(XML_Parser parser,
    127               XML_ElementDeclHandler eldecl);
     134void EXPATENTRY XML_SetElementDeclHandler(XML_Parser parser,
     135                                            XML_ElementDeclHandler eldecl);
    128136
    129137/*
     
    137145 */
    138146
    139 typedef void (*XML_AttlistDeclHandler) (void           *userData,
     147typedef void (* EXPATENTRY XML_AttlistDeclHandler) (void           *userData,
    140148                                        const XML_Char *elname,
    141149                                        const XML_Char *attname,
     
    144152                                        int     isrequired);
    145153
    146 XMLPARSEAPI(void)
     154void EXPATENTRY
    147155XML_SetAttlistDeclHandler(XML_Parser parser,
    148156              XML_AttlistDeclHandler attdecl);
     
    157165  */
    158166
    159 typedef void (*XML_XmlDeclHandler) (void        *userData,
     167typedef void (* EXPATENTRY XML_XmlDeclHandler) (void        *userData,
    160168                                    const XML_Char  *version,
    161169                                    const XML_Char  *encoding,
    162170                                    int          standalone);
    163171
    164 XMLPARSEAPI(void)
     172void EXPATENTRY
    165173XML_SetXmlDeclHandler(XML_Parser parser,
    166174              XML_XmlDeclHandler xmldecl);
     
    176184external protocol or null if there is none specified. */
    177185
    178 XMLPARSEAPI(XML_Parser)
     186XML_Parser EXPATENTRY
    179187XML_ParserCreate(const XML_Char *encoding);
    180188
     
    189197the name and prefix will be passed through without expansion. */
    190198
    191 XMLPARSEAPI(XML_Parser)
     199XML_Parser EXPATENTRY
    192200XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
    193201
     
    203211*/
    204212
    205 XMLPARSEAPI(XML_Parser)
     213XML_Parser EXPATENTRY
    206214XML_ParserCreate_MM(const XML_Char *encoding,
    207215            const XML_Memory_Handling_Suite *memsuite,
     
    211219   names and values are 0 terminated. */
    212220
    213 typedef void (*XML_StartElementHandler)(void *userData,
     221typedef void (* EXPATENTRY XML_StartElementHandler)(void *userData,
    214222                                        const XML_Char *name,
    215223                                        const XML_Char **atts);
    216224
    217 typedef void (*XML_EndElementHandler)(void *userData,
     225typedef void (* EXPATENTRY XML_EndElementHandler)(void *userData,
    218226                                      const XML_Char *name);
    219227
    220228
    221229/* s is not 0 terminated. */
    222 typedef void (*XML_CharacterDataHandler)(void *userData,
     230typedef void (* EXPATENTRY XML_CharacterDataHandler)(void *userData,
    223231                                         const XML_Char *s,
    224232                                         int len);
    225233
    226234/* target and data are 0 terminated */
    227 typedef void (*XML_ProcessingInstructionHandler)(void *userData,
     235typedef void (* EXPATENTRY XML_ProcessingInstructionHandler)(void *userData,
    228236                                                 const XML_Char *target,
    229237                                                 const XML_Char *data);
    230238
    231239/* data is 0 terminated */
    232 typedef void (*XML_CommentHandler)(void *userData, const XML_Char *data);
    233 
    234 typedef void (*XML_StartCdataSectionHandler)(void *userData);
    235 typedef void (*XML_EndCdataSectionHandler)(void *userData);
     240typedef void (* EXPATENTRY XML_CommentHandler)(void *userData, const XML_Char *data);
     241
     242typedef void (* EXPATENTRY XML_StartCdataSectionHandler)(void *userData);
     243typedef void (* EXPATENTRY XML_EndCdataSectionHandler)(void *userData);
    236244
    237245/* This is called for any characters in the XML document for
     
    248256multiple calls. */
    249257
    250 typedef void (*XML_DefaultHandler)(void *userData,
     258typedef void (* EXPATENTRY XML_DefaultHandler)(void *userData,
    251259                                   const XML_Char *s,
    252260                                   int len);
     
    255263   any DTD or internal subset is parsed. */
    256264
    257 typedef void (*XML_StartDoctypeDeclHandler)(void *userData,
     265typedef void (* EXPATENTRY XML_StartDoctypeDeclHandler)(void *userData,
    258266                                            const XML_Char *doctypeName,
    259267                                            const XML_Char *sysid,
     
    263271/* This is called for the start of the DOCTYPE declaration when the
    264272closing > is encountered, but after processing any external subset. */
    265 typedef void (*XML_EndDoctypeDeclHandler)(void *userData);
     273typedef void (* EXPATENTRY XML_EndDoctypeDeclHandler)(void *userData);
    266274
    267275/* This is called for entity declarations. The is_parameter_entity
     
    281289*/
    282290
    283 typedef void (*XML_EntityDeclHandler) (void *userData,
     291typedef void (* EXPATENTRY XML_EntityDeclHandler) (void *userData,
    284292                                       const XML_Char *entityName,
    285293                                       int is_parameter_entity,
     
    291299                                       const XML_Char *notationName);
    292300
    293 XMLPARSEAPI(void)
     301void EXPATENTRY
    294302XML_SetEntityDeclHandler(XML_Parser parser,
    295303             XML_EntityDeclHandler handler);
     
    303311The other arguments may be. */
    304312
    305 typedef void (*XML_UnparsedEntityDeclHandler)(void *userData,
     313typedef void (* EXPATENTRY XML_UnparsedEntityDeclHandler)(void *userData,
    306314                                              const XML_Char *entityName,
    307315                                              const XML_Char *base,
     
    314322The notationName will never be null.  The other arguments can be. */
    315323
    316 typedef void (*XML_NotationDeclHandler)(void *userData,
     324typedef void (* EXPATENTRY XML_NotationDeclHandler)(void *userData,
    317325                                        const XML_Char *notationName,
    318326                                        const XML_Char *base,
     
    326334For an xmlns="" attribute, uri will be null. */
    327335
    328 typedef void (*XML_StartNamespaceDeclHandler)(void *userData,
     336typedef void (* EXPATENTRY XML_StartNamespaceDeclHandler)(void *userData,
    329337                                              const XML_Char *prefix,
    330338                                              const XML_Char *uri);
    331339
    332 typedef void (*XML_EndNamespaceDeclHandler)(void *userData,
     340typedef void (* EXPATENTRY XML_EndNamespaceDeclHandler)(void *userData,
    333341                                            const XML_Char *prefix);
    334342
     
    339347ERROR_EXPAT_NOT_STANDALONE error. */
    340348
    341 typedef int (*XML_NotStandaloneHandler)(void *userData);
     349typedef int (* EXPATENTRY XML_NotStandaloneHandler)(void *userData);
    342350
    343351/* This is called for a reference to an external parsed general entity.
     
    366374userData. */
    367375
    368 typedef int (*XML_ExternalEntityRefHandler)(void *userData,     // added V0.9.14 (2001-08-09) [umoeller]
     376typedef int (* EXPATENTRY XML_ExternalEntityRefHandler)(void *userData,     // added V0.9.14 (2001-08-09) [umoeller]
    369377                                            XML_Parser parser,
    370378                                            const XML_Char *context,
     
    418426  int map[256];
    419427  void *data;
    420   int (*convert)(void *data, const char *s);
    421   void (*release)(void *data);
     428  int (* EXPATENTRY convert)(void *data, const char *s);
     429  void (* EXPATENTRY release)(void *data);
    422430} XML_Encoding;
    423431
     
    433441then the parser will return an XML_UNKNOWN_ENCODING error. */
    434442
    435 typedef int (*XML_UnknownEncodingHandler)(void *encodingHandlerData,
     443typedef int (* EXPATENTRY XML_UnknownEncodingHandler)(void *encodingHandlerData,
    436444                                          const XML_Char *name,
    437445                                          XML_Encoding *info);
    438446
    439 XMLPARSEAPI(void)
     447void EXPATENTRY
    440448XML_SetElementHandler(XML_Parser parser,
    441449              XML_StartElementHandler start,
    442450              XML_EndElementHandler end);
    443451
    444 XMLPARSEAPI(void)
     452void EXPATENTRY
    445453XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler);
    446454
    447 XMLPARSEAPI(void)
     455void EXPATENTRY
    448456XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler);
    449457
    450 XMLPARSEAPI(void)
     458void EXPATENTRY
    451459XML_SetCharacterDataHandler(XML_Parser parser,
    452460                XML_CharacterDataHandler handler);
    453461
    454 XMLPARSEAPI(void)
     462void EXPATENTRY
    455463XML_SetProcessingInstructionHandler(XML_Parser parser,
    456464                    XML_ProcessingInstructionHandler handler);
    457 XMLPARSEAPI(void)
     465void EXPATENTRY
    458466XML_SetCommentHandler(XML_Parser parser,
    459467                      XML_CommentHandler handler);
    460468
    461 XMLPARSEAPI(void)
     469void EXPATENTRY
    462470XML_SetCdataSectionHandler(XML_Parser parser,
    463471               XML_StartCdataSectionHandler start,
    464472               XML_EndCdataSectionHandler end);
    465473
    466 XMLPARSEAPI(void)
     474void EXPATENTRY
    467475XML_SetStartCdataSectionHandler(XML_Parser parser,
    468476                                XML_StartCdataSectionHandler start);
    469477
    470 XMLPARSEAPI(void)
     478void EXPATENTRY
    471479XML_SetEndCdataSectionHandler(XML_Parser parser,
    472480                              XML_EndCdataSectionHandler end);
     
    476484handler. */
    477485
    478 XMLPARSEAPI(void)
     486void EXPATENTRY
    479487XML_SetDefaultHandler(XML_Parser parser,
    480488              XML_DefaultHandler handler);
     
    484492default handler. */
    485493
    486 XMLPARSEAPI(void)
     494void EXPATENTRY
    487495XML_SetDefaultHandlerExpand(XML_Parser parser,
    488496                    XML_DefaultHandler handler);
    489497
    490 XMLPARSEAPI(void)
     498void EXPATENTRY
    491499XML_SetDoctypeDeclHandler(XML_Parser parser,
    492500              XML_StartDoctypeDeclHandler start,
    493501              XML_EndDoctypeDeclHandler end);
    494502
    495 XMLPARSEAPI(void)
     503void EXPATENTRY
    496504XML_SetStartDoctypeDeclHandler(XML_Parser parser,
    497505                   XML_StartDoctypeDeclHandler start);
    498506
    499 XMLPARSEAPI(void)
     507void EXPATENTRY
    500508XML_SetEndDoctypeDeclHandler(XML_Parser parser,
    501509                 XML_EndDoctypeDeclHandler end);
    502510
    503 XMLPARSEAPI(void)
     511void EXPATENTRY
    504512XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
    505513                 XML_UnparsedEntityDeclHandler handler);
    506514
    507 XMLPARSEAPI(void)
     515void EXPATENTRY
    508516XML_SetNotationDeclHandler(XML_Parser parser,
    509517               XML_NotationDeclHandler handler);
    510518
    511 XMLPARSEAPI(void)
     519void EXPATENTRY
    512520XML_SetNamespaceDeclHandler(XML_Parser parser,
    513521                XML_StartNamespaceDeclHandler start,
    514522                XML_EndNamespaceDeclHandler end);
    515523
    516 XMLPARSEAPI(void)
     524void EXPATENTRY
    517525XML_SetStartNamespaceDeclHandler(XML_Parser parser,
    518526                 XML_StartNamespaceDeclHandler start);
    519527
    520 XMLPARSEAPI(void)
     528void EXPATENTRY
    521529XML_SetEndNamespaceDeclHandler(XML_Parser parser,
    522530                   XML_EndNamespaceDeclHandler end);
    523531
    524 XMLPARSEAPI(void)
     532void EXPATENTRY
    525533XML_SetNotStandaloneHandler(XML_Parser parser,
    526534                XML_NotStandaloneHandler handler);
    527535
    528 XMLPARSEAPI(void)
     536void EXPATENTRY
    529537XML_SetExternalEntityRefHandler(XML_Parser parser,
    530538                XML_ExternalEntityRefHandler handler);
     
    533541as the first argument to the external entity ref handler instead
    534542of the parser object. */
    535 XMLPARSEAPI(void)
     543void EXPATENTRY
    536544XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg);
    537545
    538 XMLPARSEAPI(void)
     546void EXPATENTRY
    539547XML_SetUnknownEncodingHandler(XML_Parser parser,
    540548                  XML_UnknownEncodingHandler handler,
     
    544552processing instruction or character data.  It causes the corresponding
    545553markup to be passed to the default handler. */
    546 XMLPARSEAPI(void)
     554void EXPATENTRY
    547555XML_DefaultCurrent(XML_Parser parser);
    548556
     
    558566*/
    559567
    560 XMLPARSEAPI(void)
     568void EXPATENTRY
    561569XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
    562570
    563571/* This value is passed as the userData argument to callbacks. */
    564 XMLPARSEAPI(void)
     572void EXPATENTRY
    565573XML_SetUserData(XML_Parser parser, void *userData);
    566574
     
    572580or XML_ParseBuffer. */
    573581
    574 XMLPARSEAPI(int)
     582int EXPATENTRY
    575583XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
    576584
     
    579587The userData will still be accessible using XML_GetUserData. */
    580588
    581 XMLPARSEAPI(void)
     589void EXPATENTRY
    582590XML_UseParserAsHandlerArg(XML_Parser parser);
    583591
     
    589597Returns zero if out of memory, non-zero otherwise. */
    590598
    591 XMLPARSEAPI(int)
     599int EXPATENTRY
    592600XML_SetBase(XML_Parser parser, const XML_Char *base);
    593601
    594 XMLPARSEAPI(const XML_Char *)
     602const XML_Char * EXPATENTRY
    595603XML_GetBase(XML_Parser parser);
    596604
     
    601609XML_StartElementHandler. */
    602610
    603 XMLPARSEAPI(int)
     611int EXPATENTRY
    604612XML_GetSpecifiedAttributeCount(XML_Parser parser);
    605613
     
    609617into the atts array passed to the XML_StartElementHandler. */
    610618
    611 XMLPARSEAPI(int)
     619int EXPATENTRY
    612620XML_GetIdAttributeIndex(XML_Parser parser);
    613621
     
    615623The last call to XML_Parse must have isFinal true;
    616624len may be zero for this call (or any other). */
    617 XMLPARSEAPI(int)
     625int EXPATENTRY
    618626XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
    619627
    620 XMLPARSEAPI(void *)
     628void * EXPATENTRY
    621629XML_GetBuffer(XML_Parser parser, int len);
    622630
    623 XMLPARSEAPI(int)
     631int EXPATENTRY
    624632XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
    625633
     
    639647from the parser argument.  Returns 0 if out of memory.  Otherwise
    640648returns a new XML_Parser object. */
    641 XMLPARSEAPI(XML_Parser)
     649XML_Parser EXPATENTRY
    642650XML_ExternalEntityParserCreate(XML_Parser parser,
    643651                   const XML_Char *context,
     
    669677entities is requested; otherwise it will return non-zero. */
    670678
    671 XMLPARSEAPI(int)
     679int EXPATENTRY
    672680XML_SetParamEntityParsing(XML_Parser parser,
    673681              enum XML_ParamEntityParsing parsing);
     
    732740returns information about the error. */
    733741
    734 XMLPARSEAPI(XMLERROR)
     742XMLERROR EXPATENTRY
    735743XML_GetErrorCode(XML_Parser parser);
    736744
     
    743751of the sequence of characters that generated the event. */
    744752
    745 XMLPARSEAPI(int) XML_GetCurrentLineNumber(XML_Parser parser);
    746 XMLPARSEAPI(int) XML_GetCurrentColumnNumber(XML_Parser parser);
    747 XMLPARSEAPI(long) XML_GetCurrentByteIndex(XML_Parser parser);
     753int EXPATENTRY XML_GetCurrentLineNumber(XML_Parser parser);
     754int EXPATENTRY XML_GetCurrentColumnNumber(XML_Parser parser);
     755long EXPATENTRY XML_GetCurrentByteIndex(XML_Parser parser);
    748756
    749757/* Return the number of bytes in the current event.
    750758Returns 0 if the event is in an internal entity. */
    751759
    752 XMLPARSEAPI(int)
     760int EXPATENTRY
    753761XML_GetCurrentByteCount(XML_Parser parser);
    754762
     
    763771   the handler that makes the call. */
    764772
    765 XMLPARSEAPI(const char *)
     773const char * EXPATENTRY
    766774XML_GetInputContext(XML_Parser parser,
    767775            int *offset,
     
    774782
    775783/* Frees memory used by the parser. */
    776 XMLPARSEAPI(void)
     784void EXPATENTRY
    777785XML_ParserFree(XML_Parser parser);
    778786
    779787/* Returns a string describing the error. */
    780 XMLPARSEAPI(const XML_LChar *)
     788const XML_LChar * EXPATENTRY
    781789XML_ErrorString(int code);
    782790
    783791/* Return a string containing the version number of this expat */
    784 XMLPARSEAPI(const XML_LChar *)
     792const XML_LChar * EXPATENTRY
    785793XML_ExpatVersion(void);
    786794
     
    794802   number information for this version of expat */
    795803
    796 XMLPARSEAPI(XML_Expat_Version)
     804XML_Expat_Version EXPATENTRY
    797805XML_ExpatVersionInfo(void);
    798806
Note: See TracChangeset for help on using the changeset viewer.