From kwaclaw at users.sourceforge.net  Mon Jan 10 15:17:05 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon Jan 10 15:17:08 2005
Subject: [Expat-checkins] htdocs index.html,1.55,1.56
Message-ID: <E1Co0Lx-0007s5-JN@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	index.html 
Log Message:
New link for OCaml Expat.

Index: index.html
===================================================================
RCS file: /cvsroot/expat/htdocs/index.html,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- index.html	14 Dec 2004 17:24:15 -0000	1.55
+++ index.html	10 Jan 2005 14:17:02 -0000	1.56
@@ -254,7 +254,7 @@
   <a href="http://expatobjc.sourceforge.net/"
      >Objective-C interface to Expat</a></li>
   <li>
-  <a href="http://home.wanadoo.nl/maas/ocaml/">OCaml Expat</a> is a
+  <a href="http://www.xs4all.nl/~mmzeeman/ocaml/">OCaml Expat</a> is a
   wrapper around Expat for the <a href="http://www.ocaml.org"
   >Objective Caml</a> language.</li>
   <li>

From fdrake at users.sourceforge.net  Thu Jan 27 07:27:59 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Thu Jan 27 07:28:02 2005
Subject: [Expat-checkins] expat/tests runtests.c,1.58,1.59
Message-ID: <E1Cu38J-0003f3-Rj@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	runtests.c 
Log Message:
remove use of the check library; always use our own testing package
(this reduces variables and simplifies the build process)


Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- runtests.c	15 Jul 2004 23:29:25 -0000	1.58
+++ runtests.c	27 Jan 2005 06:27:57 -0000	1.59
@@ -8,12 +8,6 @@
 #include <expat_config.h>
 #endif
 
-#ifdef HAVE_CHECK_H
-#include <check.h>
-#else
-#include "minicheck.h"
-#endif
-
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -21,6 +15,7 @@
 
 #include "expat.h"
 #include "chardata.h"
+#include "minicheck.h"
 
 
 static XML_Parser parser;

From fdrake at users.sourceforge.net  Thu Jan 27 07:27:59 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Thu Jan 27 07:28:03 2005
Subject: [Expat-checkins] expat Changes, 1.41, 1.42 Makefile.in, 1.48,
	1.49 README, 1.27, 1.28 configure.in, 1.38, 1.39
Message-ID: <E1Cu38J-0003ev-OM@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Changes Makefile.in README configure.in 
Log Message:
remove use of the check library; always use our own testing package
(this reduces variables and simplifies the build process)


Index: Changes
===================================================================
RCS file: /cvsroot/expat/expat/Changes,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Changes	23 Jul 2004 04:48:36 -0000	1.41
+++ Changes	27 Jan 2005 06:27:57 -0000	1.42
@@ -1,3 +1,7 @@
+Release 1.95.9 TBD
+        - We no longer use the "check" library for C unit testing; we
+          always use the (partial) internal implementation of the API.
+
 Release 1.95.8 Fri Jul 23 2004
         - Major new feature: suspend/resume.  Handlers can now request
           that a parse be suspended for later resumption or aborted

Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Makefile.in	17 Dec 2004 18:08:08 -0000	1.48
+++ Makefile.in	27 Jan 2005 06:27:57 -0000	1.49
@@ -151,8 +151,8 @@
 tests/chardata.o: tests/chardata.c tests/chardata.h
 tests/minicheck.o: tests/minicheck.c tests/minicheck.h
 tests/runtests.o: tests/runtests.c tests/chardata.h
-tests/runtests: tests/runtests.o tests/chardata.o @MINICHECK_OBJECT@ $(LIBRARY)
-	$(LINK_EXE) $^ @CHECK_LIBRARY@
+tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+	$(LINK_EXE) $^
 
 tests/xmlts.zip:
 	wget --output-document=tests/xmlts.zip \

Index: README
===================================================================
RCS file: /cvsroot/expat/expat/README,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- README	16 Jul 2004 02:10:56 -0000	1.27
+++ README	27 Jan 2005 06:27:57 -0000	1.28
@@ -92,13 +92,6 @@
 
         PATH=/usr/ccs/bin:$PATH make
 
-The unit and regression tests for Expat can use the "check" library on
-Unix; more information is available at http://check.sourceforge.net/,
-and downloadable packages are available from the library's project
-page on SourceForge: http://sourceforge.net/projects/check/.  If the
-check library is not available, a greatly abbreviated implementation
-of the check API is used.
-
 When using Expat with a project using autoconf for configuration, you
 can use the probing macro in conftools/expat.m4 to determine how to
 include Expat.  See the comments at the top of that file for more

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- configure.in	30 Apr 2004 03:18:09 -0000	1.38
+++ configure.in	27 Jan 2005 06:27:57 -0000	1.39
@@ -103,14 +103,6 @@
 fi
 AC_SUBST(FILEMAP)
 
-dnl Only needed for regression tests:
-AC_SUBST(MINICHECK_OBJECT)
-AC_SUBST(CHECK_LIBRARY)
-AC_CHECK_HEADERS(check.h)
-AC_CHECK_HEADER(check.h,
-                CHECK_LIBRARY=-lcheck,
-                MINICHECK_OBJECT=tests/minicheck.o)
-
 dnl Some basic configuration:
 AC_DEFINE([XML_NS], 1,
           [Define to make XML Namespaces functionality available.])

