From kwaclaw at users.sourceforge.net  Fri Apr  7 22:24:24 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 07 Apr 2006 13:24:24 -0700
Subject: [Expat-checkins] expat/lib xmlparse.c, 1.151, 1.152 expat.h, 1.78,
	1.79
Message-ID: <20060407202427.1D7381E4016@bag.python.org>

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

Modified Files:
	xmlparse.c expat.h 
Log Message:
Added XML_FEATURE_LARGE_SIZE to be able to detect if Expat was
compiled with XML_LARGE_SIZE - see XML_GetFeatureList().

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- xmlparse.c	23 Dec 2005 14:45:27 -0000	1.151
+++ xmlparse.c	7 Apr 2006 20:24:20 -0000	1.152
@@ -1948,6 +1948,9 @@
 #ifdef XML_NS
     {XML_FEATURE_NS,               XML_L("XML_NS"), 0},
 #endif
+#ifdef XML_LARGE_SIZE
+    {XML_FEATURE_LARGE_SIZE,       XML_L("XML_LARGE_SIZE"), 0},
+#endif    
     {XML_FEATURE_END,              NULL, 0}
   };
 

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- expat.h	26 Dec 2005 15:43:22 -0000	1.78
+++ expat.h	7 Apr 2006 20:24:20 -0000	1.79
@@ -983,7 +983,8 @@
   XML_FEATURE_MIN_SIZE,
   XML_FEATURE_SIZEOF_XML_CHAR,
   XML_FEATURE_SIZEOF_XML_LCHAR,
-  XML_FEATURE_NS
+  XML_FEATURE_NS,
+  XML_FEATURE_LARGE_SIZE
   /* Additional features must be added to the end of this enum. */
 };
 


From kwaclaw at users.sourceforge.net  Fri Apr  7 22:25:46 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 07 Apr 2006 13:25:46 -0700
Subject: [Expat-checkins] expat/tests/benchmark benchmark.c,1.3,1.4
Message-ID: <20060407202549.65A491E400A@bag.python.org>

Update of /cvsroot/expat/expat/tests/benchmark
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6233

Modified Files:
	benchmark.c 
Log Message:
Modified code to use XML_ParserReset() instead of creating a new
parser instance on each iteration of the main loop.

Index: benchmark.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/benchmark/benchmark.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- benchmark.c	1 Jan 2006 21:17:41 -0000	1.3
+++ benchmark.c	7 Apr 2006 20:25:43 -0000	1.4
@@ -72,15 +72,16 @@
   fileSize = fread (XMLBuf, sizeof (char), fileAttr.st_size, fd);
   fclose (fd);
   
+  if (ns)
+    parser = XML_ParserCreateNS(NULL, '!');
+  else
+    parser = XML_ParserCreate(NULL);
+
   i = 0;
   XMLBufEnd = XMLBuf + fileSize;
   while (i < nrOfLoops) {
     XMLBufPtr = XMLBuf;
     isFinal = 0;
-    if (ns)
-      parser = XML_ParserCreateNS(NULL, '!');
-    else
-      parser = XML_ParserCreate(NULL);
     tstart = clock();
     do {
       int parseBufferSize = XMLBufEnd - XMLBufPtr;
@@ -102,10 +103,11 @@
     } while (!isFinal);
     tend = clock();
     cpuTime += ((double) (tend - tstart)) / CLOCKS_PER_SEC;
-    XML_ParserFree (parser);
+    XML_ParserReset(parser, NULL);
     i++;
   }
 
