@@ -1542,8 +1546,9 @@
 



From fdrake at users.sourceforge.net  Mon Dec 30 12:02:31 2002
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Mon Dec 30 15:02:35 2002
Subject: [Expat-checkins] expat/lib xmlparse.c,1.98,1.99
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv5472

Modified Files:
	xmlparse.c 
Log Message:
When returning a status value through the public API, use
XML_STATUS_OK / XML_STATUS_ERROR.  Internal status returns are not
affected.


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99

--- xmlparse.c	16 Dec 2002 04:02:02 -0000	1.98
+++ xmlparse.c	30 Dec 2002 20:02:28 -0000	1.99
@@ -873,17 +873,20 @@
 int
 XML_SetEncoding(XML_Parser parser, const XML_Char *encodingName)
 {
-  /* block after XML_Parse()/XML_ParseBuffer() has been called */
+  /* Block after XML_Parse()/XML_ParseBuffer() has been called.
+     XXX There's no way for the caller to determine which of the
+     XXX possible error cases caused the XML_STATUS_ERROR return.
+  */
   if (parsing)
-    return 0;
+    return XML_STATUS_ERROR;
   if (encodingName == NULL)
     protocolEncodingName = NULL;
   else {
     protocolEncodingName = poolCopyString(&tempPool, encodingName);
     if (!protocolEncodingName)
-      return 0;
+      return XML_STATUS_ERROR;
   }
-  return 1;
+  return XML_STATUS_OK;
 }
 
 XML_Parser
@@ -1116,12 +1119,12 @@
   if (p) {
     p = poolCopyString(&_dtd->pool, p);
     if (!p)
-      return 0;
+      return XML_STATUS_ERROR;
     curBase = p;
   }
   else
     curBase = NULL;
-  return 1;
+  return XML_STATUS_OK;
 }
 
 const XML_Char *



From fdrake at users.sourceforge.net  Mon Dec 30 12:10:35 2002
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Mon Dec 30 15:10:43 2002
Subject: [Expat-checkins] expat/lib expat.h,1.47,1.48 xmlparse.c,1.99,1.100
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv8492/lib

Modified Files:
	expat.h xmlparse.c 
Log Message:
Change the API to return XML_Status values where possible.
Existing client code is 100% compatible.


Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- expat.h	16 Dec 2002 04:02:00 -0000	1.47
+++ expat.h	30 Dec 2002 20:10:32 -0000	1.48
@@ -651,9 +651,9 @@
    XML_ParserCreate. On success XML_SetEncoding returns non-zero,
    zero otherwise.
    Note: Calling XML_SetEncoding after XML_Parse or XML_ParseBuffer
-     has no effect and returns zero.
+     has no effect and returns XML_STATUS_ERROR.
 */
-XMLPARSEAPI(int)
+XMLPARSEAPI(enum XML_Status)
 XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
 
 /* If this function is called, then the parser will be passed as the
@@ -687,10 +687,10 @@
    left to the application: this value will be passed through as the
    base argument to the XML_ExternalEntityRefHandler,
    XML_NotationDeclHandler and XML_UnparsedEntityDeclHandler. The base
-   argument will be copied.  Returns zero if out of memory, non-zero
-   otherwise.
+   argument will be copied.  Returns XML_STATUS_ERROR if out of memory,
+   XML_STATUS_OK otherwise.
 */
-XMLPARSEAPI(int)
+XMLPARSEAPI(enum XML_Status)
 XML_SetBase(XML_Parser parser, const XML_Char *base);
 
 XMLPARSEAPI(const XML_Char *)

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- xmlparse.c	30 Dec 2002 20:02:28 -0000	1.99
+++ xmlparse.c	30 Dec 2002 20:10:32 -0000	1.100
@@ -870,7 +870,7 @@
   return setContext(parser, implicitContext);
 }
 