From fdrake at users.sourceforge.net  Fri Jan 28 05:36:00 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Fri Jan 28 05:36:03 2005
Subject: [Expat-checkins] expat Makefile.in,1.49,1.50
Message-ID: <E1CuNrU-0007Im-3T@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Makefile.in 
Log Message:
make sure the -I options to the headers for the version being compiled
come before any additional -I options passed in via CPPFLAGS
(closes SF bug #693747)


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Makefile.in	27 Jan 2005 06:27:57 -0000	1.49
+++ Makefile.in	28 Jan 2005 04:35:57 -0000	1.50
@@ -111,7 +111,7 @@
 ### autoconf this?
 LTFLAGS = --silent
 
-COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
 LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@

From fdrake at users.sourceforge.net  Fri Jan 28 06:19:55 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Fri Jan 28 06:19:58 2005
Subject: [Expat-checkins] expat/tests runtestspp.cpp, NONE, 1.1 .cvsignore,
	1.4, 1.5
Message-ID: <E1CuOXz-00015X-NS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	.cvsignore 
Added Files:
	runtestspp.cpp 
Log Message:
test using Expat from C++
(closes SF bug #1006708)


--- NEW FILE: runtestspp.cpp ---
// C++ compilation harness for the test suite.
//
// This is used to ensure the Expat headers can be included from C++
// and have everything work as expected.
//
#include "runtests.c"

Index: .cvsignore
===================================================================
RCS file: /cvsroot/expat/expat/tests/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	3 Sep 2002 23:19:30 -0000	1.4
+++ .cvsignore	28 Jan 2005 05:19:52 -0000	1.5
@@ -1,5 +1,6 @@
 Makefile
 runtests
+runtestspp
 xmlts.zip
 XML-Test-Suite
 .libs

From fdrake at users.sourceforge.net  Fri Jan 28 06:19:57 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Fri Jan 28 06:19:59 2005
Subject: [Expat-checkins] expat Makefile.in,1.50,1.51
Message-ID: <E1CuOY1-00015U-1e@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Makefile.in 
Log Message:
test using Expat from C++
(closes SF bug #1006708)


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- Makefile.in	28 Jan 2005 04:35:57 -0000	1.50
+++ Makefile.in	28 Jan 2005 05:19:51 -0000	1.51
@@ -58,7 +58,8 @@
 	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
 	cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs
 	cd examples && rm -f elements outline *.o *.lo && rm -rf .libs _libs
-	cd tests && rm -rf .libs runtests runtests.o chardata.o
+	cd tests && rm -rf .libs runtests runtests.o runtestspp runtestspp.o
+	cd tests && rm -f chardata.o minicheck.o
 	rm -rf .libs libexpat.la
 	rm -f examples/core tests/core xmlwf/core
 
@@ -72,8 +73,9 @@
 	rm -f expat_config.h.in configure
 	rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4
 
-check: tests/runtests
+check: tests/runtests tests/runtestspp
 	tests/runtests
+	tests/runtestspp
 
 install: xmlwf/xmlwf installlib
 	$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL_ROOT)$(man1dir)
@@ -112,9 +114,11 @@
 LTFLAGS = --silent
 
 COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
+CXXCOMPILE = $(CXX) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
 LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@
 
 LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
 $(LIBRARY): $(LIB_OBJS)
@@ -153,6 +157,9 @@
 tests/runtests.o: tests/runtests.c tests/chardata.h
 tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
 	$(LINK_EXE) $^
+tests/runtestspp.o: tests/runtestspp.cpp tests/chardata.h
+tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+	$(LINK_CXX_EXE) $^
 
 tests/xmlts.zip:
 	wget --output-document=tests/xmlts.zip \

From fdrake at users.sourceforge.net  Fri Jan 28 06:41:59 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Fri Jan 28 06:42:03 2005
Subject: [Expat-checkins] expat/tests runtests.c,1.59,1.60
Message-ID: <E1CuOtL-00028G-JR@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	runtests.c 
Log Message:
make all C strings ASCII (7-bits) to avoid editors from trying to
re-encode the source text incorrectly; we really want the input data to
be exactly what it should be


Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- runtests.c	27 Jan 2005 06:27:57 -0000	1.59
+++ runtests.c	28 Jan 2005 05:41:56 -0000	1.60
@@ -247,7 +247,7 @@
 {
     char *text =
         "<?xml version='1.0' encoding='iso-8859-1'?>\n"
-        "<e>Jørgen æøåÆØÅ</e>";
+        "<e>J\xF8rgen \xE6\xF8\xE5\xC6\xD8\xC5</e>";
     run_character_check(text,
              "J\xC3\xB8rgen \xC3\xA6\xC3\xB8\xC3\xA5\xC3\x86\xC3\x98\xC3\x85");
 }
@@ -378,8 +378,8 @@
 {
     char *text =
         "<?xml version='1.0' encoding='iso-8859-1'?>\n"
-        "<e a='ä ö ü &#228; &#246; &#252; &#x00E4; &#x0F6; &#xFC; >'\n"
-        "  >ä ö ü &#228; &#246; &#252; &#x00E4; &#x0F6; &#xFC; ></e>";
+        "<e a='\xE4 \xF6 \xFC &#228; &#246; &#252; &#x00E4; &#x0F6; &#xFC; >'\n"
+        "  >\xE4 \xF6 \xFC &#228; &#246; &#252; &#x00E4; &#x0F6; &#xFC; ></e>";
     char *utf8 =
         "\xC3\xA4 \xC3\xB6 \xC3\xBC "
         "\xC3\xA4 \xC3\xB6 \xC3\xBC "

From fdrake at users.sourceforge.net  Fri Jan 28 06:46:48 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Fri Jan 28 06:46:50 2005
Subject: [Expat-checkins] expat Makefile.in,1.51,1.52
Message-ID: <E1CuOy0-0002LV-Jj@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Makefile.in 
Log Message:
fix dependency information for C++ tests


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile.in	28 Jan 2005 05:19:51 -0000	1.51
+++ Makefile.in	28 Jan 2005 05:46:46 -0000	1.52
@@ -157,7 +157,7 @@
 tests/runtests.o: tests/runtests.c tests/chardata.h
 tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
 	$(LINK_EXE) $^
-tests/runtestspp.o: tests/runtestspp.cpp tests/chardata.h
+tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h
 tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
 	$(LINK_CXX_EXE) $^
 

From fdrake at users.sourceforge.net  Fri Jan 28 07:32:33 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Fri Jan 28 07:32:36 2005
Subject: [Expat-checkins] expat configure.in,1.39,1.40
Message-ID: <E1CuPgH-0004OF-DM@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	configure.in 
Log Message:
implement verbose mode in minicheck to make it easier to determine which
tests failed


Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.in	27 Jan 2005 06:27:57 -0000	1.39
+++ configure.in	28 Jan 2005 06:32:30 -0000	1.40
@@ -103,6 +103,38 @@
 fi
 AC_SUBST(FILEMAP)
 
+dnl Needed for the test support code; this was found at
+dnl http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html
+
+# AC_CPP_FUNC
+# ------------------ #
+# Checks to see if ANSI C99 CPP variable __func__ works.
+# If not, perhaps __FUNCTION__ works instead. 
+# If not, we'll just define __func__ to "". 
+AC_DEFUN([AC_CPP_FUNC],
+[AC_REQUIRE([AC_PROG_CC_STDC])dnl
+AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+[[char *foo = __func__;]])],
+  [ac_cv_cpp_func=yes], 
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+[[char *foo = __FUNCTION__;]])],
+  [ac_cv_cpp_func=__FUNCTION__], 
+  [ac_cv_cpp_func=no])])])
+if test $ac_cv_cpp_func = __FUNCTION__; then
+  AC_DEFINE(__func__,__FUNCTION__,
+            [Define to __FUNCTION__ or "" if `__func__' does not conform to 
+ANSI C.])
+elif test $ac_cv_cpp_func = no; then
+  AC_DEFINE(__func__,"",
+            [Define to __FUNCTION__ or "" if `__func__' does not conform to 
+ANSI C.])
+fi
+])# AC_CPP_FUNC
+
+AC_CPP_FUNC
+
+
 dnl Some basic configuration:
 AC_DEFINE([XML_NS], 1,
           [Define to make XML Namespaces functionality available.])

