diff options
| -rw-r--r-- | ext/xml/expat/xmlparse/xmlparse.c | 6 | ||||
| -rw-r--r-- | ext/xml/expat/xmltok/xmltok.c | 2 | ||||
| -rw-r--r-- | ext/xml/expat/xmltok/xmltok_impl.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ext/xml/expat/xmlparse/xmlparse.c b/ext/xml/expat/xmlparse/xmlparse.c index 5bba88709a..aba28061d2 100644 --- a/ext/xml/expat/xmlparse/xmlparse.c +++ b/ext/xml/expat/xmlparse/xmlparse.c @@ -190,7 +190,9 @@ static Processor prologInitProcessor; static Processor contentProcessor; static Processor cdataSectionProcessor; static Processor epilogProcessor; +#if 0 static Processor errorProcessor; +#endif static Processor externalEntityInitProcessor; static Processor externalEntityInitProcessor2; static Processor externalEntityInitProcessor3; @@ -2333,6 +2335,7 @@ enum XML_Error epilogProcessor(XML_Parser parser, } } +#if 0 static enum XML_Error errorProcessor(XML_Parser parser, const char *s, @@ -2341,6 +2344,7 @@ enum XML_Error errorProcessor(XML_Parser parser, { return errorCode; } +#endif static enum XML_Error storeAttributeValue(XML_Parser parser, const ENCODING *enc, int isCdata, @@ -2483,7 +2487,9 @@ enum XML_Error storeEntityValue(XML_Parser parser, const char *entityTextPtr, const char *entityTextEnd) { +#if 0 const ENCODING *internalEnc = ns ? XmlGetInternalEncodingNS() : XmlGetInternalEncoding(); +#endif STRING_POOL *pool = &(dtd.pool); entityTextPtr += encoding->minBytesPerChar; entityTextEnd -= encoding->minBytesPerChar; diff --git a/ext/xml/expat/xmltok/xmltok.c b/ext/xml/expat/xmltok/xmltok.c index 8d058d41e5..d106b1b3a9 100644 --- a/ext/xml/expat/xmltok/xmltok.c +++ b/ext/xml/expat/xmltok/xmltok.c @@ -1491,7 +1491,7 @@ int initScan(const ENCODING **encodingTable, break; } } - *encPtr = encodingTable[INIT_ENC_INDEX(enc)]; + *encPtr = encodingTable[(int)INIT_ENC_INDEX(enc)]; return XmlTok(*encPtr, state, ptr, end, nextTokPtr); } diff --git a/ext/xml/expat/xmltok/xmltok_impl.c b/ext/xml/expat/xmltok/xmltok_impl.c index f343b3fa0f..c52539be8a 100644 --- a/ext/xml/expat/xmltok/xmltok_impl.c +++ b/ext/xml/expat/xmltok/xmltok_impl.c @@ -1391,7 +1391,7 @@ int PREFIX(getAtts)(const ENCODING *enc, const char *ptr, { enum { other, inName, inValue } state = inName; int nAtts = 0; - int open; + int open = 0; for (ptr += MINBPC(enc);; ptr += MINBPC(enc)) { switch (BYTE_TYPE(enc, ptr)) { |