Add GetCurrentByteCount()

diff --git a/expat/xmlparse/xmlparse.c b/expat/xmlparse/xmlparse.c
index c441ba1034214d20852ce8c0553b71dea3a9be03..35ce2fb3cc1c00641ffac4d1802d69320be182a4 100755 (executable)
--- a/expat/xmlparse/xmlparse.c
+++ b/expat/xmlparse/xmlparse.c
@@ -864,6 +864,13 @@ long XML_GetCurrentByteIndex(XML_Parser parser)
   return -1;
 }
 
+int XML_GetCurrentByteCount(XML_Parser parser)
+{
+  if (eventEndPtr && eventPtr)
+    return eventEndPtr - eventPtr;
+  return 0;
+}
+
 int XML_GetCurrentLineNumber(XML_Parser parser)
 {
   if (eventPtr) {

diff --git a/expat/xmlparse/xmlparse.h b/expat/xmlparse/xmlparse.h
index c3af771a90e8fe03e73a0610baccc5a0a962addb..2c8f7d4394377c283f927597a361371ddcb6a054 100755 (executable)
--- a/expat/xmlparse/xmlparse.h
+++ b/expat/xmlparse/xmlparse.h
@@ -448,6 +448,11 @@ int XMLPARSEAPI XML_GetCurrentLineNumber(XML_Parser parser);
 int XMLPARSEAPI XML_GetCurrentColumnNumber(XML_Parser parser);
 long XMLPARSEAPI XML_GetCurrentByteIndex(XML_Parser parser);
 
+/* Return the number of bytes in the current event.
+Returns 0 if the event is in an internal entity. */
+
+int XMLPARSEAPI XML_GetCurrentByteCount(XML_Parser parser);
+
 /* For backwards compatibility with previous versions. */
 #define XML_GetErrorLineNumber XML_GetCurrentLineNumber
 #define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber

diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c
index 86eda0fa05520a28132a23ee3c9441361407b148..5580afa98a26f03c8f56839754cb90d65080c748 100755 (executable)
--- a/expat/xmlwf/xmlwf.c
+++ b/expat/xmlwf/xmlwf.c
@@ -235,8 +235,9 @@ void metaLocation(XML_Parser parser)
   if (uri)
     ftprintf(XML_GetUserData(parser), T(" uri=\"%s\""), uri);
   ftprintf(XML_GetUserData(parser),
-           T(" byte=\"%ld\" line=\"%d\" col=\"%d\""),
+           T(" byte=\"%ld\" nbytes=\"%d\" line=\"%d\" col=\"%d\""),
           XML_GetCurrentByteIndex(parser),
+          XML_GetCurrentByteCount(parser),
           XML_GetCurrentLineNumber(parser),
           XML_GetCurrentColumnNumber(parser));
 }