From commitsrebeccamedina@example.net Wed Jan 02 18:44:04 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 52199 invoked from network); 2 Jan 2008 18:44:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 18:44:04 -0000 Received: (qmail 89993 invoked by uid 500); 2 Jan 2008 18:43:53 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 89972 invoked by uid 500); 2 Jan 2008 18:43:52 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 89961 invoked by uid 99); 2 Jan 2008 18:43:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 10:43:52 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 18:43:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F29241A9832; Wed, 2 Jan 2008 10:43:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608178 - /xerces/java/trunk/build.xml Date: Wed, 02 Jan 2008 18:43:31 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: mrglavas Date: Wed Jan 2 10:43:29 2008 New Revision: 608178 URL: http://svn.apache.org/viewvc?rev=608178&view=rev Log: Updating the copyright year used in the API docs. Modified: xerces/java/trunk/build.xml Modified: xerces/java/trunk/build.xml URL: http://svn.apache.org/viewvc/xerces/java/trunk/build.xml?rev=608178&r1=608177&r2=608178&view=diff ============================================================================== --- xerces/java/trunk/build.xml (original) +++ xerces/java/trunk/build.xml Wed Jan 2 10:43:29 2008 @@ -76,7 +76,7 @@ <property name='default.parser.config.name' value='XIncludeAwareParserConfiguration'/> <property name='default.parser.config.qualified' value='org.apache.xerces.parsers.XIncludeAwareParserConfiguration'/> - <property name="year" value="1999-2007"/> + <property name="year" value="1999-2008"/> <property name="copyright" value="Copyright &#169; ${year} The Apache Software Foundation. All Rights Reserved."/> <echo message= "---------------- ${parser.Name} ${parser.Version} [${year}] ---------------"/> --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Wed Jan 02 18:46:08 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 52859 invoked from network); 2 Jan 2008 18:46:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 18:46:08 -0000 Received: (qmail 91700 invoked by uid 500); 2 Jan 2008 18:45:56 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 91668 invoked by uid 500); 2 Jan 2008 18:45:56 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 91657 invoked by uid 99); 2 Jan 2008 18:45:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 10:45:56 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 18:45:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 16D161A9832; Wed, 2 Jan 2008 10:45:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608180 - /xerces/java/trunk/NOTICE Date: Wed, 02 Jan 2008 18:45:44 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: mrglavas Date: Wed Jan 2 10:45:43 2008 New Revision: 608180 URL: http://svn.apache.org/viewvc?rev=608180&view=rev Log: Updating the copyright year in the NOTICE file. Modified: xerces/java/trunk/NOTICE Modified: xerces/java/trunk/NOTICE URL: http://svn.apache.org/viewvc/xerces/java/trunk/NOTICE?rev=608180&r1=608179&r2=608180&view=diff ============================================================================== --- xerces/java/trunk/NOTICE (original) +++ xerces/java/trunk/NOTICE Wed Jan 2 10:45:43 2008 @@ -4,7 +4,7 @@ ========================================================================= Apache Xerces Java - Copyright 1999-2007 The Apache Software Foundation + Copyright 1999-2008 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Wed Jan 02 18:48:24 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 53472 invoked from network); 2 Jan 2008 18:48:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jan 2008 18:48:24 -0000 Received: (qmail 93364 invoked by uid 500); 2 Jan 2008 18:48:13 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 93340 invoked by uid 500); 2 Jan 2008 18:48:13 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 93329 invoked by uid 99); 2 Jan 2008 18:48:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 10:48:13 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 18:48:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B15151A9832; Wed, 2 Jan 2008 10:48:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608181 - /xerces/java/trunk/docs/docs-book.xml Date: Wed, 02 Jan 2008 18:48:01 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: mrglavas Date: Wed Jan 2 10:48:00 2008 New Revision: 608181 URL: http://svn.apache.org/viewvc?rev=608181&view=rev Log: Updating the copyright year in the documentation. Modified: xerces/java/trunk/docs/docs-book.xml Modified: xerces/java/trunk/docs/docs-book.xml URL: http://svn.apache.org/viewvc/xerces/java/trunk/docs/docs-book.xml?rev=608181&r1=608180&r2=608181&view=diff ============================================================================== --- xerces/java/trunk/docs/docs-book.xml (original) +++ xerces/java/trunk/docs/docs-book.xml Wed Jan 2 10:48:00 2008 @@ -17,7 +17,7 @@ --> <!DOCTYPE book SYSTEM 'dtd/book.dtd'> <book title='&ParserName; Documentation' - copyright='1999-2007 The Apache Software Foundation'> + copyright='1999-2008 The Apache Software Foundation'> <external label='Home' href='http://xerces.apache.org/'/> <separator/> <document label='Readme' title='&ParserNameLong; Readme' --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Thu Jan 03 16:44:10 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 14135 invoked from network); 3 Jan 2008 16:44:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Jan 2008 16:44:10 -0000 Received: (qmail 33792 invoked by uid 500); 3 Jan 2008 16:43:49 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 33763 invoked by uid 500); 3 Jan 2008 16:43:49 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 33735 invoked by uid 99); 3 Jan 2008 16:43:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2008 08:43:49 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2008 16:43:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 75FBC1A9832; Thu, 3 Jan 2008 08:43:30 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608555 - in /xerces/c/trunk: ./ config/ lib/ obj/ samples/ src/ swig/ tests/ Date: Thu, 03 Jan 2008 16:43:30 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Thu Jan 3 08:43:28 2008 New Revision: 608555 URL: http://svn.apache.org/viewvc?rev=608555&view=rev Log: Removed autoconf-generated files from SVN (use the reconf script to generate them after getting the sources from SVN) Removed: xerces/c/trunk/Makefile.in xerces/c/trunk/config.h.in xerces/c/trunk/config/bootstrap xerces/c/trunk/config/compile xerces/c/trunk/config/config.guess xerces/c/trunk/config/config.sub xerces/c/trunk/config/depcomp xerces/c/trunk/config/install-sh xerces/c/trunk/config/ltmain.sh xerces/c/trunk/config/missing xerces/c/trunk/config/mkinstalldirs xerces/c/trunk/configure xerces/c/trunk/lib/Makefile.in xerces/c/trunk/obj/Makefile.in xerces/c/trunk/samples/Makefile.in xerces/c/trunk/src/Makefile.in xerces/c/trunk/swig/Makefile.in xerces/c/trunk/tests/Makefile.in --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Fri Jan 04 14:34:51 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 37879 invoked from network); 4 Jan 2008 14:34:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jan 2008 14:34:51 -0000 Received: (qmail 20750 invoked by uid 500); 4 Jan 2008 14:34:40 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 20685 invoked by uid 500); 4 Jan 2008 14:34:40 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 20674 invoked by uid 99); 4 Jan 2008 14:34:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 06:34:39 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 14:34:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AFEDA1A983E; Fri, 4 Jan 2008 06:34:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608862 - in /xerces/c/trunk: ./ Makefile.am config/ configure.ac lib/ obj/ samples/ src/ swig/ tests/ Date: Fri, 04 Jan 2008 14:34:15 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Fri Jan 4 06:34:14 2008 New Revision: 608862 URL: http://svn.apache.org/viewvc?rev=608862&view=rev Log: Run the sanity tests as part of "make check" Modified: xerces/c/trunk/ (props changed) xerces/c/trunk/Makefile.am xerces/c/trunk/config/ (props changed) xerces/c/trunk/configure.ac xerces/c/trunk/lib/ (props changed) xerces/c/trunk/obj/ (props changed) xerces/c/trunk/samples/ (props changed) xerces/c/trunk/src/ (props changed) xerces/c/trunk/swig/ (props changed) xerces/c/trunk/tests/ (props changed) Propchange: xerces/c/trunk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Jan 4 06:34:14 2008 @@ -8,3 +8,6 @@ Makefile stamp-h* Build +config.h.in +configure +Makefile.in Modified: xerces/c/trunk/Makefile.am URL: http://svn.apache.org/viewvc/xerces/c/trunk/Makefile.am?rev=608862&r1=608861&r2=608862&view=diff ============================================================================== --- xerces/c/trunk/Makefile.am (original) +++ xerces/c/trunk/Makefile.am Fri Jan 4 06:34:14 2008 @@ -2,6 +2,11 @@ ACLOCAL_AMFLAGS = -I m4 +check: + -rm -f tempResult + export PATH=${abs_top_builddir}/samples:${abs_top_builddir}/tests:"${PATH}" && cd ${top_srcdir} && perl scripts/sanityTest.pl 2>&1 | ${SED} 's/ *[0-9][0-9]* *ms */{timing removed}/' 1> ${abs_top_builddir}/tempResult + diff -q tempResult ${top_srcdir}/scripts/sanityTest_ExpectedResult.log + test-suite: cd swig/perl && perl Makefile.PL && make && make test touch $@ Propchange: xerces/c/trunk/config/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Jan 4 06:34:14 2008 @@ -1 +1,7 @@ - +compile +config.guess +config.sub +depcomp +install-sh +ltmain.sh +missing Modified: xerces/c/trunk/configure.ac URL: http://svn.apache.org/viewvc/xerces/c/trunk/configure.ac?rev=608862&r1=608861&r2=608862&view=diff ============================================================================== --- xerces/c/trunk/configure.ac (original) +++ xerces/c/trunk/configure.ac Fri Jan 4 06:34:14 2008 @@ -42,6 +42,10 @@ # Checks for programs. AC_PROG_CXX AC_PROG_CC +# used by "make check" +AC_PROG_SED +#it would be nice to also check for PERL... +#AC_PROG_PERL # If using MSVC (under Cygwin) or Solaris Forte, and the user didn't specify a linker, force a reasonable # choice in order to avoid the "cannot find 'ld'" error from the AC_PROG_LIBTOOL Propchange: xerces/c/trunk/lib/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Jan 4 06:34:14 2008 @@ -1,3 +1,4 @@ .* libcompat.a Makefile +Makefile.in Propchange: xerces/c/trunk/obj/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Jan 4 06:34:14 2008 @@ -1,2 +1,3 @@ .* Makefile +Makefile.in Propchange: xerces/c/trunk/samples/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Jan 4 06:34:14 2008 @@ -15,4 +15,4 @@ SCMPrint SEnumVal StdInParse - +Makefile.in Propchange: xerces/c/trunk/src/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Jan 4 06:34:14 2008 @@ -1,2 +1,3 @@ .* Makefile +Makefile.in Propchange: xerces/c/trunk/swig/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Jan 4 06:34:14 2008 @@ -0,0 +1 @@ +Makefile.in Propchange: xerces/c/trunk/tests/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Jan 4 06:34:14 2008 @@ -11,3 +11,4 @@ Traversal XSerializerTest XSValueTest +Makefile.in --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Fri Jan 04 17:21:03 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 75153 invoked from network); 4 Jan 2008 17:21:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jan 2008 17:21:02 -0000 Received: (qmail 26969 invoked by uid 500); 4 Jan 2008 17:20:51 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 26950 invoked by uid 500); 4 Jan 2008 17:20:51 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 26939 invoked by uid 99); 4 Jan 2008 17:20:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 09:20:51 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 17:20:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AA9DA1A9832; Fri, 4 Jan 2008 09:20:33 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608927 - /xerces/c/trunk/configure.ac Date: Fri, 04 Jan 2008 17:20:33 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Fri Jan 4 09:20:29 2008 New Revision: 608927 URL: http://svn.apache.org/viewvc?rev=608927&view=rev Log: Add declaration for abs_top_builddir and abs_top_srcdir, as only automake 1.10 defines them Modified: xerces/c/trunk/configure.ac Modified: xerces/c/trunk/configure.ac URL: http://svn.apache.org/viewvc/xerces/c/trunk/configure.ac?rev=608927&r1=608926&r2=608927&view=diff ============================================================================== --- xerces/c/trunk/configure.ac (original) +++ xerces/c/trunk/configure.ac Fri Jan 4 09:20:29 2008 @@ -131,6 +131,10 @@ # AC_REPLACE_FUNCS([stricmp strnicmp towlower towupper]) +abs_top_srcdir=`cd $srcdir; pwd` +AC_SUBST(abs_top_srcdir) +abs_top_builddir=`pwd` +AC_SUBST(abs_top_builddir) ###################################################### # Look for availability of available packages --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Fri Jan 04 17:23:10 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 76835 invoked from network); 4 Jan 2008 17:23:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jan 2008 17:23:10 -0000 Received: (qmail 32287 invoked by uid 500); 4 Jan 2008 17:22:58 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 32265 invoked by uid 500); 4 Jan 2008 17:22:58 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 32254 invoked by uid 99); 4 Jan 2008 17:22:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 09:22:58 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 17:22:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1AFC61A9838; Fri, 4 Jan 2008 09:22:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608930 - /xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp Date: Fri, 04 Jan 2008 17:22:46 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Fri Jan 4 09:22:46 2008 New Revision: 608930 URL: http://svn.apache.org/viewvc?rev=608930&view=rev Log: Make WinSock NetAccessor compile under Cygwin Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp Modified: xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp?rev=608930&r1=608929&r2=608930&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp (original) +++ xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp Fri Jan 4 09:22:46 2008 @@ -21,7 +21,6 @@ #include <winsock2.h> #include <windows.h> -#include <tchar.h> #ifdef WITH_IPV6 #include <ws2tcpip.h> @@ -29,7 +28,6 @@ #include <stdio.h> #include <string.h> -#include <stdlib.h> #include <xercesc/util/PlatformUtils.hpp> #include <xercesc/util/XMLNetAccessor.hpp> @@ -188,9 +186,9 @@ LPFN_WSASTARTUP startup = NULL; if(gWinsockLib == NULL) { #ifdef WITH_IPV6 - gWinsockLib = LoadLibrary(_T("WS2_32")); + gWinsockLib = LoadLibraryA("WS2_32"); #else - gWinsockLib = LoadLibrary(_T("WSOCK32")); + gWinsockLib = LoadLibraryA("WSOCK32"); #endif if(gWinsockLib == NULL) { ThrowXMLwithMemMgr(NetAccessorException, XMLExcepts888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4NetAcc_InitFailed, manager); @@ -338,7 +336,7 @@ hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_STREAM; char tempbuf[10]; - itoa (portNumber,tempbuf,10); + XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4inToText(portNumber, tempbuf, 10, 10); int n = wrap_getaddrinfo(hostNameAsCharStar,(const char*)tempbuf,&hints, &res); if(n<0) { @@ -456,7 +454,7 @@ { strcat(fBuffer, ":"); size_t i = strlen(fBuffer); - itoa(portNumber, fBuffer+i, 10); + XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4inToText(portNumber, fBuffer+i, 10, 10); } strcat(fBuffer, "\r\n"); --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Fri Jan 04 17:23:59 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 77170 invoked from network); 4 Jan 2008 17:23:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jan 2008 17:23:59 -0000 Received: (qmail 34485 invoked by uid 500); 4 Jan 2008 17:23:48 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 34466 invoked by uid 500); 4 Jan 2008 17:23:48 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 34455 invoked by uid 99); 4 Jan 2008 17:23:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 09:23:48 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 17:23:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AFAE21A983A; Fri, 4 Jan 2008 09:23:38 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608932 - /xerces/c/trunk/doc/build-winunix.xml Date: Fri, 04 Jan 2008 17:23:38 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Fri Jan 4 09:23:37 2008 New Revision: 608932 URL: http://svn.apache.org/viewvc?rev=608932&view=rev Log: Update build instructions for Cygwin Modified: xerces/c/trunk/doc/build-winunix.xml Modified: xerces/c/trunk/doc/build-winunix.xml URL: http://svn.apache.org/viewvc/xerces/c/trunk/doc/build-winunix.xml?rev=608932&r1=608931&r2=608932&view=diff ============================================================================== --- xerces/c/trunk/doc/build-winunix.xml (original) +++ xerces/c/trunk/doc/build-winunix.xml Fri Jan 4 09:23:37 2008 @@ -36,8 +36,10 @@ <source>&XercesCSrcInstallDir;\Projects\Win32\VC6\xerces-all\xerces-all.dsw</source> <p>For MSVC Version 7.1 (Visual C++ .NET 2003):</p> <source>&XercesCSrcInstallDir;\Projects\Win32\VC7.1\xerces-all\xerces-all.sln</source> - <p>For MSVC Version 8.0 (Visual C++ .NET 2005):</p> + <p>For MSVC Version 8.0 (Visual C++ 2005):</p> <source>&XercesCSrcInstallDir;\Projects\Win32\VC8\xerces-all\xerces-all.sln</source> + <p>For MSVC Version 9.0 (Visual C++ 2008):</p> +<source>&XercesCSrcInstallDir;\Projects\Win32\VC9\xerces-all\xerces-all.sln</source> <p>Once you are inside MSVC, you need to build the project marked <em>XercesLib</em>.</p> @@ -45,7 +47,8 @@ you need to pick up:</p> <source>(For MSVC V6) &XercesCSrcInstallDir;\Projects\Win32\VC6\xerces-all\XercesLib\XercesLib.dsp (For MSVC V7.1) &XercesCSrcInstallDir;\Projects\Win32\VC7.1\xerces-all\XercesLib\XercesLib.vcproj -(For MSVC V8) &XercesCSrcInstallDir;\Projects\Win32\VC8\xerces-all\XercesLib\XercesLib.vcproj</source> +(For MSVC V8) &XercesCSrcInstallDir;\Projects\Win32\VC8\xerces-all\XercesLib\XercesLib.vcproj +(For MSVC V9) &XercesCSrcInstallDir;\Projects\Win32\VC9\xerces-all\XercesLib\XercesLib.vcproj</source> <p>You must make sure that you are linking your application with the &XercesCWindowsLib;.lib library and also make sure that the associated DLL is somewhere in your path.</p> @@ -166,6 +169,12 @@ cause the application to crash, regardless of whether there is a "catch" statement. This bug doesn't occur in tests using gcc 3.1 or 3.2, so it is recommended that you use gcc 3.1 or higher.</p> + + <p>By default, autoconf on Cygwin and MinGW/MSYS doesn't build shared libraries, + even if <code>configure</code> will detect it's possible; you will have to force + it by specifying the <code>LDFLAGS=-no-undefined</code> option to <code>configure</code> + </p> + </s2> <anchor name="UNIX"/> @@ -235,7 +244,7 @@ directory. If not, type:</p> <source>cd &lt;full path to &XercesCSrcInstallDir;&gt; -autoconf</source> +./reconf</source> <p>This generates a shell-script called <code>configure</code>. It is tempting to run this script directly as is normally the case, but wait a minute. --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Fri Jan 04 18:21:47 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 4791 invoked from network); 4 Jan 2008 18:21:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jan 2008 18:21:47 -0000 Received: (qmail 4867 invoked by uid 500); 4 Jan 2008 18:21:36 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 4845 invoked by uid 500); 4 Jan 2008 18:21:36 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 4834 invoked by uid 99); 4 Jan 2008 18:21:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 10:21:36 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 18:21:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A3EE81A9832; Fri, 4 Jan 2008 10:21:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608951 - in /xerces/c/trunk/src/xercesc/validators/datatype: AnyURIDatatypeValidator.cpp AnyURIDatatypeValidator.hpp Date: Fri, 04 Jan 2008 18:21:23 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Fri Jan 4 10:21:22 2008 New Revision: 608951 URL: http://svn.apache.org/viewvc?rev=608951&view=rev Log: - If the URI contains several non-ASCII characters, the optimistic allocation (len*3) could run out of space (as each non-ASCII char would be replaced by at least 2 UTF-8 bytes, and each of them by 3 characters) -> use an XMLBuffer that can grow past the initial allocation - the static buffers used by printf were 2 bytes long, but sprintf would also write the NULL terminator - the converted UTF-8 string was converted partially, as the loop used the length of the original string instead of the length of the UTF-8 string - each UTF-8 byte was assumed to be a signed byte, but XMLByte is unsigned; so the b<0 test was never true (and why add 256 to the signed value to make it positive? the new number would be different) and the next text was accessing a static array of 128 items with indexes between 0 and 255 Modified: xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp Modified: xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp?rev=608951&r1=608950&r2=608951&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp Fri Jan 4 10:21:22 2008 @@ -25,6 +25,7 @@ #include <stdio.h> #include <xercesc/util/OutOfMemoryException.hpp> #include <xercesc/util/XMLUTF8Transcoder.hpp> +#include <xercesc/framework/XMLBuffer.hpp> #include <xercesc/validators/datatype/AnyURIDatatypeValidator.hpp> #include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp> #include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp> @@ -82,10 +83,9 @@ if (len) { // Encode special characters using XLink 5.4 algorithm - XMLCh* encoded = (XMLCh*)manager->allocate((len*3+1) * sizeof(XMLCh)); - ArrayJanitor<XMLCh> encodedJan(encoded, manager); + XMLBuffer encoded((len*3)+1, manager); encode(content, len, encoded, manager); - validURI = XMLUri888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isValidURI(true, encoded, true); + validURI = XMLUri888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isValidURI(true, encoded.getRawBuffer(), true); } } catch(const OutOfMemoryException&) @@ -113,7 +113,7 @@ * special ASCII characters: 0x00~0x1F, 0x7F, ' ', '<', '>', etc. * and non-ASCII characters (whose value >= 128). ***/ -void AnyURIDatatypeValidator888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ncode(const XMLCh* const content, const XMLSize_t len, XMLCh* encoded, MemoryManager* const manager) +void AnyURIDatatypeValidator888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ncode(const XMLCh* const content, const XMLSize_t len, XMLBuffer& encoded, MemoryManager* const manager) { static const bool needEscapeMap[] = { true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , /* 0x00 to 0x0F need escape */ @@ -139,15 +139,15 @@ if (needEscapeMap[ch]) { - char tempStr[2] = "\0"; + char tempStr[3] = "\0"; sprintf(tempStr, "%02X", ch); - encoded[bufferIndex++] = '%'; - encoded[bufferIndex++] = (XMLCh)tempStr[0]; - encoded[bufferIndex++] = (XMLCh)tempStr[1]; + encoded.append('%'); + encoded.append((XMLCh)tempStr[0]); + encoded.append((XMLCh)tempStr[1]); } else { - encoded[bufferIndex++] = (XMLCh)ch; + encoded.append((XMLCh)ch); } } @@ -160,38 +160,27 @@ XMLSize_t charsEaten; XMLUTF8Transcoder transcoder(XMLUni888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gUTF8EncodingString, remContentLen*4+1, manager); - transcoder.transcodeTo(remContent, remContentLen, UTF8Byte, remContentLen*4, charsEaten, XMLTranscoder888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UnRep_RepChar); + XMLSize_t utf8Len = transcoder.transcodeTo(remContent, remContentLen, UTF8Byte, remContentLen*4, charsEaten, XMLTranscoder888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UnRep_RepChar); assert(charsEaten == remContentLen); XMLSize_t j; - for (j = 0; j < remContentLen; j++) { + for (j = 0; j < utf8Len; j++) { XMLByte b = UTF8Byte[j]; - // for non-ascii character: make it positive, then escape - if (b < 0) { - int ch = b + 256; - char tempStr[2] = "\0"; - sprintf(tempStr, "%02X", ch); - encoded[bufferIndex++] = '%'; - encoded[bufferIndex++] = (XMLCh)tempStr[0]; - encoded[bufferIndex++] = (XMLCh)tempStr[1]; - } - else if (needEscapeMap[b]) + if (b >= 128 || needEscapeMap[b]) { - char tempStr[2] = "\0"; + char tempStr[3] = "\0"; sprintf(tempStr, "%02X", b); - encoded[bufferIndex++] = '%'; - encoded[bufferIndex++] = (XMLCh)tempStr[0]; - encoded[bufferIndex++] = (XMLCh)tempStr[1]; + encoded.append('%'); + encoded.append((XMLCh)tempStr[0]); + encoded.append((XMLCh)tempStr[1]); } else { - encoded[bufferIndex++] = (XMLCh)b; + encoded.append((XMLCh)b); } } manager->deallocate(UTF8Byte); } - - encoded[bufferIndex] = (XMLCh)0; } /*** Modified: xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp?rev=608951&r1=608950&r2=608951&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp Fri Jan 4 10:21:22 2008 @@ -27,6 +27,8 @@ XERCES_CPP_NAMESPACE_BEGIN +class XMLBuffer; + class VALIDATORS_EXPORT AnyURIDatatypeValidator : public AbstractStringValidator { public: @@ -81,7 +83,7 @@ // ----------------------------------------------------------------------- AnyURIDatatypeValidator(const AnyURIDatatypeValidator&); AnyURIDatatypeValidator& operator=(const AnyURIDatatypeValidator&); - void encode(const XMLCh* const content, const XMLSize_t len, XMLCh* encoded, MemoryManager* const manager); + void encode(const XMLCh* const content, const XMLSize_t len, XMLBuffer& encoded, MemoryManager* const manager); }; XERCES_CPP_NAMESPACE_END --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Fri Jan 04 18:26:17 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 6819 invoked from network); 4 Jan 2008 18:26:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jan 2008 18:26:17 -0000 Received: (qmail 13020 invoked by uid 500); 4 Jan 2008 18:26:06 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 12950 invoked by uid 500); 4 Jan 2008 18:26:06 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 12938 invoked by uid 99); 4 Jan 2008 18:26:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 10:26:06 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2008 18:25:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 427DA1A9832; Fri, 4 Jan 2008 10:25:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608953 - in /xerces/c/branches/xerces-2/src/xercesc/validators/datatype: AnyURIDatatypeValidator.cpp AnyURIDatatypeValidator.hpp Date: Fri, 04 Jan 2008 18:25:55 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Fri Jan 4 10:25:55 2008 New Revision: 608953 URL: http://svn.apache.org/viewvc?rev=608953&view=rev Log: - If the URI contains several non-ASCII characters, the optimistic allocation (len*3) could run out of space (as each non-ASCII char would be replaced by at least 2 UTF-8 bytes, and each of them by 3 characters) -> use an XMLBuffer that can grow past the initial allocation - the static buffers used by printf were 2 bytes long, but sprintf would also write the NULL terminator - the converted UTF-8 string was converted partially, as the loop used the length of the original string instead of the length of the UTF-8 string - each UTF-8 byte was assumed to be a signed byte, but XMLByte is unsigned; so the b<0 test was never true (and why add 256 to the signed value to make it positive? the new number would be different) and the next text was accessing a static array of 128 items with indexes between 0 and 255 Modified: xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp Modified: xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp?rev=608953&r1=608952&r2=608953&view=diff ============================================================================== --- xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp (original) +++ xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.cpp Fri Jan 4 10:25:55 2008 @@ -25,6 +25,7 @@ #include <stdio.h> #include <xercesc/util/OutOfMemoryException.hpp> #include <xercesc/util/XMLUTF8Transcoder.hpp> +#include <xercesc/framework/XMLBuffer.hpp> #include <xercesc/validators/datatype/AnyURIDatatypeValidator.hpp> #include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp> #include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp> @@ -82,10 +83,9 @@ if (len) { // Encode special characters using XLink 5.4 algorithm - XMLCh* encoded = (XMLCh*)manager->allocate((len*3+1) * sizeof(XMLCh)); - ArrayJanitor<XMLCh> encodedJan(encoded, manager); + XMLBuffer encoded((len*3)+1, manager); encode(content, len, encoded, manager); - validURI = XMLUri888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isValidURI(true, encoded); + validURI = XMLUri888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isValidURI(true, encoded.getRawBuffer(), true); } } catch(const OutOfMemoryException&) @@ -113,7 +113,7 @@ * special ASCII characters: 0x00~0x1F, 0x7F, ' ', '<', '>', etc. * and non-ASCII characters (whose value >= 128). ***/ -void AnyURIDatatypeValidator888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ncode(const XMLCh* const content, const unsigned int len, XMLCh* encoded, MemoryManager* const manager) +void AnyURIDatatypeValidator888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ncode(const XMLCh* const content, const unsigned int len, XMLBuffer& encoded, MemoryManager* const manager) { static const bool needEscapeMap[] = { true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , /* 0x00 to 0x0F need escape */ @@ -139,15 +139,15 @@ if (needEscapeMap[ch]) { - char tempStr[2] = "\0"; + char tempStr[3] = "\0"; sprintf(tempStr, "%02X", ch); - encoded[bufferIndex++] = '%'; - encoded[bufferIndex++] = (XMLCh)tempStr[0]; - encoded[bufferIndex++] = (XMLCh)tempStr[1]; + encoded.append('%'); + encoded.append((XMLCh)tempStr[0]); + encoded.append((XMLCh)tempStr[1]); } else { - encoded[bufferIndex++] = (XMLCh)ch; + encoded.append((XMLCh)ch); } } @@ -160,38 +160,27 @@ unsigned int charsEaten; XMLUTF8Transcoder transcoder(XMLUni888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gUTF8EncodingString, remContentLen*4+1, manager); - transcoder.transcodeTo(remContent, remContentLen, UTF8Byte, remContentLen*4, charsEaten, XMLTranscoder888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UnRep_RepChar); + unsigned int utf8Len = transcoder.transcodeTo(remContent, remContentLen, UTF8Byte, remContentLen*4, charsEaten, XMLTranscoder888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UnRep_RepChar); assert(charsEaten == remContentLen); unsigned int j; - for (j = 0; j < remContentLen; j++) { + for (j = 0; j < utf8Len; j++) { XMLByte b = UTF8Byte[j]; - // for non-ascii character: make it positive, then escape - if (b < 0) { - int ch = b + 256; - char tempStr[2] = "\0"; - sprintf(tempStr, "%02X", ch); - encoded[bufferIndex++] = '%'; - encoded[bufferIndex++] = (XMLCh)tempStr[0]; - encoded[bufferIndex++] = (XMLCh)tempStr[1]; - } - else if (needEscapeMap[b]) + if (b >= 128 || needEscapeMap[b]) { - char tempStr[2] = "\0"; + char tempStr[3] = "\0"; sprintf(tempStr, "%02X", b); - encoded[bufferIndex++] = '%'; - encoded[bufferIndex++] = (XMLCh)tempStr[0]; - encoded[bufferIndex++] = (XMLCh)tempStr[1]; + encoded.append('%'); + encoded.append((XMLCh)tempStr[0]); + encoded.append((XMLCh)tempStr[1]); } else { - encoded[bufferIndex++] = (XMLCh)b; + encoded.append((XMLCh)b); } } manager->deallocate(UTF8Byte); } - - encoded[bufferIndex] = (XMLCh)0; } /*** Modified: xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp?rev=608953&r1=608952&r2=608953&view=diff ============================================================================== --- xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp (original) +++ xerces/c/branches/xerces-2/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp Fri Jan 4 10:25:55 2008 @@ -27,6 +27,8 @@ XERCES_CPP_NAMESPACE_BEGIN +class XMLBuffer; + class VALIDATORS_EXPORT AnyURIDatatypeValidator : public AbstractStringValidator { public: @@ -81,7 +83,7 @@ // ----------------------------------------------------------------------- AnyURIDatatypeValidator(const AnyURIDatatypeValidator&); AnyURIDatatypeValidator& operator=(const AnyURIDatatypeValidator&); - void encode(const XMLCh* const content, const unsigned int len, XMLCh* encoded, MemoryManager* const manager); + void encode(const XMLCh* const content, const unsigned int len, XMLBuffer& encoded, MemoryManager* const manager); }; XERCES_CPP_NAMESPACE_END --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Mon Jan 07 11:22:13 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 62459 invoked from network); 7 Jan 2008 11:22:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Jan 2008 11:22:13 -0000 Received: (qmail 74262 invoked by uid 500); 7 Jan 2008 11:22:02 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 74228 invoked by uid 500); 7 Jan 2008 11:22:02 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 74213 invoked by uid 99); 7 Jan 2008 11:22:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 03:22:01 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 11:21:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E3EEE1A9874; Mon, 7 Jan 2008 03:21:48 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r609572 - in /xerces/c/trunk/src/xercesc/util/Transcoders: Cygwin/ Win32/Win32TransService.cpp Date: Mon, 07 Jan 2008 11:21:48 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Mon Jan 7 03:21:44 2008 New Revision: 609572 URL: http://svn.apache.org/viewvc?rev=609572&view=rev Log: Replace usage of mbstowcs and wcsncpy in Win32TransService with APIs supported also on Cygwin Removed: xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/ Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp?rev=609572&r1=609571&r2=609572&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp (original) +++ xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp Mon Jan 7 03:21:44 2008 @@ -199,14 +199,14 @@ { // Transcode the name to Unicode and store that copy const XMLSize_t srcLen = strlen(encodingName); - size_t targetLen=888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4mbstowcs(NULL, encodingName, srcLen); - if(targetLen!=-1) + int targetLen=888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, encodingName, srcLen, NULL, 0); + if(targetLen!=0) { fEncodingName = (XMLCh*) XMLPlatformUtils888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gMemoryManager->allocate ( (targetLen + 1) * sizeof(XMLCh) );//new XMLCh[targetLen + 1]; - 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4mbstowcs(fEncodingName, encodingName, srcLen); + 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, encodingName, srcLen, (LPWSTR)fEncodingName, targetLen); fEncodingName[targetLen] = 0; // @@ -430,14 +430,14 @@ if (isAlias(encodingKey, aliasBuf, nameBufSz)) { const XMLSize_t srcLen = strlen(aliasBuf); - size_t targetLen=888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4mbstowcs(NULL, aliasBuf, srcLen); - if(targetLen!=-1) + int targetLen = 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, aliasBuf, srcLen, NULL, 0); + if(targetLen!=0) { XMLCh* uniAlias = (XMLCh*) XMLPlatformUtils888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gMemoryManager->allocate ( (targetLen + 1) * sizeof(XMLCh) );//new XMLCh[targetLen + 1]; - 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4mbstowcs(uniAlias, aliasBuf, srcLen); + 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, aliasBuf, srcLen, (LPWSTR)uniAlias, targetLen); uniAlias[targetLen] = 0; wcsupr(uniAlias); @@ -446,14 +446,14 @@ if (aliasedEntry) { const XMLSize_t srcLen = strlen(nameBuf); - size_t targetLen=888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4mbstowcs(NULL, nameBuf, srcLen); - if(targetLen!=-1) + int targetLen = 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, nameBuf, srcLen, NULL, 0); + if(targetLen!=0) { XMLCh* uniName = (XMLCh*) XMLPlatformUtils888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gMemoryManager->allocate ( (targetLen + 1) * sizeof(XMLCh) );//new XMLCh[targetLen + 1]; - 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4mbstowcs(uniName, nameBuf, srcLen); + 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, nameBuf, srcLen, (LPWSTR)uniName, targetLen); uniName[targetLen] = 0; wcsupr(uniName); @@ -572,8 +572,7 @@ // Get an upper cased copy of the encoding name, since we use a hash // table and we store them all in upper case. // - 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4wcsncpy(upEncoding, encodingName, upLen); - upEncoding[upLen] = 0; + XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4opyNString(upEncoding, encodingName, upLen); wcsupr(upEncoding); // Now to try to find this guy in the CP map --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Mon Jan 07 13:30:09 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 5385 invoked from network); 7 Jan 2008 13:30:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Jan 2008 13:30:08 -0000 Received: (qmail 22540 invoked by uid 500); 7 Jan 2008 13:29:58 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 22476 invoked by uid 500); 7 Jan 2008 13:29:57 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 22465 invoked by uid 99); 7 Jan 2008 13:29:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 05:29:57 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 13:29:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1C4351A9897; Mon, 7 Jan 2008 05:29:48 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r609601 - /xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp Date: Mon, 07 Jan 2008 13:29:47 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Mon Jan 7 05:29:46 2008 New Revision: 609601 URL: http://svn.apache.org/viewvc?rev=609601&view=rev Log: Avoid invoking strlen Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp?rev=609601&r1=609600&r2=609601&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp (original) +++ xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp Mon Jan 7 05:29:46 2008 @@ -198,15 +198,14 @@ , fIEId(ieId) { // Transcode the name to Unicode and store that copy - const XMLSize_t srcLen = strlen(encodingName); - int targetLen=888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, encodingName, srcLen, NULL, 0); + int targetLen=888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, encodingName, -1, NULL, 0); if(targetLen!=0) { fEncodingName = (XMLCh*) XMLPlatformUtils888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gMemoryManager->allocate ( (targetLen + 1) * sizeof(XMLCh) );//new XMLCh[targetLen + 1]; - 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, encodingName, srcLen, (LPWSTR)fEncodingName, targetLen); + 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, encodingName, -1, (LPWSTR)fEncodingName, targetLen); fEncodingName[targetLen] = 0; // @@ -429,15 +428,14 @@ // if (isAlias(encodingKey, aliasBuf, nameBufSz)) { - const XMLSize_t srcLen = strlen(aliasBuf); - int targetLen = 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, aliasBuf, srcLen, NULL, 0); + int targetLen = 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, aliasBuf, -1, NULL, 0); if(targetLen!=0) { XMLCh* uniAlias = (XMLCh*) XMLPlatformUtils888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gMemoryManager->allocate ( (targetLen + 1) * sizeof(XMLCh) );//new XMLCh[targetLen + 1]; - 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, aliasBuf, srcLen, (LPWSTR)uniAlias, targetLen); + 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, aliasBuf, -1, (LPWSTR)uniAlias, targetLen); uniAlias[targetLen] = 0; wcsupr(uniAlias); @@ -445,15 +443,14 @@ CPMapEntry* aliasedEntry = fCPMap->get(uniAlias); if (aliasedEntry) { - const XMLSize_t srcLen = strlen(nameBuf); - int targetLen = 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, nameBuf, srcLen, NULL, 0); + int targetLen = 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, nameBuf, -1, NULL, 0); if(targetLen!=0) { XMLCh* uniName = (XMLCh*) XMLPlatformUtils888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gMemoryManager->allocate ( (targetLen + 1) * sizeof(XMLCh) );//new XMLCh[targetLen + 1]; - 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, nameBuf, srcLen, (LPWSTR)uniName, targetLen); + 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, nameBuf, -1, (LPWSTR)uniName, targetLen); uniName[targetLen] = 0; wcsupr(uniName); @@ -572,7 +569,7 @@ // Get an upper cased copy of the encoding name, since we use a hash // table and we store them all in upper case. // - XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4opyNString(upEncoding, encodingName, upLen); + XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4opyNString(upEncoding, encodingName, upLen); wcsupr(upEncoding); // Now to try to find this guy in the CP map --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Mon Jan 07 13:31:05 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 5746 invoked from network); 7 Jan 2008 13:31:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Jan 2008 13:31:05 -0000 Received: (qmail 23897 invoked by uid 500); 7 Jan 2008 13:30:54 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 23880 invoked by uid 500); 7 Jan 2008 13:30:54 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 23863 invoked by uid 99); 7 Jan 2008 13:30:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 05:30:54 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eos.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 13:30:50 +0000 Received: from eos.apache.org (localhost [83.161.120.155]) by eos.apache.org (Postfix) with ESMTP id 87583D2D5 for <rebeccamedina@example.net>; Mon, 7 Jan 2008 13:30:41 +0000 (GMT) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Apache Wiki <rebeccamedina@example.net> To: rebeccamedina@example.net Date: Mon, 07 Jan 2008 13:30:41 -0000 Message-ID: <rebeccamedina@example.net> Subject: [Xerces Wiki] Update of "XercescBuildStatus" by AlbertoMassari X-Virus-Checked: Checked by ClamAV on apache.org Dear Wiki user, You have subscribed to a wiki page or wiki category on "Xerces Wiki" for change notification. The following page has been changed by AlbertoMassari: http://wiki.apache.org/xerces/XercescBuildStatus The comment on the change is: Add Cygwin build ------------------------------------------------------------------------------ || Windows 2000 || MSVC 6 || 474935 || 11/21/2006 || packageBinaries.pl: all | Release ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || || cargilld || ||<|2> MSYS 1.0.11/MinGW 5.03 on Windows XP ||<|2> gcc 3.4.2 mingw-special ||<|2> 558109 || 7/24/2007 || {{{./configure}}} [[BR]]Net Accessor=winsock; [[BR]]File Manager=Windows; [[BR]]Atomic Op=Windows; [[BR]]Mutex=Windows; [[BR]]Msg Loader=inmemory; [[BR]]Transcoder=windows ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || Only static libraries are built || amassari || || 7/24/2007 || {{{./configure LDFLAGS=-no-undefined}}} [[BR]]Net Accessor=winsock; [[BR]]File Manager=Windows; [[BR]]Atomic Op=Windows; [[BR]]Mutex=Windows; [[BR]]Msg Loader=inmemory; [[BR]]Transcoder=windows ||<style="background-color: red;"> Fail || N/A || Linker crashes [[BR]]"Creating library file: .libs/libxerces.dll.a... [[BR]]c:\MinGW\bin\..\lib\gcc\mingw32\3.4.2\..\..\..\..\mingw32\bin\ld.exe: [[BR]]BFD 2.15.91 20040904 assertion fail ../../src/bfd/cofflink.c:1929" || amassari || - || Cygwin 1.5.21 shell on Windows XP || MS Visual Studio 6.0 SP6 || 477691 || 11/21/2006 || {{{./configure}}} [[BR]]Net Accessor=winsock; [[BR]]File Manager=Windows; [[BR]]Atomic Op=Windows; [[BR]]Mutex=Windows; [[BR]]Msg Loader=inmemory; [[BR]]Transcoder=windows ||<style="background-color: red;"> Fail || N/A || Build process uses MS 'LIB' to create libraries, and 'ar' (ver. 2.17.50) to unpack them before linking, but 'ar' doesn't support paths inside lib files || amassari || + ||<|2> Cygwin 1.5.21 shell on Windows XP || MS Visual Studio 6.0 SP6 || 477691 || 11/21/2006 || {{{./configure}}} [[BR]]Net Accessor=winsock; [[BR]]File Manager=Windows; [[BR]]Atomic Op=Windows; [[BR]]Mutex=Windows; [[BR]]Msg Loader=inmemory; [[BR]]Transcoder=windows ||<style="background-color: red;"> Fail || N/A || Build process uses MS 'LIB' to create libraries, and 'ar' (ver. 2.17.50) to unpack them before linking, but 'ar' doesn't support paths inside lib files || amassari || + || gcc 3.4.4 (cygming special) || 609601 || 01/07/2008 || {{{./configure LDFLAGS=-no-undefined}}} [[BR]]Net Accessor=winsock; [[BR]]File Manager=Windows; [[BR]]Atomic Op=Windows; [[BR]]Mutex=Windows; [[BR]]Msg Loader=inmemory; [[BR]]Transcoder=windows ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || || amassari || ||<|2> AIX 5.2 ||<|2> xlC V7 ||<|2> 474935 || 11/21/2006 || packageBinaries.pl: -m inmem -n socket -t native -b 32 ||<style="background-color: green;"> Success ||<style="background-color: red;"> Fail || domtest and domtypeinfotest are both failing with an illegal instruction || cargilld || || 11/21/2006 || packageBinaries.pl: -m inmem -n socket -t native -b 64 ||<style="background-color: red;"> Fail||<style="background-color: red;"> Fail || Fails at the link step || cargilld || ||<|3> Solaris 2.9 ||<|2> Forte Compiler 6.2 ||<|2> 474935 || 11/21/2006 || packageBinaries.pl: -m inmem -n socket -t native -b 32 ||<style="background-color: red;"> Fail||<style="background-color: red;"> Fail || checking for which Mutex Manager to use... [[BR]]configure: error: Xerces cannot function without mutex support || cargilld || --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Mon Jan 07 17:50:45 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 39137 invoked from network); 7 Jan 2008 17:50:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Jan 2008 17:50:45 -0000 Received: (qmail 73203 invoked by uid 500); 7 Jan 2008 17:50:34 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 73179 invoked by uid 500); 7 Jan 2008 17:50:34 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 73168 invoked by uid 99); 7 Jan 2008 17:50:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 09:50:34 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eos.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 17:50:19 +0000 Received: from eos.apache.org (localhost [83.161.120.155]) by eos.apache.org (Postfix) with ESMTP id 88C5FD2D5 for <rebeccamedina@example.net>; Mon, 7 Jan 2008 17:50:24 +0000 (GMT) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Apache Wiki <rebeccamedina@example.net> To: rebeccamedina@example.net Date: Mon, 07 Jan 2008 17:50:24 -0000 Message-ID: <rebeccamedina@example.net> Subject: [Xerces Wiki] Update of "XercescBuildStatus" by AlbertoMassari X-Virus-Checked: Checked by ClamAV on apache.org Dear Wiki user, You have subscribed to a wiki page or wiki category on "Xerces Wiki" for change notification. The following page has been changed by AlbertoMassari: http://wiki.apache.org/xerces/XercescBuildStatus The comment on the change is: Add Intel Compiler on Linux ------------------------------------------------------------------------------ ||<|3> Ubuntu Linux 6.06 ||<|3> gcc 4.0.3 ||<|3> 558739 || 7/23/2007 || {{{./configure --enable-netaccessor-socket --enable-msgloader-iconv --enable-transcoder-iconv}}} [[BR]]Net Accessor: socket[[BR]]File Manager: POSIX[[BR]]Atomic Op Manager: POSIX[[BR]]Mutex Manager: POSIX[[BR]]Message Loader: iconv[[BR]]Transcoder: iconv ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || || amassari || || 7/23/2007 || {{{./configure --enable-netaccessor-curl --enable-msgloader-inmemory --enable-transcoder-gnuiconv}}} [[BR]]Net Accessor=curl; [[BR]]File Manager=POSIX; [[BR]]Atomic Op=POSIX; [[BR]]Mutex=POSIX; [[BR]]Msg Loader=inmemory; [[BR]]Transcoder=gnuiconv ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || || amassari || || 7/23/2007 || {{{./configure}}} [[BR]]Net Accessor=curl; [[BR]]File Manager=POSIX; [[BR]]Atomic Op=POSIX; [[BR]]Mutex=POSIX; [[BR]]Msg Loader=icu; [[BR]]Transcoder=icu ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || || amassari || + || Ubuntu Linux 7.10 || Intel Compiler 10.1 || 609601 || 01/07/2008 || {{{./configure --enable-netaccessor-curl --enable-msgloader-inmemory --enable-transcoder-gnuiconv CXX=icpc CC=icc}}} [[BR]]Net Accessor: curl[[BR]]File Manager: POSIX[[BR]]Atomic Op Manager: POSIX[[BR]]Mutex Manager: POSIX[[BR]]Message Loader: inmemory[[BR]]Transcoder: gnuiconv ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || || amassari || || RHEL AS 3 (PPC)|| GCC 3.2.3 || 474935 || 11/21/2006 || packageBinaries.pl: -m inmem -n socket -t native -b 32 ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || || cargilld || || RHEL AS 4 (Intel) || GCC 3.4.3 || 474935 || 11/21/2006 || packageBinaries.pl: -m inmem -n socket -t native -b 32 ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || || cargilld || || SuSE Linux 8.0 (AMD) || GCC 3.2.2 || 474935 || 11/21/2006 || packageBinaries.pl: -m inmem -n socket -t native -b 64 ||<style="background-color: green;"> Success ||<style="background-color: green;"> Success || || cargilld || --------------------------------------------------------------------- To unsubscribe, e-mail: rebeccamedina@example.net For additional commands, e-mail: rebeccamedina@example.net From commitsrebeccamedina@example.net Tue Jan 08 08:33:38 2008 Return-Path: <commitsrebeccamedina@example.net> Delivered-To: rebeccamedina@example.net Received: (qmail 29358 invoked from network); 8 Jan 2008 08:33:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 8 Jan 2008 08:33:38 -0000 Received: (qmail 8565 invoked by uid 500); 8 Jan 2008 08:33:27 -0000 Delivered-To: rebeccamedina@example.net Received: (qmail 8516 invoked by uid 500); 8 Jan 2008 08:33:27 -0000 Mailing-List: contact rebeccamedina@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:rebeccamedina@example.net> List-Unsubscribe: <mailto:rebeccamedina@example.net> List-Post: <mailto:rebeccamedina@example.net> List-Id: <commits.xerces.apache.org> Delivered-To: mailing list rebeccamedina@example.net Received: (qmail 8505 invoked by uid 99); 8 Jan 2008 08:33:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2008 00:33:27 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2008 08:33:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B9FD1A9896; Tue, 8 Jan 2008 00:33:09 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r609904 - /xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp Date: Tue, 08 Jan 2008 08:33:08 -0000 To: rebeccamedina@example.net From: rebeccamedina@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <rebeccamedina@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: amassari Date: Tue Jan 8 00:33:07 2008 New Revision: 609904 URL: http://svn.apache.org/viewvc?rev=609904&view=rev Log: Whitespace fixup Modified: xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp Modified: xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp?rev=609904&r1=609903&r2=609904&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp (original) +++ xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp Tue Jan 8 00:33:07 2008 @@ -55,7 +55,7 @@ const unsigned int RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4PROHIBIT_FIXED_STRING_OPTIMIZATION = 256; const unsigned int RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4XMLSCHEMA_MODE = 512; const unsigned int RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SPECIAL_COMMA = 1024; -RangeToken* RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4WordRange = 0; +RangeToken* RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4WordRange = 0; static void @@ -69,7 +69,7 @@ bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matchIgnoreCase(const XMLInt32 ch1, - const XMLInt32 ch2) + const XMLInt32 ch2) { if (ch1 >= 0x10000) { @@ -113,7 +113,7 @@ return (0==XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ompareNIString(&char1, &char2, 1)); } - } +} @@ -121,36 +121,36 @@ // RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ontext: Constructors and Destructor // --------------------------------------------------------------------------- RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ontext888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ontext(MemoryManager* const manager) : - fAdoptMatch(false) + fAdoptMatch(false) , fStart(0) - , fLimit(0) - , fLength(0) - , fSize(0) + , fLimit(0) + , fLength(0) + , fSize(0) , fStringMaxLen(0) - , fOffsets(0) - , fMatch(0) - , fString(0) + , fOffsets(0) + , fMatch(0) + , fString(0) , fMemoryManager(manager) { } RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ontext888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ontext(Context* src) : - fAdoptMatch(false) + fAdoptMatch(false) , fStart(src->fStart) - , fLimit(src->fLimit) - , fLength(src->fLength) - , fSize(src->fSize) + , fLimit(src->fLimit) + , fLength(src->fLength) + , fSize(src->fSize) , fStringMaxLen(src->fStringMaxLen) - , fOffsets(0) - , fMatch(0) - , fString(src->fString) + , fOffsets(0) + , fMatch(0) + , fString(src->fString) , fMemoryManager(src->fMemoryManager) { - if(src->fOffsets) + if(src->fOffsets) { - fOffsets = (int*) fMemoryManager->allocate(fSize* sizeof(int)); - for (int i = 0; i< fSize; i++) - fOffsets[i] = src->fOffsets[i]; + fOffsets = (int*) fMemoryManager->allocate(fSize* sizeof(int)); + for (int i = 0; i< fSize; i++) + fOffsets[i] = src->fOffsets[i]; } if(src->fMatch) { @@ -162,25 +162,25 @@ RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ontext& RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ontext888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4operator= (const RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ontext& other) { fStart=other.fStart; - fLimit=other.fLimit; - fLength=other.fLength; - fSize=other.fSize; + fLimit=other.fLimit; + fLength=other.fLength; + fSize=other.fSize; fStringMaxLen=other.fStringMaxLen; - fString=other.fString; + fString=other.fString; if (fOffsets) fMemoryManager->deallocate(fOffsets);//delete [] fOffsets; fOffsets=0; - if (fAdoptMatch) - delete fMatch; + if (fAdoptMatch) + delete fMatch; fMatch=0; - fAdoptMatch=false; + fAdoptMatch=false; fMemoryManager=other.fMemoryManager; - if(other.fOffsets) + if(other.fOffsets) { - fOffsets = (int*) fMemoryManager->allocate(fSize* sizeof(int)); - for (int i = 0; i< fSize; i++) - fOffsets[i] = other.fOffsets[i]; + fOffsets = (int*) fMemoryManager->allocate(fSize* sizeof(int)); + for (int i = 0; i< fSize; i++) + fOffsets[i] = other.fOffsets[i]; } if(other.fMatch) { @@ -195,8 +195,8 @@ if (fOffsets) fMemoryManager->deallocate(fOffsets);//delete [] fOffsets; - if (fAdoptMatch) - delete fMatch; + if (fAdoptMatch) + delete fMatch; } // --------------------------------------------------------------------------- @@ -210,52 +210,48 @@ { fString = string; fStringMaxLen = stringLen; - fStart = start; - fLimit = limit; - fLength = fLimit - fStart; - if (fAdoptMatch) - delete fMatch; - fMatch = 0; - - if (fSize != noClosures) { + fStart = start; + fLimit = limit; + fLength = fLimit - fStart; + if (fAdoptMatch) + delete fMatch; + fMatch = 0; - if (fOffsets) + if (fSize != noClosures) { + if (fOffsets) fMemoryManager->deallocate(fOffsets);//delete [] fOffsets; - fOffsets = (int*) fMemoryManager->allocate(noClosures * sizeof(int));//new int[noClosures]; - } + fOffsets = (int*) fMemoryManager->allocate(noClosures * sizeof(int));//new int[noClosures]; + } - fSize = noClosures; + fSize = noClosures; - for (int i = 0; i< fSize; i++) - fOffsets[i] = -1; + for (int i = 0; i< fSize; i++) + fOffsets[i] = -1; } bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ontext888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4nextCh(XMLInt32& ch, XMLSize_t& offset, - const short direction) + const short direction) { + ch = fString[offset]; - ch = fString[offset]; - - if (RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isHighSurrogate(ch)) { - if ((offset + 1 < fLimit) && (direction > 0) && - RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isLowSurrogate(fString[offset+1])) { - - ch = RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4omposeFromSurrogate(ch, fString[++offset]); - } - else - return false; - } - else if (RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isLowSurrogate(ch)) { - if ((offset - 1 >= 0) && (direction <= 0) && - RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isHighSurrogate(fString[offset-1])) { - - ch = RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4omposeFromSurrogate(fString[--offset], ch); - } - else - return false; + if (RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isHighSurrogate(ch)) { + if ((offset + 1 < fLimit) && (direction > 0) && + RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isLowSurrogate(fString[offset+1])) { + ch = RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4omposeFromSurrogate(ch, fString[++offset]); + } + else + return false; } + else if (RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isLowSurrogate(ch)) { + if ((offset -1 >= 0) && (direction <= 0) && + RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4isHighSurrogate(fString[offset-1])) { + ch = RegxUtil888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4omposeFromSurrogate(fString[--offset], ch); + } + else + return false; + } - return true; + return true; } // --------------------------------------------------------------------------- @@ -266,30 +262,30 @@ RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4RegularExpression(const char* const pattern, MemoryManager* const manager) - :fHasBackReferences(false), - fFixedStringOnly(false), - fNoGroups(0), - fMinLength(0), - fNoClosures(0), - fOptions(0), - fBMPattern(0), - fPattern(0), - fFixedString(0), - fOperations(0), - fTokenTree(0), - fFirstChar(0), + :fHasBackReferences(false), + fFixedStringOnly(false), + fNoGroups(0), + fMinLength(0), + fNoClosures(0), + fOptions(0), + fBMPattern(0), + fPattern(0), + fFixedString(0), + fOperations(0), + fTokenTree(0), + fFirstChar(0), fOpFactory(manager), fTokenFactory(0), fMemoryManager(manager) { CleanupType cleanup(this, &RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4leanUp); - try { + try { - XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(pattern, fMemoryManager); + XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(pattern, fMemoryManager); ArrayJanitor<XMLCh> janBuf(tmpBuf, fMemoryManager); - setPattern(tmpBuf); - } + setPattern(tmpBuf); + } catch(const OutOfMemoryException&) { cleanup.release(); @@ -301,34 +297,34 @@ } RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4RegularExpression(const char* const pattern, - const char* const options, + const char* const options, MemoryManager* const manager) - :fHasBackReferences(false), - fFixedStringOnly(false), - fNoGroups(0), - fMinLength(0), - fNoClosures(0), - fOptions(0), - fBMPattern(0), - fPattern(0), - fFixedString(0), - fOperations(0), - fTokenTree(0), - fFirstChar(0), + :fHasBackReferences(false), + fFixedStringOnly(false), + fNoGroups(0), + fMinLength(0), + fNoClosures(0), + fOptions(0), + fBMPattern(0), + fPattern(0), + fFixedString(0), + fOperations(0), + fTokenTree(0), + fFirstChar(0), fOpFactory(manager), fTokenFactory(0), fMemoryManager(manager) { CleanupType cleanup(this, &RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4leanUp); - try { + try { - XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(pattern, fMemoryManager); - ArrayJanitor<XMLCh> janBuf(tmpBuf, fMemoryManager); - XMLCh* tmpOptions = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(options, fMemoryManager); - ArrayJanitor<XMLCh> janOps(tmpOptions, fMemoryManager); - setPattern(tmpBuf, tmpOptions); - } + XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(pattern, fMemoryManager); + ArrayJanitor<XMLCh> janBuf(tmpBuf, fMemoryManager); + XMLCh* tmpOptions = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(options, fMemoryManager); + ArrayJanitor<XMLCh> janOps(tmpOptions, fMemoryManager); + setPattern(tmpBuf, tmpOptions); + } catch(const OutOfMemoryException&) { cleanup.release(); @@ -342,28 +338,28 @@ RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4RegularExpression(const XMLCh* const pattern, MemoryManager* const manager) - :fHasBackReferences(false), - fFixedStringOnly(false), - fNoGroups(0), - fMinLength(0), - fNoClosures(0), - fOptions(0), - fBMPattern(0), - fPattern(0), - fFixedString(0), - fOperations(0), - fTokenTree(0), - fFirstChar(0), + :fHasBackReferences(false), + fFixedStringOnly(false), + fNoGroups(0), + fMinLength(0), + fNoClosures(0), + fOptions(0), + fBMPattern(0), + fPattern(0), + fFixedString(0), + fOperations(0), + fTokenTree(0), + fFirstChar(0), fOpFactory(manager), fTokenFactory(0), fMemoryManager(manager) { CleanupType cleanup(this, &RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4leanUp); - try { + try { - setPattern(pattern); - } + setPattern(pattern); + } catch(const OutOfMemoryException&) { cleanup.release(); @@ -375,30 +371,30 @@ } RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4RegularExpression(const XMLCh* const pattern, - const XMLCh* const options, + const XMLCh* const options, MemoryManager* const manager) - :fHasBackReferences(false), - fFixedStringOnly(false), - fNoGroups(0), - fMinLength(0), - fNoClosures(0), - fOptions(0), - fBMPattern(0), - fPattern(0), - fFixedString(0), - fOperations(0), - fTokenTree(0), - fFirstChar(0), + :fHasBackReferences(false), + fFixedStringOnly(false), + fNoGroups(0), + fMinLength(0), + fNoClosures(0), + fOptions(0), + fBMPattern(0), + fPattern(0), + fFixedString(0), + fOperations(0), + fTokenTree(0), + fFirstChar(0), fOpFactory(manager), fTokenFactory(0), fMemoryManager(manager) { CleanupType cleanup(this, &RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4leanUp); - try { + try { - setPattern(pattern, options); - } + setPattern(pattern, options); + } catch(const OutOfMemoryException&) { cleanup.release(); @@ -411,7 +407,7 @@ RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4~RegularExpression() { - cleanUp(); + cleanUp(); } // --------------------------------------------------------------------------- @@ -427,27 +423,28 @@ // ? new (fMemoryManager) ParserForXMLSchema(fMemoryManager) // : new (fMemoryManager) RegxParser(fMemoryManager); if (isSet(options, XMLSCHEMA_MODE)) - return new (manager) ParserForXMLSchema(manager); + return new (manager) ParserForXMLSchema(manager); return new (manager) RegxParser(manager); } void RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4setPattern(const XMLCh* const pattern, - const XMLCh* const options) { + const XMLCh* const options) +{ fTokenFactory = new (fMemoryManager) TokenFactory(fMemoryManager); - fOptions = parseOptions(options); - fPattern = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4replicate(pattern, fMemoryManager); + fOptions = parseOptions(options); + fPattern = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4replicate(pattern, fMemoryManager); RegxParser* regxParser=getRegexParser(fOptions, fMemoryManager); if (regxParser) regxParser->setTokenFactory(fTokenFactory); - Janitor<RegxParser> janRegxParser(regxParser); - fTokenTree = regxParser->parse(fPattern, fOptions); - fNoGroups = regxParser->getNoParen(); - fHasBackReferences = regxParser->hasBackReferences(); + Janitor<RegxParser> janRegxParser(regxParser); + fTokenTree = regxParser->parse(fPattern, fOptions); + fNoGroups = regxParser->getNoParen(); + fHasBackReferences = regxParser->hasBackReferences(); prepare(); } @@ -456,236 +453,236 @@ // RegularExpression: Matching methods // --------------------------------------------------------------------------- bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const char* const expression - , MemoryManager* const manager) { - + , MemoryManager* const manager) +{ XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(expression, manager); ArrayJanitor<XMLCh> janBuf(tmpBuf, manager); - return matches(tmpBuf, 0, XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4stringLen(tmpBuf), 0, manager); + return matches(tmpBuf, 0, XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4stringLen(tmpBuf), 0, manager); } -bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const char* const expression, - const XMLSize_t start, const XMLSize_t end - , MemoryManager* const manager) { +bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const char* const expression + , const XMLSize_t start, const XMLSize_t end + , MemoryManager* const manager) +{ - XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(expression, manager); + XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(expression, manager); ArrayJanitor<XMLCh> janBuf(tmpBuf, manager); - return matches(tmpBuf, start, end, 0, manager); + return matches(tmpBuf, start, end, 0, manager); } -bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const char* const expression, - Match* const match - , MemoryManager* const manager) { +bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const char* const expression + , Match* const match + , MemoryManager* const manager) +{ - XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(expression, manager); + XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(expression, manager); ArrayJanitor<XMLCh> janBuf(tmpBuf, manager); - return matches(tmpBuf, 0, XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4stringLen(tmpBuf), match, manager); + return matches(tmpBuf, 0, XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4stringLen(tmpBuf), match, manager); } -bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const char* const expression, const XMLSize_t start, - const XMLSize_t end, Match* const pMatch - , MemoryManager* const manager) { +bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const char* const expression, const XMLSize_t start + , const XMLSize_t end, Match* const pMatch + , MemoryManager* const manager) +{ - XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(expression, manager); + XMLCh* tmpBuf = XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4transcode(expression, manager); ArrayJanitor<XMLCh> janBuf(tmpBuf, manager); - return matches(tmpBuf, start, end, pMatch, manager); + return matches(tmpBuf, start, end, pMatch, manager); } // --------------------------------------------------------------------------- // RegularExpression: Matching methods - Wide char version // --------------------------------------------------------------------------- -bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const XMLCh* const expression, MemoryManager* const manager) { - - return matches(expression, 0, XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4stringLen(expression), 0, manager); +bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const XMLCh* const expression, MemoryManager* const manager) +{ + return matches(expression, 0, XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4stringLen(expression), 0, manager); } -bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const XMLCh* const expression, - const XMLSize_t start, const XMLSize_t end - , MemoryManager* const manager) { - - return matches(expression, start, end, 0, manager); +bool RegularExpression888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4matches(const XMLCh* const expression + , const
{'source': 'Apache Software Foundation Public Mail Archives'}