From b477756bf13569ab153ca94a09046d141786cdf0 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Wed, 26 Dec 2012 21:47:52 -0800 Subject: [PATCH] Bug 824891 - Change |result| from XML_Error to XML_Status to quell some -Wenum-conversion warnings. r=jst,peterv. --HG-- extra : rebase_source : e367d5eb46d7e101298b1517439ca6f1f723e0f3 --- parser/expat/lib/xmlparse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c index 7542007067be..0f03c42ac211 100644 --- a/parser/expat/lib/xmlparse.c +++ b/parser/expat/lib/xmlparse.c @@ -1512,7 +1512,9 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) else if (bufferPtr == bufferEnd) { const char *end; int nLeftOver; - enum XML_Error result; +/* BEGIN MOZILLA CHANGE (|result| has type XML_Status, not XML_Error) */ + enum XML_Status result; +/* END MOZILLA CHANGE */ parseEndByteIndex += len; positionPtr = s; ps_finalBuffer = (XML_Bool)isFinal;