[Expat-checkins] expat/lib xmlparse.c,1.131,1.132

Karl Waclawek kwaclaw at users.sourceforge.net
Thu Apr 29 13:53:36 EDT 2004


Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13730

Modified Files:
	xmlparse.c 
Log Message:
Fixed compile errors when XML_DTD and XML_CONTEXT_BYTES
were undefined.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- xmlparse.c	13 Apr 2004 13:17:59 -0000	1.131
+++ xmlparse.c	29 Apr 2004 17:53:34 -0000	1.132
@@ -1466,10 +1466,10 @@
   else if (bufferPtr == bufferEnd) {
     const char *end;
     int nLeftOver;
+    enum XML_Error result;
     parseEndByteIndex += len;
     positionPtr = s;
     finalBuffer = (XML_Bool)isFinal;
-    enum XML_Error result;
 
     errorCode = processor(parser, s, parseEndPtr = s + len, &end);
 
@@ -1483,7 +1483,8 @@
       case XML_SUSPENDED:
         result = XML_STATUS_SUSPENDED;
         break;
-      case XML_INITIALIZED, XML_PARSING:
+      case XML_INITIALIZED:
+      case XML_PARSING:
         result = XML_STATUS_OK;
         if (isFinal) {
           parsing = XML_FINISHED;
@@ -1679,10 +1680,12 @@
     return XML_STATUS_ERROR;
   default:
     if (resumable) {
+#ifdef XML_DTD
       if (isParamEntity) {
         errorCode = XML_ERROR_SUSPEND_PE;
         return XML_STATUS_ERROR;
       }
+#endif
       parsing = XML_SUSPENDED;
     }
     else




More information about the Expat-checkins mailing list