+  XML_ParserFree (parser);
   free (XMLBuf);
       
   printf ("%d loops, with buffer size %d. Average time per loop: %f\n", 


From kwaclaw at users.sourceforge.net  Fri Apr  7 22:28:21 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 07 Apr 2006 13:28:21 -0700
Subject: [Expat-checkins] expat/doc reference.html,1.69,1.70
Message-ID: <20060407202822.EF7541E400A@bag.python.org>

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

Modified Files:
	reference.html 
Log Message:
Added XML_FEATURE_NS and XML_FEATURE_LARGE_SIZE values,
as they had not been documented yet.

Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- reference.html	26 Dec 2005 18:08:19 -0000	1.69
+++ reference.html	7 Apr 2006 20:28:19 -0000	1.70
@@ -384,7 +384,7 @@
 usually be done with the <code>-lexpat</code> argument.  Otherwise,
 you'll need to tell the compiler where to look for the Expat header
 and the linker where to find the Expat library.  You may also need to
-take steps to tell the operating system where to find this libary at
+take steps to tell the operating system where to find this library at
 run time.</p>
 
 <p>On a Unix-based system, here's what a Makefile might look like when
@@ -2219,7 +2219,9 @@
   XML_FEATURE_CONTEXT_BYTES,
   XML_FEATURE_MIN_SIZE,
   XML_FEATURE_SIZEOF_XML_CHAR,
-  XML_FEATURE_SIZEOF_XML_LCHAR
+  XML_FEATURE_SIZEOF_XML_LCHAR,
+  XML_FEATURE_NS,
+  XML_FEATURE_LARGE_SIZE
 };
 
 typedef struct {


From kwaclaw at users.sourceforge.net  Fri Apr  7 22:29:30 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 07 Apr 2006 13:29:30 -0700
Subject: [Expat-checkins] expat/conftools PrintPath,1.1,1.2
Message-ID: <20060407202934.58B261E400A@bag.python.org>

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

Modified Files:
	PrintPath 
Log Message:
Some typos corrected.

Index: PrintPath
===================================================================
RCS file: /cvsroot/expat/expat/conftools/PrintPath,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PrintPath	10 Mar 2001 15:41:50 -0000	1.1
+++ PrintPath	7 Apr 2006 20:29:26 -0000	1.2
@@ -45,11 +45,11 @@
 #
 # First of all, all OS/2 programs have the '.exe' extension.
 # Next, we adjust PATH (or what was given to us as PATH) to
-# be whitespace seperated directories.
+# be whitespace separated directories.
 # Finally, we try to determine the best flag to use for
 # test/[] to look for an executable file. OS/2 just has '-r'
 # but with other OSs, we do some funny stuff to check to see
-# if test/[] knows about -x, which is the prefered flag.
+# if test/[] knows about -x, which is the preferred flag.
 ##
 
 if [ "x$os" = "xOS/2" ]


From kwaclaw at users.sourceforge.net  Fri Apr  7 22:54:59 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 07 Apr 2006 13:54:59 -0700
Subject: [Expat-checkins] expat/lib libexpatw.def, 1.6, 1.7 libexpat.def, 1.6,
	1.7
Message-ID: <20060407205501.CC2531E400A@bag.python.org>

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

Modified Files:
	libexpatw.def libexpat.def 
Log Message:
Removed DESCRIPTION statement - only valid when compiling 16bit
virtual device drivers (VxD).

Index: libexpatw.def
===================================================================
RCS file: /cvsroot/expat/expat/lib/libexpatw.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- libexpatw.def	7 Jan 2004 17:10:52 -0000	1.6
+++ libexpatw.def	7 Apr 2006 20:54:55 -0000	1.7
@@ -1,6 +1,5 @@
 ; DEF file for MS VC++
 LIBRARY   LIBEXPATW
-DESCRIPTION "Implements an XML parser."
 EXPORTS
   XML_DefaultCurrent @1
   XML_ErrorString @2

Index: libexpat.def
===================================================================
RCS file: /cvsroot/expat/expat/lib/libexpat.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- libexpat.def	7 Jan 2004 17:10:52 -0000	1.6
+++ libexpat.def	7 Apr 2006 20:54:55 -0000	1.7
@@ -1,6 +1,5 @@
 ; DEF file for MS VC++
 LIBRARY   LIBEXPAT
-DESCRIPTION "Implements an XML parser."
 EXPORTS
   XML_DefaultCurrent @1
   XML_ErrorString @2


From kwaclaw at users.sourceforge.net  Sat Apr  8 04:52:08 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 07 Apr 2006 19:52:08 -0700
Subject: [Expat-checkins] expat README,1.31,1.32
Message-ID: <20060408025212.496ED1E4002@bag.python.org>

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

Modified Files:
	README 
Log Message:
Added note that XML_LARGE_SIZE implies a breaking change to the ABI.

Index: README
===================================================================
RCS file: /cvsroot/expat/expat/README,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- README	1 Jan 2006 18:49:25 -0000	1.31
+++ README	8 Apr 2006 02:52:06 -0000	1.32
@@ -53,6 +53,10 @@
 line and column numbers and the over-all byte index:
 
         ./configure CPPFLAGS=-DXML_LARGE_SIZE
+        
+However, such a modification would be a breaking change to the ABI
+and is therefore not recommended for general use - e.g. as part of
+a Linux distribution - but rather for builds with special requirements.
 
 After running the configure script, the "make" command will build
 things and "make install" will install things into their proper


From kwaclaw at users.sourceforge.net  Fri Apr 14 19:19:17 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 14 Apr 2006 10:19:17 -0700
Subject: [Expat-checkins] expat/lib xmlparse.c,1.152,1.153
Message-ID: <20060414171921.C8A221E4005@bag.python.org>

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

Modified Files:
	xmlparse.c 
Log Message:
One should not cast a pointer to unsigned long, as it may not work on non-32bit systems.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- xmlparse.c	7 Apr 2006 20:24:20 -0000	1.152
+++ xmlparse.c	14 Apr 2006 17:19:09 -0000	1.153
@@ -26,7 +26,7 @@
 #define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
 #define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
 #define XmlEncode XmlUtf16Encode
-#define MUST_CONVERT(enc, s) (!(enc)->isUtf16 || (((unsigned long)s) & 1))
+#define MUST_CONVERT(enc, s) (!(enc)->isUtf16 || ((s - NULL) & 1))
 typedef unsigned short ICHAR;
 #else
 #define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX


From kwaclaw at users.sourceforge.net  Fri Apr 14 19:53:06 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 14 Apr 2006 10:53:06 -0700
Subject: [Expat-checkins] expat/xmlwf xmlwf.c,1.70,1.71
Message-ID: <20060414175311.90EAF1E4005@bag.python.org>

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

Modified Files:
	xmlwf.c 
Log Message:
Casting away some integer conversion warnings that should not pose a problem.

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- xmlwf.c	25 Dec 2005 17:06:22 -0000	1.70
+++ xmlwf.c	14 Apr 2006 17:53:03 -0000	1.71
@@ -129,7 +129,7 @@
   p = atts;
   while (*p)
     ++p;
-  nAtts = (p - atts) >> 1;
+  nAtts = (int)((p - atts) >> 1);
   if (nAtts > 1)
     qsort((void *)atts, nAtts, sizeof(XML_Char *) * 2, attcmp);
   while (*atts) {
@@ -189,7 +189,7 @@
   p = atts;
   while (*p)
     ++p;
-  nAtts = (p - atts) >> 1;
+  nAtts = (int)((p - atts) >> 1);
   if (nAtts > 1)
     qsort((void *)atts, nAtts, sizeof(XML_Char *) * 2, nsattcmp);
   while (*atts) {
@@ -350,7 +350,7 @@
     fputts(T(">\n"), fp);
     do {
       ftprintf(fp, T("<attribute name=\"%s\" value=\""), atts[0]);
-      characterData(fp, atts[1], tcslen(atts[1]));
+      characterData(fp, atts[1], (int)tcslen(atts[1]));
       if (atts >= specifiedAttsEnd)
         fputts(T("\" defaulted=\"yes\"/>\n"), fp);
       else if (atts == idAttPtr)
@@ -381,7 +381,7 @@
   XML_Parser parser = (XML_Parser) userData;
   FILE *fp = (FILE *)XML_GetUserData(parser);
   ftprintf(fp, T("<pi target=\"%s\" data=\""), target);
-  characterData(fp, data, tcslen(data));
+  characterData(fp, data, (int)tcslen(data));
   puttc(T('"'), fp);
   metaLocation(parser);
   fputts(T("/>\n"), fp);
@@ -393,7 +393,7 @@
   XML_Parser parser = (XML_Parser) userData;
   FILE *fp = (FILE *)XML_GetUserData(parser);
   fputts(T("<comment data=\""), fp);
-  characterData(fp, data, tcslen(data));
+  characterData(fp, data, (int)tcslen(data));
   puttc(T('"'), fp);
   metaLocation(parser);
   fputts(T("/>\n"), fp);
@@ -469,7 +469,7 @@
     ftprintf(fp, T(" public=\"%s\""), publicId);
   if (systemId) {
     fputts(T(" system=\""), fp);
-    characterData(fp, systemId, tcslen(systemId));
+    characterData(fp, systemId, (int)tcslen(systemId));
     puttc(T('"'), fp);
   }
   metaLocation(parser);
@@ -503,7 +503,7 @@
     if (publicId)
       ftprintf(fp, T(" public=\"%s\""), publicId);
     fputts(T(" system=\""), fp);
-    characterData(fp, systemId, tcslen(systemId));
+    characterData(fp, systemId, (int)tcslen(systemId));
     puttc(T('"'), fp);
     ftprintf(fp, T(" notation=\"%s\""), notationName);
     metaLocation(parser);
@@ -514,7 +514,7 @@
     if (publicId)
       ftprintf(fp, T(" public=\"%s\""), publicId);
     fputts(T(" system=\""), fp);
-    characterData(fp, systemId, tcslen(systemId));
+    characterData(fp, systemId, (int)tcslen(systemId));
     puttc(T('"'), fp);
     metaLocation(parser);
     fputts(T("/>\n"), fp);
@@ -533,7 +533,7 @@
     ftprintf(fp, T(" prefix=\"%s\""), prefix);
   if (uri) {
     fputts(T(" ns=\""), fp);
-    characterData(fp, uri, tcslen(uri));
+    characterData(fp, uri, (int)tcslen(uri));
     fputts(T("\"/>\n"), fp);
   }
   else
@@ -576,7 +576,7 @@
     if (!s)
       return 0;
     cp *= 10;
-    cp += s - digits;
+    cp += (int)(s - digits);
     if (cp >= 0x10000)
       return 0;
   }


From kwaclaw at users.sourceforge.net  Fri Apr 14 20:02:11 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 14 Apr 2006 11:02:11 -0700
Subject: [Expat-checkins] expat/xmlwf xmlfile.c,1.16,1.17
Message-ID: <20060414180214.545F11E4013@bag.python.org>

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

Modified Files:
	xmlfile.c 
Log Message:
Added a comment about processFile giving problems on files larger than INT_MAX.

Index: xmlfile.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- xmlfile.c	25 Dec 2005 17:05:10 -0000	1.16
+++ xmlfile.c	14 Apr 2006 18:02:08 -0000	1.17
@@ -69,14 +69,15 @@
   else
     ftprintf(stderr, T("%s: (unknown message %d)\n"), filename, code);
 }
-
+ 
+/* This implementation will give problems on files larger than INT_MAX. */
 static void
 processFile(const void *data, size_t size,
             const XML_Char *filename, void *args)
 {
   XML_Parser parser = ((PROCESS_ARGS *)args)->parser;
   int *retPtr = ((PROCESS_ARGS *)args)->retPtr;
-  if (XML_Parse(parser, (const char *)data, size, 1) == XML_STATUS_ERROR) {
+  if (XML_Parse(parser, (const char *)data, (int)size, 1) == XML_STATUS_ERROR) {
     reportError(parser, filename);
     *retPtr = 0;
   }


From kwaclaw at users.sourceforge.net  Fri Apr 14 20:03:40 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 14 Apr 2006 11:03:40 -0700
Subject: [Expat-checkins] expat/examples elements.c,1.7,1.8
Message-ID: <20060414180342.7483D1E4005@bag.python.org>

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

Modified Files:
	elements.c 
Log Message:
Casting away some integer conversion warnings that should not pose a problem.

Index: elements.c
===================================================================
RCS file: /cvsroot/expat/expat/examples/elements.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- elements.c	28 Dec 2005 18:43:36 -0000	1.7
+++ elements.c	14 Apr 2006 18:03:36 -0000	1.8
@@ -52,7 +52,7 @@
   XML_SetUserData(parser, &depth);
   XML_SetElementHandler(parser, startElement, endElement);
   do {
-    size_t len = fread(buf, 1, sizeof(buf), stdin);
+    int len = (int)fread(buf, 1, sizeof(buf), stdin);
     done = len < sizeof(buf);
     if (XML_Parse(parser, buf, len, done) == XML_STATUS_ERROR) {
       fprintf(stderr,


From kwaclaw at users.sourceforge.net  Fri Apr 14 20:04:07 2006
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 14 Apr 2006 11:04:07 -0700
Subject: [Expat-checkins] expat/examples outline.c,1.7,1.8
Message-ID: <20060414180409.D01BC1E4005@bag.python.org>

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

Modified Files:
	outline.c 
Log Message:
Casting away some integer conversion warnings that should not pose a problem.

Index: outline.c
===================================================================
RCS file: /cvsroot/expat/expat/examples/outline.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- outline.c	28 Dec 2005 18:43:36 -0000	1.7
+++ outline.c	14 Apr 2006 18:03:57 -0000	1.8
@@ -86,7 +86,7 @@
     int done;
     int len;
 
-    len = fread(Buff, 1, BUFFSIZE, stdin);
+    len = (int)fread(Buff, 1, BUFFSIZE, stdin);
     if (ferror(stdin)) {
       fprintf(stderr, "Read error\n");
       exit(-1);