From fdrake at users.sourceforge.net  Fri Jan 28 07:32:34 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Fri Jan 28 07:32:38 2005
Subject: [Expat-checkins] 
	expat/tests minicheck.c, 1.2, 1.3 minicheck.h, 1.3, 1.4
Message-ID: <E1CuPgI-0004OH-Qp@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	minicheck.c minicheck.h 
Log Message:
implement verbose mode in minicheck to make it easier to determine which
tests failed


Index: minicheck.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/minicheck.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- minicheck.c	15 Jul 2004 22:54:18 -0000	1.2
+++ minicheck.c	28 Jan 2005 06:32:30 -0000	1.3
@@ -90,6 +90,29 @@
 
 static jmp_buf env;
 
+static char const *_check_current_function = NULL;
+static int _check_current_lineno = -1;
+static char const *_check_current_filename = NULL;
+
+void
+_check_set_test_info(char const *function, char const *filename, int lineno)
+{
+    _check_current_function = function;
+    _check_current_lineno = lineno;
+    _check_current_filename = filename;
+}
+
+
+static void
+add_failure(SRunner *runner, int verbosity)
+{
+    runner->nfailures++;
+    if (verbosity >= CK_VERBOSE) {
+        printf("%s:%s:%d\n", _check_current_function,
+               _check_current_filename, _check_current_lineno);
+    }
+}
+
 void
 srunner_run_all(SRunner *runner, int verbosity)
 {
@@ -106,14 +129,14 @@
             if (tc->setup != NULL) {
                 /* setup */
                 if (setjmp(env)) {
-                    runner->nfailures++;
+                    add_failure(runner, verbosity);
                     continue;
                 }
                 tc->setup();
             }
             /* test */
             if (setjmp(env)) {
-                runner->nfailures++;
+                add_failure(runner, verbosity);
                 continue;
             }
             (tc->tests[i])();
@@ -121,7 +144,7 @@
             /* teardown */
             if (tc->teardown != NULL) {
                 if (setjmp(env)) {
-                    runner->nfailures++;
+                    add_failure(runner, verbosity);
                     continue;
                 }
                 tc->teardown();

Index: minicheck.h
===================================================================
RCS file: /cvsroot/expat/expat/tests/minicheck.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- minicheck.h	30 Sep 2004 04:58:09 -0000	1.3
+++ minicheck.h	28 Jan 2005 06:32:31 -0000	1.4
@@ -18,8 +18,10 @@
 #define CK_NORMAL  1
 #define CK_VERBOSE 2
 
-#define START_TEST(testname) static void testname(void) {
-#define END_TEST }
+#define START_TEST(testname) static void testname(void) { \
+    _check_set_test_info(__func__, __FILE__, __LINE__);   \
+    {
+#define END_TEST } }
 
 #define fail(msg)  _fail_unless(0, __FILE__, __LINE__, msg)
 
@@ -54,6 +56,11 @@
 };
 
 
+/* Internal helper. */
+void _check_set_test_info(char const *function,
+                          char const *filename, int lineno);
+
+
 /*
  * Prototypes for the actual implementation.
  */

From fdrake at users.sourceforge.net  Fri Jan 28 17:16:17 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Fri Jan 28 17:16:22 2005
Subject: [Expat-checkins] expat/tests minicheck.c,1.3,1.4
Message-ID: <E1CuYnB-00046F-U3@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	minicheck.c 
Log Message:
make errors reported display more like GCC error messages, so editors
like Emacs can provide functions like "go to next error", etc.


Index: minicheck.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/minicheck.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- minicheck.c	28 Jan 2005 06:32:30 -0000	1.3
+++ minicheck.c	28 Jan 2005 16:16:14 -0000	1.4
@@ -108,8 +108,8 @@
 {
     runner->nfailures++;
     if (verbosity >= CK_VERBOSE) {
-        printf("%s:%s:%d\n", _check_current_function,
-               _check_current_filename, _check_current_lineno);
+        printf("%s:%d: %s\n", _check_current_filename,
+               _check_current_lineno, _check_current_function);
     }
 }
 

From fdrake at users.sourceforge.net  Sat Jan 29 03:28:49 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sat Jan 29 03:28:52 2005
Subject: [Expat-checkins] expat/lib xmlparse.c,1.143,1.144
Message-ID: <E1CuiLx-00086q-Hi@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	xmlparse.c 
Log Message:
rename macros: "parsing" -> "ps_parsing", "finalBuffer" -> "ps_finalBuffer"
(closes SF bug #1021776: Recursion in macro "parsing", HP 11.0)


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- xmlparse.c	24 Dec 2004 18:25:32 -0000	1.143
+++ xmlparse.c	29 Jan 2005 02:28:33 -0000	1.144
@@ -640,8 +640,8 @@
 #define groupSize (parser->m_groupSize)
 #define namespaceSeparator (parser->m_namespaceSeparator)
 #define parentParser (parser->m_parentParser)
-#define parsing (parser->m_parsingStatus.parsing)
-#define finalBuffer (parser->m_parsingStatus.finalBuffer)
+#define ps_parsing (parser->m_parsingStatus.parsing)
+#define ps_finalBuffer (parser->m_parsingStatus.finalBuffer)
 #ifdef XML_DTD
 #define isParamEntity (parser->m_isParamEntity)
 #define useForeignDTD (parser->m_useForeignDTD)
@@ -852,7 +852,7 @@
   unknownEncodingRelease = NULL;
   unknownEncodingData = NULL;
   parentParser = NULL;
-  parsing = XML_INITIALIZED;
+  ps_parsing = XML_INITIALIZED;
 #ifdef XML_DTD
   isParamEntity = XML_FALSE;
   useForeignDTD = XML_FALSE;
@@ -915,7 +915,7 @@
      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 == XML_PARSING || parsing == XML_SUSPENDED)
+  if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED)
     return XML_STATUS_ERROR;
   if (encodingName == NULL)
     protocolEncodingName = NULL;
@@ -1143,7 +1143,7 @@
 {
 #ifdef XML_DTD
   /* block after XML_Parse()/XML_ParseBuffer() has been called */
-  if (parsing == XML_PARSING || parsing == XML_SUSPENDED)
+  if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED)
     return XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING;
   useForeignDTD = useDTD;
   return XML_ERROR_NONE;
@@ -1156,7 +1156,7 @@
 XML_SetReturnNSTriplet(XML_Parser parser, int do_nst)
 {
   /* block after XML_Parse()/XML_ParseBuffer() has been called */
-  if (parsing == XML_PARSING || parsing == XML_SUSPENDED)
+  if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED)
     return;
   ns_triplets = do_nst ? XML_TRUE : XML_FALSE;
 }
