From 5841ab111b4cd0528aadc4e9c93d675fde39aa3f Mon Sep 17 00:00:00 2001 From: Marco Maggi Date: Sun, 21 Oct 2018 08:16:42 +0200 Subject: [PATCH] change code exclusion style to make sure that the excluded code still compiles --- expat/lib/xmlparse.c | 8 ++------ expat/xmlwf/xmlmime.c | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index eaefb6f4..122045b1 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -3010,7 +3010,6 @@ doContent(XML_Parser parser, enum XML_Error result; if (parser->m_startCdataSectionHandler) parser->m_startCdataSectionHandler(parser->m_handlerArg); -#if 0 /* Suppose you doing a transformation on a document that involves changing only the character data. You set up a defaultHandler and a characterDataHandler. The defaultHandler simply copies @@ -3023,9 +3022,8 @@ doContent(XML_Parser parser, However, now we have a start/endCdataSectionHandler, so it seems easier to let the user deal with this. */ - else if (parser->m_characterDataHandler) + else if (0 && parser->m_characterDataHandler) parser->m_characterDataHandler(parser->m_handlerArg, parser->m_dataBuf, 0); -#endif else if (parser->m_defaultHandler) reportDefault(parser, enc, s, next); result = doCdataSection(parser, enc, &next, end, nextPtr, haveMore); @@ -3722,11 +3720,9 @@ doCdataSection(XML_Parser parser, case XML_TOK_CDATA_SECT_CLOSE: if (parser->m_endCdataSectionHandler) parser->m_endCdataSectionHandler(parser->m_handlerArg); -#if 0 /* see comment under XML_TOK_CDATA_SECT_OPEN */ - else if (parser->m_characterDataHandler) + else if (0 && parser->m_characterDataHandler) parser->m_characterDataHandler(parser->m_handlerArg, parser->m_dataBuf, 0); -#endif else if (parser->m_defaultHandler) reportDefault(parser, enc, s, next); *startPtr = next; diff --git a/expat/xmlwf/xmlmime.c b/expat/xmlwf/xmlmime.c index c5309790..e7676e64 100644 --- a/expat/xmlwf/xmlmime.c +++ b/expat/xmlwf/xmlmime.c @@ -132,10 +132,10 @@ getXMLCharset(const char *buf, char *charset) if (!p || *p != '/') return; p = getTok(&next); -#if 0 - if (!matchkey(p, next, "xml") && charset[0] == '\0') - return; -#endif + if (0) { + if (!matchkey(p, next, "xml") && charset[0] == '\0') + return; + } p = getTok(&next); while (p) { if (*p == ';') { -- 2.40.0