-int
+enum XML_Status
 XML_SetEncoding(XML_Parser parser, const XML_Char *encodingName)
 {
   /* Block after XML_Parse()/XML_ParseBuffer() has been called.
@@ -1113,7 +1113,7 @@
     userData = p;
 }
 
-int
+enum XML_Status
 XML_SetBase(XML_Parser parser, const XML_Char *p)
 {
   if (p) {



From fdrake at users.sourceforge.net  Mon Dec 30 12:12:55 2002
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Mon Dec 30 15:12:58 2002
Subject: [Expat-checkins] expat/doc reference.html,1.37,1.38
Message-ID: 

Update of /cvsroot/expat/expat/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv9131/doc

Modified Files:
	reference.html 
Log Message:
Change the API to return XML_Status values where possible.
Existing client code is 100% compatible.


Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- reference.html	30 Dec 2002 19:50:06 -0000	1.37
+++ reference.html	30 Dec 2002 20:12:52 -0000	1.38
@@ -1540,7 +1540,7 @@
 
 
 -int
+enum XML_Status
 XML_SetBase(XML_Parser p,
             const XML_Char *base);
 
@@ -1588,7 +1588,7 @@
 
 
 -int
+enum XML_Status
 XML_SetEncoding(XML_Parser p,
                 const XML_Char *encoding);
 
@@ -1598,6 +1598,8 @@
 It must not be called after XML_Parse or XML_ParseBuffer have been called on the given parser.
+Returns XML_STATUS_OK on success or
+XML_STATUS_ERROR on error.
 
 
 


From fdrake at users.sourceforge.net  Tue Dec 31 09:53:24 2002
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Tue Dec 31 12:53:33 2002
Subject: [Expat-checkins] expat/lib expat.h,1.48,1.49
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv19318

Modified Files:
	expat.h 
Log Message:
Update comments to refer to XML_STATUS_OK, XML_STATUS_ERROR, and NULL
as appropriate.


Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- expat.h	30 Dec 2002 20:10:32 -0000	1.48
+++ expat.h	31 Dec 2002 17:53:21 -0000	1.49
@@ -366,8 +366,8 @@
 
 /* This is called if the document is not standalone, that is, it has an
    external subset or a reference to a parameter entity, but does not
-   have standalone="yes". If this handler returns 0, then processing
-   will not continue, and the parser will return a
+   have standalone="yes". If this handler returns XML_STATUS_ERROR,
+   then processing will not continue, and the parser will return a
    XML_ERROR_NOT_STANDALONE error.
    If parameter entity parsing is enabled, then in addition to the
    conditions above this handler will only be called if the referenced
@@ -401,9 +401,9 @@
    referenced entity is to be parsed later, it must be copied.
    context is NULL only when the entity is a parameter entity.
 
-   The handler should return 0 if processing should not continue
-   because of a fatal error in the handling of the external entity.
-   In this case the calling parser will return an
+   The handler should return XML_STATUS_ERROR if processing should not
+   continue because of a fatal error in the handling of the external
+   entity.  In this case the calling parser will return an
    XML_ERROR_EXTERNAL_ENTITY_HANDLING error.
 
    Note that unlike other handlers the first argument is the parser,
@@ -497,8 +497,8 @@
    the encoding declaration.
 
    If the callback can provide information about the encoding, it must
-   fill in the XML_Encoding structure, and return 1.  Otherwise it
-   must return 0.
+   fill in the XML_Encoding structure, and return XML_STATUS_OK.
+   Otherwise it must return XML_STATUS_ERROR.
 
    If info does not describe a suitable encoding, then the parser will
    return an XML_UNKNOWN_ENCODING error.
@@ -761,7 +761,7 @@
    an ExternalEntityRefHandler so longer as the parser has not yet
    been freed.  The new parser is completely independent and may
    safely be used in a separate thread.  The handlers and userData are
-   initialized from the parser argument.  Returns 0 if out of memory.
+   initialized from the parser argument.  Returns NULL if out of memory.
    Otherwise returns a new XML_Parser object.
 */
 XMLPARSEAPI(XML_Parser)
@@ -802,7 +802,7 @@
 XML_SetParamEntityParsing(XML_Parser parser,
                           enum XML_ParamEntityParsing parsing);
 
-/* If XML_Parse or XML_ParseBuffer have returned 0, then
+/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then
    XML_GetErrorCode returns information about the error.
 */
 XMLPARSEAPI(enum XML_Error)





Parse position and error reporting functions