@@ -1408,7 +1408,7 @@
                           enum XML_ParamEntityParsing peParsing)
 {
   /* block after XML_Parse()/XML_ParseBuffer() has been called */
-  if (parsing == XML_PARSING || parsing == XML_SUSPENDED)
+  if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED)
     return 0;
 #ifdef XML_DTD
   paramEntityParsing = peParsing;
@@ -1421,7 +1421,7 @@
 enum XML_Status XMLCALL
 XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
 {
-  switch (parsing) {
+  switch (ps_parsing) {
   case XML_SUSPENDED:
     errorCode = XML_ERROR_SUSPENDED;
     return XML_STATUS_ERROR;
@@ -1429,11 +1429,11 @@
     errorCode = XML_ERROR_FINISHED;
     return XML_STATUS_ERROR;
   default:
-    parsing = XML_PARSING;
+    ps_parsing = XML_PARSING;
   }
 
   if (len == 0) {
-    finalBuffer = (XML_Bool)isFinal;
+    ps_finalBuffer = (XML_Bool)isFinal;
     if (!isFinal)
       return XML_STATUS_OK;
     positionPtr = bufferPtr;
@@ -1446,14 +1446,14 @@
     errorCode = processor(parser, bufferPtr, parseEndPtr, &bufferPtr);
 
     if (errorCode == XML_ERROR_NONE) {
-      switch (parsing) {
+      switch (ps_parsing) {
       case XML_SUSPENDED:
         XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
         positionPtr = bufferPtr;
         return XML_STATUS_SUSPENDED;
       case XML_INITIALIZED: 
       case XML_PARSING:
-        parsing = XML_FINISHED;
+        ps_parsing = XML_FINISHED;
         /* fall through */
       default:
         return XML_STATUS_OK;
@@ -1470,7 +1470,7 @@
     enum XML_Error result;
     parseEndByteIndex += len;
     positionPtr = s;
-    finalBuffer = (XML_Bool)isFinal;
+    ps_finalBuffer = (XML_Bool)isFinal;
 
     errorCode = processor(parser, s, parseEndPtr = s + len, &end);
 
@@ -1480,7 +1480,7 @@
       return XML_STATUS_ERROR;
     }
     else {
-      switch (parsing) {
+      switch (ps_parsing) {
       case XML_SUSPENDED:
         result = XML_STATUS_SUSPENDED;
         break;
@@ -1488,7 +1488,7 @@
       case XML_PARSING:
         result = XML_STATUS_OK;
         if (isFinal) {
-          parsing = XML_FINISHED;
+          ps_parsing = XML_FINISHED;
           return result;
         }
       }
@@ -1544,7 +1544,7 @@
   const char *start;
   enum XML_Status result = XML_STATUS_OK;
 
-  switch (parsing) {
+  switch (ps_parsing) {
   case XML_SUSPENDED:
     errorCode = XML_ERROR_SUSPENDED;
     return XML_STATUS_ERROR;
@@ -1552,7 +1552,7 @@
     errorCode = XML_ERROR_FINISHED;
     return XML_STATUS_ERROR;
   default:
-    parsing = XML_PARSING;
+    ps_parsing = XML_PARSING;
   }
 
   start = bufferPtr;
@@ -1560,7 +1560,7 @@
   bufferEnd += len;
   parseEndPtr = bufferEnd;
   parseEndByteIndex += len;
-  finalBuffer = (XML_Bool)isFinal;
+  ps_finalBuffer = (XML_Bool)isFinal;
 
   errorCode = processor(parser, start, parseEndPtr, &bufferPtr);
 
@@ -1570,14 +1570,14 @@
     return XML_STATUS_ERROR;
   }
   else {
-    switch (parsing) {
+    switch (ps_parsing) {
     case XML_SUSPENDED:
       result = XML_STATUS_SUSPENDED;
       break;
     case XML_INITIALIZED: 
     case XML_PARSING:
       if (isFinal) {
-        parsing = XML_FINISHED;
+        ps_parsing = XML_FINISHED;
         return result;
       }
     default: ;  /* should not happen */
@@ -1592,7 +1592,7 @@
 void * XMLCALL
 XML_GetBuffer(XML_Parser parser, int len)
 {
-  switch (parsing) {
+  switch (ps_parsing) {
   case XML_SUSPENDED:
     errorCode = XML_ERROR_SUSPENDED;
     return NULL;
@@ -1671,13 +1671,13 @@
 enum XML_Status XMLCALL
 XML_StopParser(XML_Parser parser, XML_Bool resumable)
 {
-  switch (parsing) {
+  switch (ps_parsing) {
   case XML_SUSPENDED:
     if (resumable) {
       errorCode = XML_ERROR_SUSPENDED;
       return XML_STATUS_ERROR;
     }
-    parsing = XML_FINISHED;
+    ps_parsing = XML_FINISHED;
     break;
   case XML_FINISHED:
     errorCode = XML_ERROR_FINISHED;
@@ -1690,10 +1690,10 @@
         return XML_STATUS_ERROR;
       }
 #endif
-      parsing = XML_SUSPENDED;
+      ps_parsing = XML_SUSPENDED;
     }
     else
-      parsing = XML_FINISHED;
+      ps_parsing = XML_FINISHED;
   }
   return XML_STATUS_OK;
 }
@@ -1703,11 +1703,11 @@
 {
   enum XML_Status result = XML_STATUS_OK;
 
-  if (parsing != XML_SUSPENDED) {
+  if (ps_parsing != XML_SUSPENDED) {
     errorCode = XML_ERROR_NOT_SUSPENDED;
     return XML_STATUS_ERROR;
   }
-  parsing = XML_PARSING;
+  ps_parsing = XML_PARSING;
 
   errorCode = processor(parser, bufferPtr, parseEndPtr, &bufferPtr);
 
@@ -1717,14 +1717,14 @@
     return XML_STATUS_ERROR;
   }
   else {
-    switch (parsing) {
+    switch (ps_parsing) {
     case XML_SUSPENDED:
       result = XML_STATUS_SUSPENDED;
       break;
     case XML_INITIALIZED: 
     case XML_PARSING:
-      if (finalBuffer) {
-        parsing = XML_FINISHED;
+      if (ps_finalBuffer) {
+        ps_parsing = XML_FINISHED;
         return result;
       }
     default: ;
@@ -2006,7 +2006,7 @@
                  const char **endPtr)
 {
   enum XML_Error result = doContent(parser, 0, encoding, start, end, 
-                                    endPtr, (XML_Bool)!finalBuffer);
+                                    endPtr, (XML_Bool)!ps_finalBuffer);
   if (result == XML_ERROR_NONE) {
     if (!storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2042,21 +2042,21 @@
        doContent (by detecting XML_TOK_NONE) without processing any xml text
        declaration - causing the error XML_ERROR_MISPLACED_XML_PI in doContent.
     */
-    if (next == end && !finalBuffer) {
+    if (next == end && !ps_finalBuffer) {
       *endPtr = next;
       return XML_ERROR_NONE;
     }
     start = next;
     break;
   case XML_TOK_PARTIAL:
-    if (!finalBuffer) {
+    if (!ps_finalBuffer) {
       *endPtr = start;
       return XML_ERROR_NONE;
     }
     eventPtr = start;
     return XML_ERROR_UNCLOSED_TOKEN;
   case XML_TOK_PARTIAL_CHAR:
-    if (!finalBuffer) {
+    if (!ps_finalBuffer) {
       *endPtr = start;
       return XML_ERROR_NONE;
     }
@@ -2086,7 +2086,7 @@
       result = processXmlDecl(parser, 1, start, next);
       if (result != XML_ERROR_NONE)
         return result;
-      switch (parsing) {
+      switch (ps_parsing) {
       case XML_SUSPENDED: 
         *endPtr = next;
         return XML_ERROR_NONE;
@@ -2098,13 +2098,13 @@
     }
     break;
   case XML_TOK_PARTIAL:
-    if (!finalBuffer) {
+    if (!ps_finalBuffer) {
       *endPtr = start;
       return XML_ERROR_NONE;
     }
     return XML_ERROR_UNCLOSED_TOKEN;
   case XML_TOK_PARTIAL_CHAR:
-    if (!finalBuffer) {
+    if (!ps_finalBuffer) {
       *endPtr = start;
       return XML_ERROR_NONE;
     }
@@ -2122,7 +2122,7 @@
                                const char **endPtr)
 {
   enum XML_Error result = doContent(parser, 1, encoding, start, end, 
-                                    endPtr, (XML_Bool)!finalBuffer);
+                                    endPtr, (XML_Bool)!ps_finalBuffer);
   if (result == XML_ERROR_NONE) {
     if (!storeRawNames(parser))
       return XML_ERROR_NO_MEMORY;
@@ -2572,7 +2572,7 @@
       break;
     }
     *eventPP = s = next;
-    switch (parsing) {
+    switch (ps_parsing) {
     case XML_SUSPENDED: 
       *nextPtr = next;
       return XML_ERROR_NONE;
@@ -3043,7 +3043,7 @@
                       const char **endPtr)
 {
   enum XML_Error result = doCdataSection(parser, encoding, &start, end,
-                                         endPtr, (XML_Bool)!finalBuffer);
+                                         endPtr, (XML_Bool)!ps_finalBuffer);
   if (result != XML_ERROR_NONE)
     return result;
   if (start) {
@@ -3102,7 +3102,7 @@
         reportDefault(parser, enc, s, next);
       *startPtr = next;
       *nextPtr = next;
-      if (parsing == XML_FINISHED)
+      if (ps_parsing == XML_FINISHED)
         return XML_ERROR_ABORTED;
       else
         return XML_ERROR_NONE;
@@ -3158,7 +3158,7 @@
     }
 
     *eventPP = s = next;
-    switch (parsing) {
+    switch (ps_parsing) {
     case XML_SUSPENDED:
       *nextPtr = next;
       return XML_ERROR_NONE;
@@ -3182,7 +3182,7 @@
                        const char **endPtr)
 {
   enum XML_Error result = doIgnoreSection(parser, encoding, &start, end, 
-                                          endPtr, (XML_Bool)!finalBuffer);
+                                          endPtr, (XML_Bool)!ps_finalBuffer);
   if (result != XML_ERROR_NONE)
     return result;
   if (start) {
@@ -3227,7 +3227,7 @@
       reportDefault(parser, enc, s, next);
     *startPtr = next;
     *nextPtr = next;
-    if (parsing == XML_FINISHED)
+    if (ps_parsing == XML_FINISHED)
       return XML_ERROR_ABORTED;
     else
       return XML_ERROR_NONE;
@@ -3467,7 +3467,7 @@
     tok = XmlPrologTok(encoding, start, end, &next);
     eventEndPtr = next;
     if (tok <= 0) {
-      if (!finalBuffer && tok != XML_TOK_INVALID) {
+      if (!ps_finalBuffer && tok != XML_TOK_INVALID) {
         *nextPtr = s;
         return XML_ERROR_NONE;
       }
@@ -3490,7 +3490,7 @@
       result = processXmlDecl(parser, 0, start, next);
       if (result != XML_ERROR_NONE)
         return result;
-      switch (parsing) {
+      switch (ps_parsing) {
       case XML_SUSPENDED: 
         *nextPtr = next;
         return XML_ERROR_NONE;
@@ -3510,7 +3510,7 @@
        then, when this routine is entered the next time, XmlPrologTok will
        return XML_TOK_INVALID, since the BOM is still in the buffer
     */
-    else if (tok == XML_TOK_BOM && next == end && !finalBuffer) {
+    else if (tok == XML_TOK_BOM && next == end && !ps_finalBuffer) {
       *nextPtr = next;
       return XML_ERROR_NONE;
     }
@@ -3530,7 +3530,7 @@
 
   tok = XmlPrologTok(encoding, s, end, &next);
   if (tok <= 0) {
-    if (!finalBuffer && tok != XML_TOK_INVALID) {
+    if (!ps_finalBuffer && tok != XML_TOK_INVALID) {
       *nextPtr = s;
       return XML_ERROR_NONE;
     }
@@ -3557,7 +3557,7 @@
 
   processor = prologProcessor;
   return doProlog(parser, encoding, s, end, tok, next, 
-                  nextPtr, (XML_Bool)!finalBuffer);
+                  nextPtr, (XML_Bool)!ps_finalBuffer);
 }
 
 static enum XML_Error PTRCALL
@@ -3574,7 +3574,7 @@
   for (;;) {
     tok = XmlPrologTok(enc, start, end, &next);
     if (tok <= 0) {
-      if (!finalBuffer && tok != XML_TOK_INVALID) {
+      if (!ps_finalBuffer && tok != XML_TOK_INVALID) {
         *nextPtr = s;
         return XML_ERROR_NONE;
       }
@@ -3607,7 +3607,7 @@
   const char *next = s;
   int tok = XmlPrologTok(encoding, s, end, &next);
   return doProlog(parser, encoding, s, end, tok, next, 
-                  nextPtr, (XML_Bool)!finalBuffer);
+                  nextPtr, (XML_Bool)!ps_finalBuffer);
 }
 
 static enum XML_Error
@@ -4554,7 +4554,7 @@
     if (handleDefault && defaultHandler)
       reportDefault(parser, enc, s, next);
 
-    switch (parsing) {
+    switch (ps_parsing) {
     case XML_SUSPENDED: 
       *nextPtr = next;
       return XML_ERROR_NONE;
@@ -4585,7 +4585,7 @@
     case -XML_TOK_PROLOG_S:
       if (defaultHandler) {
         reportDefault(parser, encoding, s, next);
-        if (parsing == XML_FINISHED)
+        if (ps_parsing == XML_FINISHED)
           return XML_ERROR_ABORTED;
       }
       *nextPtr = next;
@@ -4609,13 +4609,13 @@
       eventPtr = next;
       return XML_ERROR_INVALID_TOKEN;
     case XML_TOK_PARTIAL:
-      if (!finalBuffer) {
+      if (!ps_finalBuffer) {
         *nextPtr = s;
         return XML_ERROR_NONE;
       }
       return XML_ERROR_UNCLOSED_TOKEN;
     case XML_TOK_PARTIAL_CHAR:
-      if (!finalBuffer) {
+      if (!ps_finalBuffer) {
         *nextPtr = s;
         return XML_ERROR_NONE;
       }
@@ -4624,7 +4624,7 @@
       return XML_ERROR_JUNK_AFTER_DOC_ELEMENT;
     }
     eventPtr = s = next;
-    switch (parsing) {
+    switch (ps_parsing) {
     case XML_SUSPENDED: 
       *nextPtr = next;
       return XML_ERROR_NONE;
@@ -4677,7 +4677,7 @@
                        textEnd, &next, XML_FALSE);
 
   if (result == XML_ERROR_NONE) {
-    if (textEnd != next && parsing == XML_SUSPENDED) {
+    if (textEnd != next && ps_parsing == XML_SUSPENDED) {
       entity->processed = next - textStart;
       processor = internalEntityProcessor;
     }
@@ -4723,7 +4723,7 @@
 
   if (result != XML_ERROR_NONE)
     return result;
-  else if (textEnd != next && parsing == XML_SUSPENDED) {
+  else if (textEnd != next && ps_parsing == XML_SUSPENDED) {
     entity->processed = next - (char *)entity->textPtr;
     return result;
   }
@@ -4741,7 +4741,7 @@
     processor = prologProcessor;
     tok = XmlPrologTok(encoding, s, end, &next);
     return doProlog(parser, encoding, s, end, tok, next, nextPtr, 
-                    (XML_Bool)!finalBuffer);
+                    (XML_Bool)!ps_finalBuffer);
   }
   else
 #endif /* XML_DTD */
@@ -4749,7 +4749,7 @@
     processor = contentProcessor;
     /* see externalEntityContentProcessor vs contentProcessor */
     return doContent(parser, parentParser ? 1 : 0, encoding, s, end,
-                     nextPtr, (XML_Bool)!finalBuffer); 
+                     nextPtr, (XML_Bool)!ps_finalBuffer); 
   }  
 }
 

From fdrake at users.sourceforge.net  Sat Jan 29 03:55:56 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sat Jan 29 03:55:59 2005
Subject: [Expat-checkins] expat MANIFEST,1.22,1.23
Message-ID: <E1CuimC-000138-JT@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MANIFEST 
Log Message:
add the C++ test harness

Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- MANIFEST	23 Jul 2004 03:59:40 -0000	1.22
+++ MANIFEST	29 Jan 2005 02:55:53 -0000	1.23
@@ -90,6 +90,7 @@
 tests/minicheck.c
 tests/minicheck.h
 tests/runtests.c
+tests/runtestspp.cpp
 tests/xmltest.sh
 vms/README.vms
 vms/descrip.mms

From fdrake at users.sourceforge.net  Sat Jan 29 04:18:20 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sat Jan 29 04:18:23 2005
Subject: [Expat-checkins] htdocs index.html,1.56,1.57
Message-ID: <E1Cuj7s-00029z-R2@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	index.html 
Log Message:
add news of the pre-release snapshot


Index: index.html
===================================================================
RCS file: /cvsroot/expat/htdocs/index.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- index.html	10 Jan 2005 14:17:02 -0000	1.56
+++ index.html	29 Jan 2005 03:18:02 -0000	1.57
@@ -51,6 +51,20 @@
 <h3 id="news">News</h3>
 
 <dl>
+  <dt><em>28 January 2005</em>,
+      Expat pre-release snapshot made available.
+    </dt>
+  <dd>
+    <p>We've posted a <a href=
+    "http://www.libexpat.org/expat-2005-01-28.tar.gz" >pre-release
+    distribution snapshot</a> of the code currently in CVS on
+    libexpat.org.  Please try this out and report any problems you
+    have.  We'd like to get a release out soon.</p>
+    <p>The coming release will either be 1.95.9 or 2.0, depending
+    primarily on the response to this snapshot.  If we do decide to
+    make this 1.95.9, then we'll try to follow up with 2.0 in about a
+    month.</p>
+    </dd>
   <dt><em>23 July 2004</em>,
       Expat 1.95.8 released.
     </dt>

From fdrake at users.sourceforge.net  Sat Jan 29 04:24:24 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sat Jan 29 04:24:26 2005
Subject: [Expat-checkins] htdocs/dev expat3.html,1.1,1.2
Message-ID: <E1CujDk-0002Rj-6y@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	expat3.html 
Log Message:
add a note about the planned change in XML_ParserReset


Index: expat3.html
===================================================================
RCS file: /cvsroot/expat/htdocs/dev/expat3.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat3.html	23 Oct 2003 05:24:11 -0000	1.1
+++ expat3.html	29 Jan 2005 03:24:21 -0000	1.2
@@ -29,6 +29,11 @@
 and have time to write about them. </p>
 
 <ul>
+  <li> The signature of the <code>XML_ParserReset()</code> method will
+  grow an additional argument allowing specification of what should be
+  reset.  See <a href= "" >bug report 1109116: <em>Optimize
+  implementation of XML_ParserReset</em></a> for more information. </li>
+
   <li> All structural event callback functions will return an
   <code>XML_Status</code> value that the parser will check.  This will
   allow an application to stop or suspend processing without having to

From fdrake at users.sourceforge.net  Sat Jan 29 04:26:58 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sat Jan 29 04:27:01 2005
Subject: [Expat-checkins] htdocs/dev expat3.html,1.2,1.3
Message-ID: <E1CujGE-0002YT-G8@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	expat3.html 
Log Message:
- add note about XML 1.1
- add missing link to tracker item


Index: expat3.html
===================================================================
RCS file: /cvsroot/expat/htdocs/dev/expat3.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- expat3.html	29 Jan 2005 03:24:21 -0000	1.2
+++ expat3.html	29 Jan 2005 03:26:56 -0000	1.3
@@ -29,10 +29,14 @@
 and have time to write about them. </p>
 
 <ul>
+  <li> Support for XML 1.1 and the corresponding namespaces updates. </li>
+
   <li> The signature of the <code>XML_ParserReset()</code> method will
   grow an additional argument allowing specification of what should be
-  reset.  See <a href= "" >bug report 1109116: <em>Optimize
-  implementation of XML_ParserReset</em></a> for more information. </li>
+  reset.  See <a href=
+  "http://sourceforge.net/tracker/index.php?func=detail&aid=1109116&group_id=10127&atid=110127"
+  >bug report 1109116: <em>Optimize implementation of
+  XML_ParserReset</em></a> for more information. </li>
 
   <li> All structural event callback functions will return an
   <code>XML_Status</code> value that the parser will check.  This will

From fdrake at users.sourceforge.net  Sat Jan 29 05:48:46 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sat Jan 29 05:48:49 2005
Subject: [Expat-checkins] expat Changes,1.42,1.43
Message-ID: <E1CukXO-0006h8-7m@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Changes 
Log Message:
Report XML_NS setting via XML_GetFeatureList().

Index: Changes
===================================================================
RCS file: /cvsroot/expat/expat/Changes,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Changes	27 Jan 2005 06:27:57 -0000	1.42
+++ Changes	29 Jan 2005 04:48:43 -0000	1.43
@@ -1,6 +1,7 @@
 Release 1.95.9 TBD
         - We no longer use the "check" library for C unit testing; we
           always use the (partial) internal implementation of the API.
+        - Report XML_NS setting via XML_GetFeatureList().
 
 Release 1.95.8 Fri Jul 23 2004
         - Major new feature: suspend/resume.  Handlers can now request

From fdrake at users.sourceforge.net  Sat Jan 29 05:48:47 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sat Jan 29 05:48:50 2005
Subject: [Expat-checkins] expat/lib expat.h, 1.75, 1.76 xmlparse.c, 1.144,
	1.145
Message-ID: <E1CukXP-0006hG-0I@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	expat.h xmlparse.c 
Log Message:
Report XML_NS setting via XML_GetFeatureList().

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- expat.h	24 Dec 2004 18:00:28 -0000	1.75
+++ expat.h	29 Jan 2005 04:48:43 -0000	1.76
@@ -982,7 +982,8 @@
   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
   /* Additional features must be added to the end of this enum. */
 };
 

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- xmlparse.c	29 Jan 2005 02:28:33 -0000	1.144
+++ xmlparse.c	29 Jan 2005 04:48:44 -0000	1.145
@@ -1943,6 +1943,9 @@
 #ifdef XML_MIN_SIZE
     {XML_FEATURE_MIN_SIZE,         XML_L("XML_MIN_SIZE"), 0},
 #endif
+#ifdef XML_NS
+    {XML_FEATURE_NS,               XML_L("XML_NS"), 0},
+#endif
     {XML_FEATURE_END,              NULL, 0}
   };
 

From fdrake at users.sourceforge.net  Sat Jan 29 06:00:18 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sat Jan 29 06:00:21 2005
Subject: [Expat-checkins] expat/win32 expat.iss,1.18,1.19
Message-ID: <E1CukiY-0007JT-D3@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	expat.iss 
Log Message:
include the C++ test harness in the Windows package

Index: expat.iss
===================================================================
RCS file: /cvsroot/expat/expat/win32/expat.iss,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- expat.iss	16 Jul 2004 02:10:57 -0000	1.18
+++ expat.iss	29 Jan 2005 05:00:15 -0000	1.19
@@ -51,6 +51,7 @@
 CopyMode: alwaysoverwrite; Source: examples\*.c;               DestDir: "{app}\Source\examples"
 CopyMode: alwaysoverwrite; Source: examples\*.dsp;             DestDir: "{app}\Source\examples"
 CopyMode: alwaysoverwrite; Source: tests\*.c;                  DestDir: "{app}\Source\tests"
+CopyMode: alwaysoverwrite; Source: tests\*.cpp;                DestDir: "{app}\Source\tests"
 CopyMode: alwaysoverwrite; Source: tests\*.h;                  DestDir: "{app}\Source\tests"
 CopyMode: alwaysoverwrite; Source: tests\README.txt;           DestDir: "{app}\Source\tests"
 CopyMode: alwaysoverwrite; Source: xmlwf\*.c*;                 DestDir: "{app}\Source\xmlwf"

From fdrake at users.sourceforge.net  Sat Jan 29 06:11:18 2005
From: fdrake at users.sourceforge.net (Fred L. Drake)
Date: Sat Jan 29 06:11:24 2005
Subject: [Expat-checkins] expat Changes,1.43,1.44
Message-ID: <E1CuktC-0007ro-9c@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Changes 
Log Message:
more changes noted


Index: Changes
===================================================================
RCS file: /cvsroot/expat/expat/Changes,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Changes	29 Jan 2005 04:48:43 -0000	1.43
+++ Changes	29 Jan 2005 05:11:13 -0000	1.44
@@ -2,6 +2,8 @@
         - We no longer use the "check" library for C unit testing; we
           always use the (partial) internal implementation of the API.
         - Report XML_NS setting via XML_GetFeatureList().
+        - Fixed headers for use from C++.
+        - Updated to use libtool 1.5.10 (the most recent).
 
 Release 1.95.8 Fri Jul 23 2004
         - Major new feature: suspend/resume.  Handlers can now request

From kwaclaw at users.sourceforge.net  Sun Jan 30 06:44:48 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun Jan 30 06:44:52 2005
Subject: [Expat-checkins] expat/doc reference.html,1.64,1.65
Message-ID: <E1Cv7tA-0005OE-L2@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	reference.html 
Log Message:
Fixed error found by Reid Spencer.

Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- reference.html	20 Dec 2004 03:23:29 -0000	1.64
+++ reference.html	30 Jan 2005 05:44:46 -0000	1.65
@@ -606,7 +606,7 @@
 for the end of a scope of a declaration with the <code><a href=
 "#XML_SetNamespaceDeclHandler" >XML_SetNamespaceDeclHandler</a></code>
 function.  The StartNamespaceDeclHandler is called prior to the start
-tag handler and the EndNamespaceDeclHandler is called before the
+tag handler and the EndNamespaceDeclHandler is called after the
 corresponding end tag that ends the namespace's scope.  The namespace
 start handler gets passed the prefix and URI for the namespace.  For a
 default namespace declaration (xmlns='...'), the prefix will be null.
@@ -2312,4 +2312,4 @@
         height="31" width="88" class="noborder" /></a></p>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

From kwaclaw at users.sourceforge.net  Mon Jan 31 15:52:58 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon Jan 31 15:53:04 2005
Subject: [Expat-checkins] htdocs/dev expat3.html,1.3,1.4
Message-ID: <E1CvcvC-0005ek-55@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	expat3.html 
Log Message:
Added more features planned for Expat 3.0.

Index: expat3.html
===================================================================
RCS file: /cvsroot/expat/htdocs/dev/expat3.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- expat3.html	29 Jan 2005 03:26:56 -0000	1.3
+++ expat3.html	31 Jan 2005 14:52:55 -0000	1.4
@@ -41,16 +41,30 @@
   <li> All structural event callback functions will return an
   <code>XML_Status</code> value that the parser will check.  This will
   allow an application to stop or suspend processing without having to
-  use <code>setjmp()</code>/<code>longjmp()</code> hackery. </li>
-
-  <li> The parser will support suspension of parsing to allow an
-  application to pause parsing temporarily.  A new
-  <code>XML_Status</code> value, <code>XML_STATUS_SUSPEND</code>, can
-  be returned by the event callbacks to indicate that Expat should
-  suspend parsing; the parser will then return from
-  <code>XML_Parse()</code>, returning <code>XML_STATUS_SUSPEND</code>.
-  Applications can resume parsing by calling
-  <code>XML_ParseResume()</code>. </li>
+  call <code>XML_StopParser</code>, which will therefore become obsolete. </li>
+  
+  <li> The memory management function signatures will gain an additional
+  userData-like parameter, so that memory usage can be associated
+  with a context, allowing usage of memory pools and tracking of memory
+  usage per parser.  The latter could be used to prevent the so-called
+  "million laughs" DoS attack. </li>
+  
+  <li> Change how qualified names are reported.  Instead of passing one
+  string where the name parts are separated by a special character, we
+  are going to use <code>QName</code> structs with members for local name,
+  namespace URI and prefix. This will apply to element names and attribute
+  names passed to <code>XML_StartElementHandler</code> and  
+  <code>XML_EndElementHandler</code>.  </li>
+  
+  <li> We will try to add a way of setting additional encodings
+  by name, using the existing framework built around
+  <code>XML_UnknownEncodingHandler</code>. </li>
+  
+  <li> Create different link symbols for different XML_Char sizes.
+  This would make it possible for different shared libraries making up an
+  application on linux, to link against expat shared libraries that have
+  been compiled with different definitions for XML_Char.</li>
+  
 </ul>
 
         </td>
@@ -66,4 +80,4 @@
       </tr>
     </table>
   </body>
-</html>
+</html>
\ No newline at end of file