cheng/libexpat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xmlparse.c: Resolve macro "endElementHandler" (issue #59)

Browse Source
This commit is contained in:
Sebastian Pipping 2017-09-02 23:47:15 +02:00
parent 9904008198
commit 1be39b802f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
expat/lib/xmlparse.c
View File

@ -648,7 +648,6 @@ struct XML_ParserStruct {
#define REALLOC(p,s) (parser->m_mem.realloc_fcn((p),(s))) #define REALLOC(p,s) (parser->m_mem.realloc_fcn((p),(s)))
#define FREE(p) (parser->m_mem.free_fcn((p))) #define FREE(p) (parser->m_mem.free_fcn((p)))
#define endElementHandler (parser->m_endElementHandler)
#define characterDataHandler (parser->m_characterDataHandler) #define characterDataHandler (parser->m_characterDataHandler)
#define processingInstructionHandler \ #define processingInstructionHandler \
(parser->m_processingInstructionHandler) (parser->m_processingInstructionHandler)
@ -1136,7 +1135,7 @@ parserInit(XML_Parser parser, const XML_Char *encodingName)
parser->m_userData = NULL; parser->m_userData = NULL;
parser->m_handlerArg = NULL; parser->m_handlerArg = NULL;
parser->m_startElementHandler = NULL; parser->m_startElementHandler = NULL;
endElementHandler = NULL; parser->m_endElementHandler = NULL;
characterDataHandler = NULL; characterDataHandler = NULL;
processingInstructionHandler = NULL; processingInstructionHandler = NULL;
commentHandler = NULL; commentHandler = NULL;
@ -1330,7 +1329,7 @@ XML_ExternalEntityParserCreate(XML_Parser oldParser,
/* Stash the original parser contents on the stack */ /* Stash the original parser contents on the stack */
oldDtd = _dtd; oldDtd = _dtd;
oldStartElementHandler = parser->m_startElementHandler; oldStartElementHandler = parser->m_startElementHandler;
oldEndElementHandler = endElementHandler; oldEndElementHandler = parser->m_endElementHandler;
oldCharacterDataHandler = characterDataHandler; oldCharacterDataHandler = characterDataHandler;
oldProcessingInstructionHandler = processingInstructionHandler; oldProcessingInstructionHandler = processingInstructionHandler;
oldCommentHandler = commentHandler; oldCommentHandler = commentHandler;
@ -1390,7 +1389,7 @@ XML_ExternalEntityParserCreate(XML_Parser oldParser,
return NULL; return NULL;
parser->m_startElementHandler = oldStartElementHandler; parser->m_startElementHandler = oldStartElementHandler;
endElementHandler = oldEndElementHandler; parser->m_endElementHandler = oldEndElementHandler;
characterDataHandler = oldCharacterDataHandler; characterDataHandler = oldCharacterDataHandler;
processingInstructionHandler = oldProcessingInstructionHandler; processingInstructionHandler = oldProcessingInstructionHandler;
commentHandler = oldCommentHandler; commentHandler = oldCommentHandler;
@ -1632,7 +1631,7 @@ XML_SetElementHandler(XML_Parser parser,
if (parser == NULL) if (parser == NULL)
return; return;
parser->m_startElementHandler = start; parser->m_startElementHandler = start;
endElementHandler = end; parser->m_endElementHandler = end;
} }
void XMLCALL void XMLCALL
@ -1646,7 +1645,7 @@ void XMLCALL
XML_SetEndElementHandler(XML_Parser parser, XML_SetEndElementHandler(XML_Parser parser,
XML_EndElementHandler end) { XML_EndElementHandler end) {
if (parser != NULL) if (parser != NULL)
endElementHandler = end; parser->m_endElementHandler = end;
} }
void XMLCALL void XMLCALL
@ -2945,10 +2944,10 @@ doContent(XML_Parser parser,
parser->m_startElementHandler(parser->m_handlerArg, name.str, (const XML_Char **)atts); parser->m_startElementHandler(parser->m_handlerArg, name.str, (const XML_Char **)atts);
noElmHandlers = XML_FALSE; noElmHandlers = XML_FALSE;
} }
if (endElementHandler) { if (parser->m_endElementHandler) {
if (parser->m_startElementHandler) if (parser->m_startElementHandler)
*eventPP = *eventEndPP; *eventPP = *eventEndPP;
endElementHandler(parser->m_handlerArg, name.str); parser->m_endElementHandler(parser->m_handlerArg, name.str);
noElmHandlers = XML_FALSE; noElmHandlers = XML_FALSE;
} }
if (noElmHandlers && defaultHandler) if (noElmHandlers && defaultHandler)
@ -2979,7 +2978,7 @@ doContent(XML_Parser parser,
return XML_ERROR_TAG_MISMATCH; return XML_ERROR_TAG_MISMATCH;
} }
--tagLevel; --tagLevel;
if (endElementHandler) { if (parser->m_endElementHandler) {
const XML_Char *localPart; const XML_Char *localPart;
const XML_Char *prefix; const XML_Char *prefix;
XML_Char *uri; XML_Char *uri;
@ -2999,7 +2998,7 @@ doContent(XML_Parser parser,
} }
*uri = XML_T('\0'); *uri = XML_T('\0');
} }
endElementHandler(parser->m_handlerArg, tag->name.str); parser->m_endElementHandler(parser->m_handlerArg, tag->name.str);
} }
else if (defaultHandler) else if (defaultHandler)
reportDefault(parser, enc, s, next); reportDefault(parser, enc, s, next);