December 2020 - Arch-excludes - Fedora Mailing-Lists

Architecture specific change in rpms/rust-av-metrics.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-av-metrics.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-av-metrics.git/commit/?id=b0.... Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit b0edbf7bb3d50539cb42690c652bd14968000c58 Author: Robert-André Mauchin <zebob.m(a)gmail.com> Date: Thu Dec 10 21:09:10 2020 +0100 Initial import Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com> diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7bc3c3d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/av-metrics-0.6.1.crate +/testfiles.tar.gz diff --git a/rust-av-metrics.spec b/rust-av-metrics.spec new file mode 100644 index 0000000..0f08f87 --- /dev/null +++ b/rust-av-metrics.spec @@ -0,0 +1,139 @@ +# Generated by rust2rpm 16 +%bcond_without check +%global debug_package %{nil} + +%global crate av-metrics + +Name: rust-%{crate} +Version: 0.6.1 +Release: 1%{?dist} +Summary: Collection of algorithms for measuring audio/video metrics + +# Upstream license specification: MIT +# https://github.com/rust-av/av-metrics/issues/215 +License: MIT +URL: https://crates.io/crates/av-metrics +Source: %{crates_source} +# git clone https://github.com/rust-av/av-metrics +# cd av-metrics/av_metrics +# tar czvf testfiles.tar.gz testfiles/ +Source1: testfiles.tar.gz + +ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif + +BuildRequires: rust-packaging + +%global _description %{expand: +Collection of algorithms for measuring audio/video metrics.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%{cargo_registry}/%{crate}-%{version_no_tilde}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+bench-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+bench-devel %{_description} + +This package contains library source intended for building other packages +which use "bench" feature of "%{crate}" crate. + +%files -n %{name}+bench-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+decode-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+decode-devel %{_description} + +This package contains library source intended for building other packages +which use "decode" feature of "%{crate}" crate. + +%files -n %{name}+decode-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+serde-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde-devel %{_description} + +This package contains library source intended for building other packages +which use "serde" feature of "%{crate}" crate. + +%files -n %{name}+serde-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+y4m-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+y4m-devel %{_description} + +This package contains library source intended for building other packages +which use "y4m" feature of "%{crate}" crate. + +%files -n %{name}+y4m-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+y4m-decode-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+y4m-decode-devel %{_description} + +This package contains library source intended for building other packages +which use "y4m-decode" feature of "%{crate}" crate. + +%files -n %{name}+y4m-decode-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep +tar xvf %{S:1} + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Wed Dec 09 18:17:03 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.6.1-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..9c1251e --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (av-metrics-0.6.1.crate) = ea97afb8d05896bba720d74469504b515569921b797b774951f51eee7b57390e2cf582acc7fe8fb24448db3862e361090778f48fd4ea5038e96f9f2a00b3831e +SHA512 (testfiles.tar.gz) = 0da3e320586e62bc891bc0282613a742203ce99526dd788fb878cee0a976f936b35c8d739f992d3a5d716b538503d143690e13ffcf707855855dfca8e5c7b0be

3 years, 4 months

1
0
0 / 0

Architecture specific change in rpms/xinetd.git

by githook-noreply＠fedoraproject.org

The package rpms/xinetd.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/xinetd.git/commit/?id=3fdca86988d.... Change: -%ifarch sparcv9 sparc64 Thanks. Full change: ============ commit 3fdca86988d0d136a35f04a898258a1348c5cee8 Author: Miro Hrončok <miro(a)hroncok.cz> Date: Thu Dec 10 18:00:46 2020 +0100 Orphaned for 6+ weeks diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bb93fed..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -xinetd-2.3.14.tar.gz -/xinetd-2.3.15.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index d77687c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -77358478fd58efa6366accae99b8b04c xinetd-2.3.15.tar.gz diff --git a/xinetd-2.3.14-autoconf.patch b/xinetd-2.3.14-autoconf.patch deleted file mode 100644 index 7ce2276..0000000 --- a/xinetd-2.3.14-autoconf.patch +++ /dev/null @@ -1,251 +0,0 @@ ---- xinetd-2.3.14/configure.in 2009-07-27 13:27:59.000000000 +0200 -+++ xinetd-2.3.14-mod/configure.in 2009-07-29 10:05:44.000000000 +0200 -@@ -20,34 +20,34 @@ AC_CHECK_FUNCS(ecvt, , - AC_CHECK_FUNCS(gcvt, , - AC_CHECK_LIB(m, gcvt)) - --AC_CHECK_FUNC(strerror, [AC_DEFINE(HAVE_STRERROR)]) --AC_CHECK_FUNC(strcasecmp, [AC_DEFINE(HAVE_STRCASECMP)]) -+AC_CHECK_FUNC(strerror, [AC_DEFINE(HAVE_STRERROR, 1, "")]) -+AC_CHECK_FUNC(strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1, "")]) - AC_CHECK_FUNC(socket, , - AC_CHECK_LIB(socket, socket, , - AC_CHECK_LIB(nsl, socket))) - AC_CHECK_FUNC(inet_aton, , - AC_CHECK_LIB(nsl, inet_aton, , - AC_CHECK_LIB(socket, inet_aton, , -- AC_CHECK_LIB(resolv, inet_aton, ,[AC_DEFINE(NO_INET_ATON)])))) --AC_CHECK_FUNC(setenv,[AC_DEFINE(HAVE_SETENV)]) --AC_CHECK_FUNC(strsignal, [AC_DEFINE(HAVE_STRSIGNAL)]) --AC_CHECK_LIB(c, sys_siglist, [AC_DEFINE(HAVE_SYS_SIGLIST)]) --AC_CHECK_FUNC(gai_strerror,[AC_DEFINE(HAVE_GAI_STRERROR)]) --AC_CHECK_FUNC(freeaddrinfo,[AC_DEFINE(HAVE_FREEADDRINFO)]) --AC_CHECK_FUNC(getaddrinfo,[AC_DEFINE(HAVE_GETADDRINFO)]) -+ AC_CHECK_LIB(resolv, inet_aton, ,[AC_DEFINE(NO_INET_ATON, 1, "")])))) -+AC_CHECK_FUNC(setenv,[AC_DEFINE(HAVE_SETENV, 1, "")]) -+AC_CHECK_FUNC(strsignal, [AC_DEFINE(HAVE_STRSIGNAL, 1, "")]) -+AC_CHECK_LIB(c, sys_siglist, [AC_DEFINE(HAVE_SYS_SIGLIST, 1, "")]) -+AC_CHECK_FUNC(gai_strerror,[AC_DEFINE(HAVE_GAI_STRERROR, 1, "")]) -+AC_CHECK_FUNC(freeaddrinfo,[AC_DEFINE(HAVE_FREEADDRINFO, 1, "")]) -+AC_CHECK_FUNC(getaddrinfo,[AC_DEFINE(HAVE_GETADDRINFO, 1, "")]) - - AC_CHECK_HEADERS(sys/types.h sys/termios.h termios.h sys/ioctl.h sys/select.h rpc/rpc.h rpc/rpcent.h sys/file.h ftw.h machine/reg.h netdb.h) --AC_CHECK_HEADER(sys/resource.h, [AC_DEFINE(HAVE_SYS_RESOURCE_H)]) --AC_CHECK_HEADER(arpa/inet.h, [AC_DEFINE(HAVE_ARPA_INET_H)]) --AC_CHECK_HEADER(grp.h, [AC_DEFINE(HAVE_GRP_H)]) --AC_CHECK_HEADER(rpc/pmap_clnt.h, [AC_DEFINE(HAVE_RPC_PMAP_CLNT_H)]) --AC_CHECK_HEADER(sys/socket.h, [AC_DEFINE(HAVE_SYS_SOCKET_H)]) --AC_CHECK_HEADER(sys/signal.h, [AC_DEFINE(HAVE_SYS_SIGNAL_H)]) --AC_CHECK_HEADER(crypt.h, [AC_DEFINE(HAVE_CRYPT_H)]) --AC_CHECK_HEADER(stdint.h, [AC_DEFINE(HAVE_STDINT_H)]) --AC_CHECK_HEADER(stdbool.h, [AC_DEFINE(HAVE_STDBOOL_H)]) --AC_CHECK_HEADER(sys/filio.h, [AC_DEFINE(HAVE_SYS_FILIO_H)]) --AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [AC_DEFINE(HAVE_DNSREGISTRATION) AC_DEFINE(HAVE_MDNS)]) -+AC_CHECK_HEADER(sys/resource.h, [AC_DEFINE(HAVE_SYS_RESOURCE_H, 1, "")]) -+AC_CHECK_HEADER(arpa/inet.h, [AC_DEFINE(HAVE_ARPA_INET_H, 1, "")]) -+AC_CHECK_HEADER(grp.h, [AC_DEFINE(HAVE_GRP_H, 1, "")]) -+AC_CHECK_HEADER(rpc/pmap_clnt.h, [AC_DEFINE(HAVE_RPC_PMAP_CLNT_H, 1, "")]) -+AC_CHECK_HEADER(sys/socket.h, [AC_DEFINE(HAVE_SYS_SOCKET_H, 1, "")]) -+AC_CHECK_HEADER(sys/signal.h, [AC_DEFINE(HAVE_SYS_SIGNAL_H, 1, "")]) -+AC_CHECK_HEADER(crypt.h, [AC_DEFINE(HAVE_CRYPT_H, 1, "")]) -+AC_CHECK_HEADER(stdint.h, [AC_DEFINE(HAVE_STDINT_H, 1, "")]) -+AC_CHECK_HEADER(stdbool.h, [AC_DEFINE(HAVE_STDBOOL_H, 1, "")]) -+AC_CHECK_HEADER(sys/filio.h, [AC_DEFINE(HAVE_SYS_FILIO_H, 1, "")]) -+AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [AC_DEFINE(HAVE_DNSREGISTRATION, 1, "") AC_DEFINE(HAVE_MDNS, 1, "")]) - - AC_ARG_WITH(howl, [ --with-howl=PATH Compile in howl support. - PATH is the prefix where howl is installed, -@@ -56,7 +56,7 @@ AC_ARG_WITH(howl, [ --with-howl=PATH - OLDLDFLAGS=$LDFLAGS; LDFLAGS="-L$withval/lib/ $LDFLAGS"; - OLDCPPFLAGS=$CPPFLAGS; CPPFLAGS="-I$withval/include/howl/ $CPPFLAGS"; - AC_CHECK_HEADER($withval/include/howl/howl.h, -- [AC_DEFINE(HAVE_HOWL) AC_DEFINE(HAVE_MDNS)], -+ [AC_DEFINE(HAVE_HOWL, 1, "") AC_DEFINE(HAVE_MDNS, 1, "")], - [CFLAGS=$OLDCFLAGS; LDFLAGS=$OLDLDFLAGS; CPPFLAGS=$OLDCPPFLAGS;]) - AC_CHECK_LIB(howl, sw_discovery_publish, [LIBS="-lhowl $LIBS"], [ - OLDLIBS=$LIBS; LIBS="-lpthread $LIBS"; -@@ -88,7 +88,7 @@ AC_CACHE_CHECK([for struct addrinfo], ac - ) - ]) - if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then -- AC_DEFINE(HAVE_STRUCT_ADDRINFO) -+ AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, "") - fi - - AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [ -@@ -103,7 +103,7 @@ AC_CACHE_CHECK([for struct in6_addr], ac - ) - ]) - if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then -- AC_DEFINE(HAVE_STRUCT_IN6_ADDR) -+ AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1, "") - fi - - AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [ -@@ -118,7 +118,7 @@ AC_CACHE_CHECK([for struct sockaddr_in6] - ) - ]) - if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then -- AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6) -+ AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6, 1, "") - fi - - AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage, [ -@@ -133,15 +133,15 @@ AC_CACHE_CHECK([for struct sockaddr_stor - ) - ]) - if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then -- AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE) -+ AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, "") - fi - - - case "$target_os" in - - solaris*) -- AC_DEFINE(N0_SIGLIST) -- AC_DEFINE(solaris) -+ AC_DEFINE(N0_SIGLIST, 1, "") -+ AC_DEFINE(solaris, 1, "") - - AC_MSG_CHECKING(whether to compile in loadavg) - AC_ARG_WITH(loadavg, -@@ -153,12 +153,12 @@ solaris*) - yes) - AC_MSG_RESULT(yes) - AC_CHECK_LIB(kstat, main) -- AC_CHECK_HEADER(kstat.h, [AC_DEFINE(HAVE_KSTAT_H)]) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_CHECK_HEADER(kstat.h, [AC_DEFINE(HAVE_KSTAT_H, 1, "")]) -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - *) - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - esac ], AC_MSG_RESULT(no) ) - ;; -@@ -172,11 +172,11 @@ osf*) - ;; - yes) - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - *) - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - esac ], AC_MSG_RESULT(no)) - ;; -@@ -191,18 +191,18 @@ linux*|freebsd*) - ;; - yes) - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - *) - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - esac ], AC_MSG_RESULT(no)) - ;; - darwin* | "Mac OS"*) - ac_cv_prog_RANLIB="ranlib" - # AC_CHECK_FUNCS doesn't look in the proper header file... -- AC_DEFINE(HAVE_ISATTY) -+ AC_DEFINE(HAVE_ISATTY, 1, "") - CFLAGS="$CFLAGS -no-cpp-precomp" - AC_MSG_CHECKING(whether to compile in loadavg) - AC_ARG_WITH(loadavg,, -@@ -212,11 +212,11 @@ darwin* | "Mac OS"*) - ;; - yes) - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - *) - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - esac ], AC_MSG_RESULT(no)) - ;; -@@ -229,13 +229,13 @@ darwin* | "Mac OS"*) - ;; - yes) - AC_MSG_RESULT(yes) -- AC_DEFINE(bsdi) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_DEFINE(bsdi, 1, "") -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - *) - AC_MSG_RESULT(yes) -- AC_DEFINE(bsdi) -- AC_DEFINE(HAVE_LOADAVG) -+ AC_DEFINE(bsdi, 1, "") -+ AC_DEFINE(HAVE_LOADAVG, 1, "") - ;; - esac ], AC_MSG_RESULT(no)) - ;; -@@ -245,7 +245,7 @@ esac - AC_CHECK_LIB(c, crypt, [:], [ - AC_CHECK_LIB(crypt, crypt, [ - LIBS="-lcrypt $LIBS" -- AC_DEFINE(HAVE_LIBCRYPT) ], []) ]) -+ AC_DEFINE(HAVE_LIBCRYPT, 1, "") ], []) ]) - - AC_CHECK_LIB(m, log10, [ LIBS="-lm $LIBS" ], []) - -@@ -263,16 +263,16 @@ AC_ARG_WITH(libwrap, - yes) - AC_MSG_RESULT(yes) - AC_CHECK_LIB(wrap, request_init, [ -- AC_DEFINE(LIBWRAP) -+ AC_DEFINE(LIBWRAP, 1, "") - WRAPLIBS="-lwrap" -- AC_DEFINE(HAVE_LIBWRAP) ]) -+ AC_DEFINE(HAVE_LIBWRAP, 1, "") ]) - AC_CHECK_LIB(nsl, yp_get_default_domain, [ - WRAPLIBS="$WRAPLIBS -lnsl" ]) - LIBS="$WRAPLIBS $LIBS" - ;; - *) - AC_MSG_RESULT(yes) -- AC_DEFINE(LIBWRAP) -+ AC_DEFINE(LIBWRAP, 1, "") - if test -d "$withval"; then - WRAPLIBS="-L$withval -lwrap" - else -@@ -299,13 +299,13 @@ AC_ARG_WITH(labeled-networking, - yes) - AC_MSG_RESULT(yes) - AC_CHECK_LIB(selinux, setexeccon, [ -- AC_DEFINE(LABELED_NET) -+ AC_DEFINE(LABELED_NET, 1, "") - LABELLIBS="-lselinux" ]) - LIBS="$LABELLIBS $LIBS" - ;; - *) - AC_MSG_RESULT(yes) -- AC_DEFINE(LABELED_NET) -+ AC_DEFINE(LABELED_NET, 1, "") - if test -d "$withval"; then - LABELLIBS="-L$withval -lselinux" - else ---- xinetd-2.3.14/aclocal.m4 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.14-mod/aclocal.m4 2009-07-29 10:10:03.000000000 +0200 -@@ -22,6 +22,6 @@ AC_CACHE_VAL(xinetd_cv_type_$1, - #endif], xinetd_cv_type_$1=yes, xinetd_cv_type_$1=no)])dnl - AC_MSG_RESULT($xinetd_cv_type_$1) - if test $xinetd_cv_type_$1 = no; then -- AC_DEFINE($1, $2) -+ AC_DEFINE($1, $2, "") - fi - ]) diff --git a/xinetd-2.3.14-bind-ipv6.patch b/xinetd-2.3.14-bind-ipv6.patch deleted file mode 100644 index 4bce76f..0000000 --- a/xinetd-2.3.14-bind-ipv6.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- xinetd-2.3.14/xinetd/service.c.old 2007-05-16 15:33:41.000000000 +0200 -+++ xinetd-2.3.14/xinetd/service.c 2007-05-16 15:29:53.000000000 +0200 -@@ -335,6 +335,15 @@ - - if ( SVC_FD(sp) == -1 ) - { -+ if (SC_BIND_ADDR(scp) == NULL && SC_IPV6( scp )) -+ { -+ /* there was no bind address configured and IPv6 fails. Try IPv4 */ -+ msg( LOG_NOTICE, func, "IPv6 socket creation failed for service %s, trying IPv4", SC_ID( scp ) ) ; -+ M_CLEAR(SC_XFLAGS(scp), SF_IPV6); -+ M_SET(SC_XFLAGS(scp), SF_IPV4); -+ return svc_activate(sp); -+ } -+ - msg( LOG_ERR, func, - "socket creation failed (%m). service = %s", SC_ID( scp ) ) ; - return( FAILED ) ; ---- xinetd-2.3.14/xinetd/confparse.c.old 2007-05-16 15:33:26.000000000 +0200 -+++ xinetd-2.3.14/xinetd/confparse.c 2007-05-16 15:15:22.000000000 +0200 -@@ -245,7 +245,7 @@ - M_SET(SC_XFLAGS(scp), SF_IPV6); - } - else -- M_SET(SC_XFLAGS(scp), SF_IPV4); -+ M_SET(SC_XFLAGS(scp), SF_IPV6); /*try bind IPv6 by default*/ - } - - if (SC_ORIG_BIND_ADDR(scp)) diff --git a/xinetd-2.3.14-clean-pfd.patch b/xinetd-2.3.14-clean-pfd.patch deleted file mode 100644 index 2509848..0000000 --- a/xinetd-2.3.14-clean-pfd.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xinetd-2.3.14/xinetd/service.c.orig 2010-03-18 17:09:20.000000000 +0100 -+++ xinetd-2.3.14/xinetd/service.c 2010-03-18 17:09:37.000000000 +0100 -@@ -470,6 +470,7 @@ void svc_deactivate( struct service *sp - { - #ifdef HAVE_POLL - SVC_EVENTS( sp ) = 0; -+ SVC_FD( sp ) = 0; - #else - FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ; - #endif /* HAVE_POLL */ diff --git a/xinetd-2.3.14-file-limit.patch b/xinetd-2.3.14-file-limit.patch deleted file mode 100644 index b5a8e3a..0000000 --- a/xinetd-2.3.14-file-limit.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -Nurp xinetd-2.3.14-orig/xinetd/attr.h xinetd-2.3.14-files/xinetd/attr.h ---- xinetd-2.3.14-orig/xinetd/attr.h 2005-10-05 19:15:33.000000000 +0200 -+++ xinetd-2.3.14-files/xinetd/attr.h 2009-10-20 13:08:45.000000000 +0200 -@@ -61,12 +61,13 @@ - #define A_DISABLED 43 - #define A_MDNS 44 - #define A_LIBWRAP 45 -+#define A_RLIMIT_FILES 46 - - /* - * SERVICE_ATTRIBUTES is the number of service attributes and also - * the number from which defaults-only attributes start. - */ --#define SERVICE_ATTRIBUTES ( A_MDNS + 1 ) -+#define SERVICE_ATTRIBUTES ( A_MDNS + 2 ) - - /* - * Mask of attributes that must be specified. -diff -Nurp xinetd-2.3.14-orig/xinetd/child.c xinetd-2.3.14-files/xinetd/child.c ---- xinetd-2.3.14-orig/xinetd/child.c 2009-10-20 13:07:34.000000000 +0200 -+++ xinetd-2.3.14-files/xinetd/child.c 2009-10-20 13:10:16.000000000 +0200 -@@ -109,6 +109,10 @@ void exec_server( const struct server *s - - - #ifdef RLIMIT_NOFILE -+ if ( SC_RLIM_FILES( scp )) -+ { -+ ps.ros.max_descriptors = SC_RLIM_FILES( scp ); -+ } - rl.rlim_max = rl.rlim_cur = ps.ros.max_descriptors ; - (void) setrlimit( RLIMIT_NOFILE, &rl ) ; - #endif -diff -Nurp xinetd-2.3.14-orig/xinetd/parse.c xinetd-2.3.14-files/xinetd/parse.c ---- xinetd-2.3.14-orig/xinetd/parse.c 2005-10-05 19:15:33.000000000 +0200 -+++ xinetd-2.3.14-files/xinetd/parse.c 2009-10-20 13:08:45.000000000 +0200 -@@ -92,6 +92,9 @@ static const struct attribute service_at - #ifdef RLIMIT_DATA - { "rlimit_data", A_RLIMIT_DATA, 1, rlim_data_parser }, - #endif -+#ifdef RLIMIT_NOFILE -+ { "rlimit_files", A_RLIMIT_FILES, 1, rlim_files_parser }, -+#endif - #ifdef RLIMIT_RSS - { "rlimit_rss", A_RLIMIT_RSS, 1, rlim_rss_parser }, - #endif -diff -Nurp xinetd-2.3.14-orig/xinetd/parsers.c xinetd-2.3.14-files/xinetd/parsers.c ---- xinetd-2.3.14-orig/xinetd/parsers.c 2005-10-05 23:45:41.000000000 +0200 -+++ xinetd-2.3.14-files/xinetd/parsers.c 2009-10-20 13:08:45.000000000 +0200 -@@ -1415,6 +1415,29 @@ status_e rlim_data_parser( pset_h values - } - #endif - -+#ifdef RLIMIT_NOFILE -+status_e rlim_files_parser( pset_h values, -+ struct service_config *scp, -+ enum assign_op op ) -+{ -+ char *mem = (char *) pset_pointer( values, 0 ) ; -+ const char *func = "rlim_files_parser" ; -+ -+ if ( EQ( mem, "UNLIMITED" ) ) -+ SC_RLIM_FILES(scp) = (rlim_t)RLIM_INFINITY ; -+ else -+ { -+ if ( get_limit ( mem, &SC_RLIM_FILES(scp)) ) -+ { -+ parsemsg( LOG_ERR, func, -+ "Max files limit is invalid: %s", mem ) ; -+ return( FAILED ) ; -+ } -+ } -+ return( OK ) ; -+} -+#endif -+ - #ifdef RLIMIT_RSS - status_e rlim_rss_parser( pset_h values, - struct service_config *scp, -diff -Nurp xinetd-2.3.14-orig/xinetd/parsers.h xinetd-2.3.14-files/xinetd/parsers.h ---- xinetd-2.3.14-orig/xinetd/parsers.h 2005-10-05 19:15:33.000000000 +0200 -+++ xinetd-2.3.14-files/xinetd/parsers.h 2009-10-20 13:08:45.000000000 +0200 -@@ -57,6 +57,9 @@ status_e rlim_cpu_parser(pset_h, struct - #ifdef RLIMIT_DATA - status_e rlim_data_parser(pset_h, struct service_config *, enum assign_op) ; - #endif -+#ifdef RLIMIT_NOFILE -+status_e rlim_files_parser(pset_h, struct service_config *, enum assign_op) ; -+#endif - #ifdef RLIMIT_RSS - status_e rlim_rss_parser(pset_h, struct service_config *, enum assign_op) ; - #endif -diff -Nurp xinetd-2.3.14-orig/xinetd/sconf.h xinetd-2.3.14-files/xinetd/sconf.h ---- xinetd-2.3.14-orig/xinetd/sconf.h 2009-10-20 13:07:34.000000000 +0200 -+++ xinetd-2.3.14-files/xinetd/sconf.h 2009-10-20 13:08:45.000000000 +0200 -@@ -143,6 +143,7 @@ struct service_config - rlim_t sc_rlim_as; - rlim_t sc_rlim_cpu; - rlim_t sc_rlim_data; -+ rlim_t sc_rlim_files; - rlim_t sc_rlim_rss; - rlim_t sc_rlim_stack; - mode_t sc_umask; -@@ -191,6 +192,7 @@ struct service_config - #define SC_RLIM_AS( scp ) (scp)->sc_rlim_as - #define SC_RLIM_CPU( scp ) (scp)->sc_rlim_cpu - #define SC_RLIM_DATA( scp ) (scp)->sc_rlim_data -+#define SC_RLIM_FILES( scp ) (scp)->sc_rlim_files - #define SC_RLIM_RSS( scp ) (scp)->sc_rlim_rss - #define SC_RLIM_STACK( scp ) (scp)->sc_rlim_stack - #define SC_TYPE( scp ) (scp)->sc_type -diff -Nurp xinetd-2.3.14-orig/xinetd/xinetd.conf.man xinetd-2.3.14-files/xinetd/xinetd.conf.man ---- xinetd-2.3.14-orig/xinetd/xinetd.conf.man 2009-10-20 13:07:34.000000000 +0200 -+++ xinetd-2.3.14-files/xinetd/xinetd.conf.man 2009-10-20 13:08:45.000000000 +0200 -@@ -569,6 +569,12 @@ is implemented, it is more useful to set - rlimit_rss and rlimit_stack. This resource limit is only implemented on - Linux systems. - .TP -+.B rlimit_files -+Sets the maximum number of open files that the service may use. -+One parameter is required, which is a positive integer representing -+the number of open file descriptors. Practical limit of this number -+is around 1024000. -+.TP - .B rlimit_cpu - Sets the maximum number of CPU seconds that the service may use. - One parameter is required, which is either a positive integer representing diff --git a/xinetd-2.3.14-fix-type-punned-ptr.patch b/xinetd-2.3.14-fix-type-punned-ptr.patch deleted file mode 100644 index 993169f..0000000 --- a/xinetd-2.3.14-fix-type-punned-ptr.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sensor.c b/sensor.c -index 09d0877..e65018c 100644 ---- a/xinetd/sensor.c -+++ b/xinetd/sensor.c -@@ -100,14 +100,15 @@ void process_sensor( const struct service *sp, const union xsockaddr *addr) - { - /* Here again, eh?...update time stamp. */ - char *exp_time; -- time_t stored_time; -+ int stored_time; - - item_matched--; /* Is # plus 1, to even get here must be >= 1 */ - exp_time = pset_pointer( global_no_access_time, item_matched ) ; - if (exp_time == NULL) - return ; - -- if ( parse_base10(exp_time, (int *)&stored_time) ) -+ /* FIXME: Parse (long int) instead of (int) prior to possible Y2K38 bug. */ -+ if ( parse_base10(exp_time, &stored_time ) ) - { /* if never let them off, bypass */ - if (stored_time != -1) - { diff --git a/xinetd-2.3.14-ident-bind.patch b/xinetd-2.3.14-ident-bind.patch deleted file mode 100644 index 2df97ea..0000000 --- a/xinetd-2.3.14-ident-bind.patch +++ /dev/null @@ -1,42 +0,0 @@ -448069: xinetd: socket bind: Invalid argument (errno = 22) when using USERID on ipv6 - -Use right size of addresses in bind() call. Also use getpeername addresses when -connecting to ident service to prevent address family mismatch between socket(), -bind() and connect() calls. - -Author: Jan Safranek <jsafrane(a)redhat.com> -Reviewed-By: Adam Tkac <atkac(a)redhat.com> - -diff -up xinetd-2.3.14/xinetd/ident.c.orig xinetd-2.3.14/xinetd/ident.c ---- xinetd-2.3.14/xinetd/ident.c.orig 2008-05-29 16:30:19.000000000 +0200 -+++ xinetd-2.3.14/xinetd/ident.c 2008-05-29 16:29:57.000000000 +0200 -@@ -97,7 +98,13 @@ idresult_e log_remote_user( const struct - } - - CLEAR( sin_contact ); -- sin_remote = *CONN_XADDRESS( SERVER_CONNECTION( serp ) ) ; -+ -+ sin_len = sizeof( sin_remote ); -+ if ( getpeername( SERVER_FD( serp ), &sin_remote.sa, &sin_len ) == -1 ) -+ { -+ msg( LOG_ERR, func, "(%d) getpeername: %m", getpid() ) ; -+ return( IDR_ERROR ) ; -+ } - sin_contact = sin_remote; - memcpy( &sin_bind, &sin_local, sizeof(sin_bind) ) ; - local_port = 0; -@@ -121,7 +128,13 @@ idresult_e log_remote_user( const struct - msg( LOG_ERR, func, "socket creation: %m" ) ; - return( IDR_ERROR ) ; - } -- if ( bind(sd, &sin_bind.sa, sizeof(sin_bind.sa)) == -1 ) -+ -+ if ( sin_bind.sa.sa_family == AF_INET ) -+ sin_len = sizeof( sin_bind.sa_in ) ; -+ else -+ sin_len = sizeof( sin_bind.sa_in6 ) ; -+ -+ if ( bind(sd, &sin_bind.sa, sin_len) == -1 ) - { - msg( LOG_ERR, func, "socket bind: %m" ) ; - (void) Sclose( sd ) ; diff --git a/xinetd-2.3.14-instances.patch b/xinetd-2.3.14-instances.patch deleted file mode 100644 index 6def242..0000000 --- a/xinetd-2.3.14-instances.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xinetd-2.3.14/xinetd/access.c 2005-10-05 19:15:33.000000000 +0200 -+++ xinetd-2.3.14-mod/xinetd/access.c 2012-03-05 14:54:30.935416926 +0100 -@@ -73,6 +73,7 @@ static void cps_service_restart(void) - unsigned int i; - time_t nowtime; - const char *func = "cps_service_restart"; -+ int rs; - - nowtime = time(NULL); - for( i=0; i < pset_count( SERVICES(ps) ); i++ ) { -@@ -84,8 +85,11 @@ static void cps_service_restart(void) - if( SVC_STATE(sp) == SVC_DISABLED ) { - scp = SVC_CONF( sp ); - if ( SC_TIME_REENABLE(scp) <= nowtime ) { -+ rs = SVC_RUNNING_SERVERS(sp); - /* re-enable the service */ - if( svc_activate(sp) == OK ) { -+ /* remember running servers after restart */ -+ SVC_RUNNING_SERVERS(sp) = rs; - msg(LOG_ERR, func, - "Activating service %s", SC_NAME(scp)); - } else { diff --git a/xinetd-2.3.14-ipv6confusion.patch b/xinetd-2.3.14-ipv6confusion.patch deleted file mode 100644 index 5f0b431..0000000 --- a/xinetd-2.3.14-ipv6confusion.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- xinetd-2.3.14/xinetd/ident.c.jw 2010-03-10 17:49:53.000000000 +1100 -+++ xinetd-2.3.14/xinetd/ident.c 2010-03-10 17:50:30.000000000 +1100 -@@ -108,12 +108,12 @@ - memcpy( &sin_bind, &sin_local, sizeof(sin_bind) ) ; - local_port = 0; - remote_port = 0; -- if( sin_remote.sa.sa_family == AF_INET ) { -+ if( sin_remote.sa.sa_family == AF_INET6 ) { - local_port = ntohs( sin_local.sa_in6.sin6_port ) ; - remote_port = ntohs( sin_remote.sa_in6.sin6_port ) ; - sin_contact.sa_in6.sin6_port = htons( IDENTITY_SERVICE_PORT ) ; - sin_bind.sa_in.sin_port = 0 ; -- } else if( sin_remote.sa.sa_family == AF_INET6 ) { -+ } else if( sin_remote.sa.sa_family == AF_INET ) { - local_port = ntohs( sin_local.sa_in.sin_port ) ; - remote_port = ntohs( sin_remote.sa_in.sin_port ) ; - sin_contact.sa_in.sin_port = htons( IDENTITY_SERVICE_PORT ) ; diff --git a/xinetd-2.3.14-leaking-fds-2a.patch b/xinetd-2.3.14-leaking-fds-2a.patch deleted file mode 100644 index 90901e5..0000000 --- a/xinetd-2.3.14-leaking-fds-2a.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur xinetd-2.3.14-dist/xinetd/service.c xinetd-2.3.14/xinetd/service.c ---- xinetd-2.3.14-dist/xinetd/service.c 2012-04-03 08:59:19.000000000 +0200 -+++ xinetd-2.3.14/xinetd/service.c 2012-04-03 09:02:34.588160317 +0200 -@@ -366,12 +366,24 @@ - - msg( LOG_ERR, func, - "socket creation failed (%m). service = %s", SC_ID( scp ) ) ; -+#ifdef HAVE_POLL -+ SVC_EVENTS( sp ) = 0; -+ SVC_FD( sp ) = 0; -+#else -+ FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ; -+#endif /* HAVE_POLL */ - return( FAILED ) ; - } - - if ( set_fd_modes( sp ) == FAILED ) - { - (void) Sclose( SVC_FD(sp) ) ; -+#ifdef HAVE_POLL -+ SVC_EVENTS( sp ) = 0; -+ SVC_FD( sp ) = 0; -+#else -+ FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ; -+#endif /* HAVE_POLL */ - return( FAILED ) ; - } - -@@ -385,6 +397,12 @@ - if ( status == FAILED ) - { - (void) Sclose( SVC_FD(sp) ) ; -+#ifdef HAVE_POLL -+ SVC_EVENTS( sp ) = 0; -+ SVC_FD( sp ) = 0; -+#else -+ FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ; -+#endif /* HAVE_POLL */ - return( FAILED ) ; - } - diff --git a/xinetd-2.3.14-leaking-fds.patch b/xinetd-2.3.14-leaking-fds.patch deleted file mode 100644 index bc1b919..0000000 --- a/xinetd-2.3.14-leaking-fds.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up xinetd-2.3.14-dist/xinetd/service.c xinetd-2.3.14/xinetd/service.c ---- xinetd-2.3.14-dist/xinetd/service.c 2012-01-11 11:50:43.438650900 +0100 -+++ xinetd-2.3.14/xinetd/service.c 2012-01-16 08:18:09.462620084 +0100 -@@ -88,6 +88,7 @@ struct service *svc_new( struct service_ - CLEAR( *sp ) ; - - SVC_CONF(sp) = scp ; -+ sp->svc_pfd_index = -1; - return( sp ) ; - } - -@@ -346,7 +347,16 @@ status_e svc_activate( struct service *s - ps.rws.pfds_last)*sizeof(struct pollfd)); - ps.rws.pfd_array = tmp; - } -- SVC_POLLFD( sp ) = &ps.rws.pfd_array[ps.rws.pfds_last++] ; -+ if ( sp->svc_pfd_index >= 0 ) -+ { -+ SVC_POLLFD( sp ) = &ps.rws.pfd_array[sp->svc_pfd_index] ; -+ } -+ else -+ { -+ sp->svc_pfd_index = ps.rws.pfds_last ; -+ SVC_POLLFD( sp ) = &ps.rws.pfd_array[ps.rws.pfds_last++] ; -+ } -+ - #endif /* HAVE_POLL */ - - if( SC_IPV4( scp ) ) { -@@ -433,6 +443,11 @@ status_e svc_activate( struct service *s - static void deactivate( const struct service *sp ) - { - (void) Sclose( SVC_FD( sp ) ) ; -+#ifdef HAVE_POLL -+ SVC_FD( sp ) = 0; -+#else -+ FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ; -+#endif - - #ifdef HAVE_MDNS - xinetd_mdns_deregister(SVC_CONF(sp)); -diff -up xinetd-2.3.14-dist/xinetd/service.h xinetd-2.3.14/xinetd/service.h ---- xinetd-2.3.14-dist/xinetd/service.h 2012-01-11 11:50:43.418650925 +0100 -+++ xinetd-2.3.14/xinetd/service.h 2012-01-16 08:02:59.667553008 +0100 -@@ -47,6 +47,7 @@ struct service - { - state_e svc_state ; - int svc_ref_count ; /* # of pters to this struct */ -+ int svc_pfd_index; /* index of pfd in pfd_array */ - struct service_config *svc_conf ; /* service configuration */ - - #ifdef HAVE_POLL diff --git a/xinetd-2.3.14-man-section.patch b/xinetd-2.3.14-man-section.patch deleted file mode 100644 index 03f1914..0000000 --- a/xinetd-2.3.14-man-section.patch +++ /dev/null @@ -1,16 +0,0 @@ -117746: xinetd.log man page in wrong section - -Put xinetd.log to the right man section. - -diff -up xinetd-2.3.13/Makefile.in.orig xinetd-2.3.13/Makefile.in ---- xinetd-2.3.13/Makefile.in.orig 2007-12-06 10:58:32.000000000 +0100 -+++ xinetd-2.3.13/Makefile.in 2008-01-15 13:39:38.000000000 +0100 -@@ -80,7 +80,7 @@ install: build - $(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR) - $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR) - $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man5/xinetd.log.5 - $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8 - $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8 - $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8 diff --git a/xinetd-2.3.14-many-services.patch b/xinetd-2.3.14-many-services.patch deleted file mode 100644 index 8459b6c..0000000 --- a/xinetd-2.3.14-many-services.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- xinetd-2.3.14-dist/xinetd/defs.h 2012-01-16 12:20:54.739041678 +0100 -+++ xinetd-2.3.14/xinetd/defs.h 2012-01-17 08:06:56.800762230 +0100 -@@ -115,8 +115,9 @@ union xsockaddr { - */ - - #ifdef HAVE_POLL --#define INIT_POLLFDS 1024 --#define MAX_POLLFDS 8192 -+#define INIT_POLLFDS 4096 -+/* FIXME: not used */ -+#define MAX_POLLFDS 16384 - #endif - - /* ---- xinetd-2.3.14-dist/xinetd/service.c 2012-01-16 12:20:54.741041678 +0100 -+++ xinetd-2.3.14/xinetd/service.c 2012-01-17 08:07:28.872746991 +0100 -@@ -343,9 +343,9 @@ status_e svc_activate( struct service *s - out_of_memory( func ); - return( FAILED ); - } -+ ps.rws.pfd_array = tmp; - memset(&ps.rws.pfd_array[ps.rws.pfds_last], 0, (ps.rws.pfds_allocated- - ps.rws.pfds_last)*sizeof(struct pollfd)); -- ps.rws.pfd_array = tmp; - } - if ( sp->svc_pfd_index >= 0 ) - { diff --git a/xinetd-2.3.14-poll.patch b/xinetd-2.3.14-poll.patch deleted file mode 100644 index bd87ae5..0000000 --- a/xinetd-2.3.14-poll.patch +++ /dev/null @@ -1,1202 +0,0 @@ -diff -Nurp xinetd-2.3.14-orig/config.h.in xinetd-2.3.14-poll/config.h.in ---- xinetd-2.3.14-orig/config.h.in 2009-07-27 13:27:59.000000000 +0200 -+++ xinetd-2.3.14-poll/config.h.in 2009-09-02 11:30:27.000000000 +0200 -@@ -106,6 +106,8 @@ - - #undef HAVE_HOWL - -+#undef HAVE_POLL -+ - /* OS specific */ - #undef solaris - -diff -Nurp xinetd-2.3.14-orig/configure.in xinetd-2.3.14-poll/configure.in ---- xinetd-2.3.14-orig/configure.in 2009-09-02 11:32:54.000000000 +0200 -+++ xinetd-2.3.14-poll/configure.in 2009-09-02 11:30:27.000000000 +0200 -@@ -35,6 +35,7 @@ AC_CHECK_LIB(c, sys_siglist, [AC_DEFINE( - AC_CHECK_FUNC(gai_strerror,[AC_DEFINE(HAVE_GAI_STRERROR, 1, "")]) - AC_CHECK_FUNC(freeaddrinfo,[AC_DEFINE(HAVE_FREEADDRINFO, 1, "")]) - AC_CHECK_FUNC(getaddrinfo,[AC_DEFINE(HAVE_GETADDRINFO, 1, "")]) -+AC_CHECK_FUNC(poll, [AC_DEFINE(HAVE_POLL, 1, "")]) - - AC_CHECK_HEADERS(sys/types.h sys/termios.h termios.h sys/ioctl.h sys/select.h rpc/rpc.h rpc/rpcent.h sys/file.h ftw.h machine/reg.h netdb.h) - AC_CHECK_HEADER(sys/resource.h, [AC_DEFINE(HAVE_SYS_RESOURCE_H, 1, "")]) -diff -Nurp xinetd-2.3.14-orig/xinetd/conf.c xinetd-2.3.14-poll/xinetd/conf.c ---- xinetd-2.3.14-orig/xinetd/conf.c 2003-12-30 14:44:09.000000000 +0100 -+++ xinetd-2.3.14-poll/xinetd/conf.c 2009-09-02 11:30:27.000000000 +0200 -@@ -209,8 +209,13 @@ unsigned cnf_start_services( struct conf - pset_clear( sconfs ) ; - - if ( debug.on ) -+#ifdef HAVE_POLL -+ msg( LOG_DEBUG, func, "pfds_last = %d, services_started = %d", -+ ps.rws.pfds_last, services_started ) ; -+#else - msg( LOG_DEBUG, func, "mask_max = %d, services_started = %d", - ps.rws.mask_max, services_started ) ; -+#endif - - return( services_started ) ; - } -diff -Nurp xinetd-2.3.14-orig/xinetd/defs.h xinetd-2.3.14-poll/xinetd/defs.h ---- xinetd-2.3.14-orig/xinetd/defs.h 2005-03-29 17:50:34.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/defs.h 2009-09-02 11:30:27.000000000 +0200 -@@ -111,6 +111,15 @@ union xsockaddr { - #define LISTEN_BACKLOG 64 - - /* -+ * constants for limiting ps.rws.fd_list -+ */ -+ -+#ifdef HAVE_POLL -+#define INIT_POLLFDS 1024 -+#define MAX_POLLFDS 8192 -+#endif -+ -+/* - * When explicit values are given for enum's, that is because the structures - * that the enum's are in may be initialized by a memory clear operation. - */ -diff -Nurp xinetd-2.3.14-orig/xinetd/child.c xinetd-2.3.14-poll/xinetd/child.c ---- xinetd-2.3.14-orig/xinetd/child.c 2003-09-06 16:41:59.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/child.c 2009-09-02 11:30:27.000000000 +0200 -@@ -109,8 +109,7 @@ void exec_server( const struct server *s - - - #ifdef RLIMIT_NOFILE -- rl.rlim_max = ps.ros.orig_max_descriptors ; -- rl.rlim_cur = ps.ros.max_descriptors ; -+ rl.rlim_max = rl.rlim_cur = ps.ros.max_descriptors ; - (void) setrlimit( RLIMIT_NOFILE, &rl ) ; - #endif - #ifdef RLIMIT_AS -diff -Nurp xinetd-2.3.14-orig/xinetd/init.c xinetd-2.3.14-poll/xinetd/init.c ---- xinetd-2.3.14-orig/xinetd/init.c 2003-09-06 16:41:59.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/init.c 2009-09-02 11:30:27.000000000 +0200 -@@ -17,7 +17,7 @@ - #include <unistd.h> - #include <stdio.h> - #include <errno.h> -- -+#include <malloc.h> - #include "sio.h" - #include "init.h" - #include "defs.h" -@@ -140,7 +140,6 @@ static void set_fd_limit(void) - { - #ifdef RLIMIT_NOFILE - struct rlimit rl ; -- rlim_t maxfd ; - - /* - * Set the soft file descriptor limit to the hard limit. -@@ -151,25 +150,9 @@ static void set_fd_limit(void) - exit( 1 ) ; - } - -- maxfd = rl.rlim_max; - if ( rl.rlim_max == RLIM_INFINITY ) - rl.rlim_max = FD_SETSIZE; - -- /* XXX: a dumb way to prevent fd_set overflow possibilities; the rest -- * of xinetd should be changed to use an OpenBSD inetd-like fd_grow(). */ -- if ( rl.rlim_max > FD_SETSIZE ) -- rl.rlim_max = FD_SETSIZE; -- -- rl.rlim_cur = rl.rlim_max ; -- if ( setrlimit( RLIMIT_NOFILE, &rl ) == -1 ) -- { -- syscall_failed("setrlimit(RLIMIT_NOFILE)"); -- ps.ros.max_descriptors = FD_SETSIZE; -- ps.ros.orig_max_descriptors = FD_SETSIZE; -- return ; -- } -- -- ps.ros.orig_max_descriptors = maxfd ; - ps.ros.max_descriptors = rl.rlim_max ; - #else /* ! RLIMIT_NOFILE */ - ps.ros.max_descriptors = getdtablesize() ; -@@ -292,15 +275,27 @@ static pset_h new_table( unsigned size ) - */ - static void init_rw_state( void ) - { -+ const char *func = "init_rw_state" ; - SERVERS( ps ) = new_table( 0 ) ; - RETRIES( ps ) = new_table( 0 ) ; - SERVICES( ps ) = new_table( 0 ) ; - - ps.rws.descriptors_free = ps.ros.max_descriptors - DESCRIPTORS_RESERVED ; - -+#ifdef HAVE_POLL -+ ps.rws.pfds_allocated = INIT_POLLFDS ; -+ ps.rws.pfd_array = (struct pollfd *) -+ malloc( sizeof( struct pollfd ) * ps.rws.pfds_allocated ) ; -+ if ( ps.rws.pfd_array == NULL ) -+ { -+ out_of_memory(func); -+ exit( 1 ) ; -+ } -+ ps.rws.pfds_last = 0 ; -+#else - FD_ZERO( &ps.rws.socket_mask ) ; - ps.rws.mask_max = 0 ; -- -+#endif /* HAVE_POLL */ - } - - -diff -Nurp xinetd-2.3.14-orig/xinetd/intcommon.c xinetd-2.3.14-poll/xinetd/intcommon.c ---- xinetd-2.3.14-orig/xinetd/intcommon.c 2003-08-06 08:12:10.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/intcommon.c 2009-09-03 16:15:49.000000000 +0200 -@@ -14,6 +14,9 @@ - #include <errno.h> - #include <stdlib.h> - #include <unistd.h> -+#ifdef HAVE_POLL -+#include <poll.h> -+#endif - - #include "intcommon.h" - #include "msg.h" -@@ -36,27 +39,38 @@ void int_fail( const struct intercept_s - /* - * Returns either a positive number or -1 - */ -+#ifdef HAVE_POLL -+int int_poll( int pfds_last, struct pollfd *pfd_array ) -+{ -+ const char *func = "int_poll" ; -+#else - int int_select( int max, fd_set *read_mask ) - { - const char *func = "int_select" ; -+#endif - - for ( ;; ) - { - int n_ready ; - -- n_ready = select( max+1, read_mask, -- FD_SET_NULL, FD_SET_NULL, TIMEVAL_NULL ) ; -+ do { -+#ifdef HAVE_POLL -+ n_ready = poll( pfd_array, pfds_last, -1 ); -+#else -+ n_ready = select( max+1, read_mask, -+ FD_SET_NULL, FD_SET_NULL, TIMEVAL_NULL ) ; -+#endif -+ } while (n_ready == -1 && errno == EINTR); -+ -+ - if ( n_ready > 0 ) - return( n_ready ) ; -- else if ( n_ready == -1 ) { -- if ( errno == EINTR ) -- continue ; -- else -- { -- msg( LOG_ERR, func, "select: %m" ) ; -- return( -1 ) ; -- } -- } -+#ifdef HAVE_POLL -+ msg( LOG_ERR, func, "poll: %m" ) ; -+#else -+ msg( LOG_ERR, func, "select: %m" ) ; -+#endif -+ return( -1 ) ; - } - } - -diff -Nurp xinetd-2.3.14-orig/xinetd/internals.c xinetd-2.3.14-poll/xinetd/internals.c ---- xinetd-2.3.14-orig/xinetd/internals.c 2003-09-06 16:41:59.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/internals.c 2009-09-03 10:38:29.000000000 +0200 -@@ -53,6 +53,9 @@ void dump_internal_state(void) - const char *dump_file = DUMP_FILE ; - time_t current_time ; - int fd ; -+#ifdef HAVE_POLL -+ int *listed_fds; -+#endif - unsigned u ; - const char *func = "dump_internal_state" ; - -@@ -104,6 +107,41 @@ void dump_internal_state(void) - server_dump( SERP( pset_pointer( RETRIES( ps ), u ) ), dump_fd ) ; - Sputchar( dump_fd, '\n' ) ; - -+#ifdef HAVE_POLL -+ /* -+ * Dump the socket mask -+ */ -+ listed_fds = (int *)calloc(sizeof(int),ps.ros.max_descriptors); -+ if (listed_fds != NULL) -+ { -+ Sprint( dump_fd, "Socket mask:" ) ; -+ for ( fd = 0 ; fd < ps.rws.pfds_last ; fd++ ) -+ { -+ listed_fds[ps.rws.pfd_array[fd].fd] = 1; -+ Sprint( dump_fd, " %d", ps.rws.pfd_array[fd].fd ) ; -+ } -+ Sputchar( dump_fd, '\n' ) ; -+ Sprint( dump_fd, "pfds_last = %d\n", ps.rws.pfds_last ) ; -+ -+ /* -+ * Dump the descriptors that are open and are *not* in the socket list -+ */ -+ Sprint( dump_fd, "Open descriptors (not in socket mask):" ) ; -+ for ( fd = 0 ; (unsigned)fd < ps.ros.max_descriptors ; fd++ ) -+ { -+ struct stat st ; -+ -+ if ( !listed_fds[fd] && fstat( fd, &st ) != -1 ) -+ Sprint( dump_fd, " %d", fd ) ; -+ } -+ -+ Sputchar( dump_fd, '\n' ) ; -+ Sputchar( dump_fd, '\n' ) ; -+ free(listed_fds); -+ } -+ else -+ Sprint( dump_fd, "Could not dump open descriptors, not enough memory!\n" ); -+#else /* !HAVE_POLL */ - /* - * Dump the socket mask - */ -@@ -114,6 +152,7 @@ void dump_internal_state(void) - Sputchar( dump_fd, '\n' ) ; - Sprint( dump_fd, "mask_max = %d\n", ps.rws.mask_max ) ; - -+ - /* - * Dump the descriptors that are open and are *not* in the socket mask - */ -@@ -130,6 +169,7 @@ void dump_internal_state(void) - } - Sputchar( dump_fd, '\n' ) ; - Sputchar( dump_fd, '\n' ) ; -+#endif /* !HAVE_POLL */ - - Sprint( dump_fd, "active_services = %d\n", ps.rws.active_services ) ; - Sprint( dump_fd, "available_services = %d\n", ps.rws.available_services ) ; -@@ -162,7 +202,6 @@ enum check_type { PERIODIC, USER_REQUEST - static void consistency_check( enum check_type type ) - { - int fd ; -- fd_set socket_mask_copy ; - unsigned u ; - int errors ; - unsigned total_running_servers = 0 ; -@@ -171,7 +210,19 @@ static void consistency_check( enum chec - bool_int service_count_check_failed = FALSE ; - const char *func = "consistency_check" ; - -+ -+#ifdef HAVE_POLL -+ struct pollfd *pfd_array_copy = calloc(sizeof(struct pollfd), ps.rws.pfds_last); -+ if (pfd_array_copy == NULL) -+ { -+ msg( LOG_ERR, func, "Could not run consistency check! Not enough memory!\n" ) ; -+ return; -+ } -+ memcpy(pfd_array_copy, ps.rws.pfd_array, ps.rws.pfds_last*sizeof(struct pollfd)); -+#else /* !HAVE_POLL */ -+ fd_set socket_mask_copy ; - socket_mask_copy = ps.rws.socket_mask ; -+#endif /* HAVE_POLL */ - - for ( u = 0 ; u < pset_count( SERVICES( ps ) ) ; u++ ) - { -@@ -184,9 +235,22 @@ static void consistency_check( enum chec - - if ( SVC_IS_AVAILABLE( sp ) || SVC_IS_DISABLED ( sp ) ) - { -+ - /* - * In this case, there may be some servers running - */ -+#ifdef HAVE_POLL -+ if ( pfd_array_copy[ SVC_POLLFD_OFF( sp ) ].events ) -+ { -+ if ( SVC_IS_DISABLED( sp ) ) -+ { -+ msg( LOG_ERR, func, -+ "fd of disabled service %s still in socket mask", sid ) ; -+ error_count++ ; -+ } -+ pfd_array_copy[ SVC_POLLFD_OFF( sp ) ].events = 0; -+ } -+#else /* !HAVE_POLL */ - if ( FD_ISSET( SVC_FD( sp ), &socket_mask_copy ) ) - { - if ( SVC_IS_DISABLED( sp ) ) -@@ -197,8 +261,9 @@ static void consistency_check( enum chec - } - FD_CLR( SVC_FD( sp ), &socket_mask_copy ) ; - } -- error_count += thread_check( sp, running_servers, retry_servers ) ; -+#endif /* HAVE_POLL */ - -+ error_count += thread_check( sp, running_servers, retry_servers ) ; - errors = service_count_check( sp, running_servers, retry_servers ) ; - if ( ! errors && ! service_count_check_failed ) - { -@@ -248,6 +313,18 @@ static void consistency_check( enum chec - /* - * Check if there are any descriptors set in socket_mask_copy - */ -+#ifdef HAVE_POLL -+ for ( fd = 0 ; fd < ps.rws.pfds_last ; fd++) -+ if ( pfd_array_copy[fd].events && pfd_array_copy[fd].fd != signals_pending[0] && -+ pfd_array_copy[fd].fd != signals_pending[1] ) -+ { -+ msg( LOG_ERR, func, -+ "descriptor %d set in socket mask but there is no service for it", -+ fd ) ; -+ error_count++ ; -+ } -+ free(pfd_array_copy); -+#else /* !HAVE_POLL */ - for ( fd = 0 ; (unsigned)fd < ps.ros.max_descriptors ; fd++ ) - if ( FD_ISSET( fd, &socket_mask_copy ) && ((fd != signals_pending[0]) && fd != signals_pending[1])) - { -@@ -256,6 +333,7 @@ static void consistency_check( enum chec - fd ) ; - error_count++ ; - } -+#endif /* !HAVE_POLL */ - - if ( error_count != 0 ) - msg( LOG_WARNING, func, -@@ -304,7 +382,6 @@ static unsigned service_count_check( str - } - - -- - /* - * If the service is single-threaded: - * if the descriptor is set in the socket mask, there must -@@ -317,7 +394,11 @@ static unsigned thread_check( struct ser - unsigned retry_servers ) - { - unsigned error_count = 0 ; -+#ifdef HAVE_POLL -+ struct pollfd *pfd= SVC_POLLFD( sp ) ; -+#else - int sd = SVC_FD( sp ) ; -+#endif - char *sid = SVC_ID( sp ) ; - const char *func = "thread_check" ; - -@@ -325,13 +406,21 @@ static unsigned thread_check( struct ser - { - bool_int has_servers = ( running_servers + retry_servers != 0 ) ; - -+#ifdef HAVE_POLL -+ if ( has_servers && pfd->events ) -+#else - if ( has_servers && FD_ISSET( sd, &ps.rws.socket_mask ) ) -+#endif - { - msg( LOG_ERR, func, - "Active single-threaded service %s: server running, descriptor set", sid ) ; - error_count++ ; - } -+#ifdef HAVE_POLL -+ if ( !has_servers && !pfd->events ) -+#else - if ( !has_servers && !FD_ISSET( sd, &ps.rws.socket_mask ) ) -+#endif - { - msg( LOG_ERR, func, - "Active single-threaded service %s: no server running, descriptor not set", -@@ -340,7 +429,11 @@ static unsigned thread_check( struct ser - } - } - else -+#ifdef HAVE_POLL -+ if ( ! pfd->events ) -+#else - if ( ! FD_ISSET( sd, &ps.rws.socket_mask ) ) -+#endif - { - msg( LOG_ERR, func, - "Active multi-threaded service %s: descriptor not set", sid ) ; -diff -Nurp xinetd-2.3.14-orig/xinetd/main.c xinetd-2.3.14-poll/xinetd/main.c ---- xinetd-2.3.14-orig/xinetd/main.c 2009-07-27 13:27:59.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/main.c 2009-09-03 16:23:11.000000000 +0200 -@@ -25,6 +25,9 @@ - #include "xtimer.h" - #include "sensor.h" - #include "xmdns.h" -+#ifdef HAVE_POLL -+#include "xpoll.h" -+#endif - - #ifdef __GNUC__ - __attribute__ ((noreturn)) -@@ -119,16 +122,24 @@ static void main_loop(void) - { - const char *func = "main_loop" ; - struct timeval tv, *tvptr = NULL; -+#ifdef HAVE_POLL -+ struct pollfd *signal_pfd; - -- FD_SET(signals_pending[0], &ps.rws.socket_mask); -+ ps.rws.pfd_array[ps.rws.pfds_last].fd = signals_pending[0] ; -+ ps.rws.pfd_array[ps.rws.pfds_last].events = POLLIN ; -+ signal_pfd = &ps.rws.pfd_array[ps.rws.pfds_last] ; -+ ps.rws.pfds_last++; -+#else -+ FD_SET(signals_pending[0], &ps.rws.socket_mask) ; - if ( signals_pending[0] > ps.rws.mask_max ) - ps.rws.mask_max = signals_pending[0] ; -- if ( signals_pending[1] > ps.rws.mask_max ) -- ps.rws.mask_max = signals_pending[1] ; -+#endif /* HAVE_POLL */ - - for ( ;; ) - { -+#ifndef HAVE_POLL - fd_set read_mask ; -+#endif - int n_active ; - unsigned u ; - -@@ -144,9 +155,14 @@ static void main_loop(void) - tvptr = NULL; - } - -+#ifdef HAVE_POLL -+ n_active = poll( ps.rws.pfd_array, ps.rws.pfds_last, -+ tvptr == NULL ? -1 : tvptr->tv_sec*1000 ) ; -+#else - read_mask = ps.rws.socket_mask ; - n_active = select( ps.rws.mask_max+1, &read_mask, - FD_SET_NULL, FD_SET_NULL, tvptr ) ; -+#endif - if ( n_active == -1 ) - { - if ( errno == EINTR ) { -@@ -165,11 +181,27 @@ static void main_loop(void) - - xtimer_poll(); - -- if( FD_ISSET(signals_pending[0], &read_mask) ) { -+#ifdef HAVE_POLL -+ if ( POLLFD_REVENTS( signal_pfd ) ) -+ { -+ if ( POLLFD_REVENTS( signal_pfd ) & (POLLERR | POLLHUP | -+ POLLNVAL) ) -+ find_bad_fd(); -+ else -+ { -+ check_pipe(); -+ if ( --n_active == 0 ) -+ continue ; -+ } -+ } -+#else -+ if( FD_ISSET(signals_pending[0], &read_mask) ) -+ { - check_pipe(); - if ( --n_active == 0 ) - continue ; - } -+#endif - - #ifdef HAVE_MDNS - if( xinetd_mdns_poll() == 0 ) -@@ -186,19 +218,33 @@ static void main_loop(void) - if ( ! SVC_IS_ACTIVE( sp ) ) - continue ; - -+#ifdef HAVE_POLL -+ if ( SVC_REVENTS( sp ) ) -+ { -+ if ( SVC_REVENTS( sp ) & (POLLERR | POLLHUP | -+ POLLNVAL) ) -+ find_bad_fd(); -+ else -+ { -+ svc_request( sp ) ; -+ if ( --n_active == 0 ) -+ break ; -+ } -+ } -+#else - if ( FD_ISSET( SVC_FD( sp ), &read_mask ) ) - { - svc_request( sp ) ; - if ( --n_active == 0 ) - break ; - } -+#endif - } - if ( n_active > 0 ) - msg( LOG_ERR, func, "%d descriptors still set", n_active ) ; - } - } - -- - /* - * This function identifies if any of the fd's in the socket mask - * is bad. We use it in case select(2) returns EBADF -@@ -208,13 +254,29 @@ static void main_loop(void) - static void find_bad_fd(void) - { - int fd ; -+#ifdef HAVE_POLL -+ const char *reason; -+#else - struct stat st ; -+#endif - unsigned bad_fd_count = 0 ; - const char *func = "find_bad_fd" ; - -+#ifdef HAVE_POLL -+ for ( fd = 0 ; (unsigned)fd < ps.rws.pfds_last ; fd++ ) -+ if ( ps.rws.pfd_array[fd].revents & ( POLLHUP|POLLNVAL|POLLERR ) ) -+ { -+ if ( ps.rws.pfd_array[fd].revents & POLLHUP ) -+ reason = "hung up"; -+ else if ( ps.rws.pfd_array[fd].revents & POLLNVAL ) -+ reason = "been closed"; -+ else if ( ps.rws.pfd_array[fd].revents & POLLERR ) -+ reason = "reported error condition"; -+#else - for ( fd = 0 ; (unsigned)fd < ps.ros.max_descriptors ; fd++ ) - if ( FD_ISSET( fd, &ps.rws.socket_mask ) && fstat( fd, &st ) == -1 ) - { -+#endif - int found = FALSE ; - unsigned u ; - -@@ -239,7 +301,11 @@ static void find_bad_fd(void) - } - if ( ! found ) - { -+#ifdef HAVE_POLL -+ ps.rws.pfd_array[fd].events = 0; -+#else - FD_CLR( fd, &ps.rws.socket_mask ) ; -+#endif - msg( LOG_ERR, func, - "No active service for file descriptor %d\n", fd ) ; - bad_fd_count++ ; -diff -Nurp xinetd-2.3.14-orig/xinetd/redirect.c xinetd-2.3.14-poll/xinetd/redirect.c ---- xinetd-2.3.14-orig/xinetd/redirect.c 2009-07-27 13:27:59.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/redirect.c 2009-09-02 16:00:34.000000000 +0200 -@@ -58,14 +58,19 @@ void redir_handler( struct server *serp - struct service *sp = SERVER_SERVICE( serp ); - struct service_config *scp = SVC_CONF( sp ); - int RedirDescrip = SERVER_FD( serp ); -- int maxfd; - ssize_t num_read, num_wrote=0, ret=0; - unsigned int sin_len = 0; - unsigned long bytes_in = 0, bytes_out = 0; - int no_to_nagle = 1; - int on = 1, v6on; - char buff[NET_BUFFER]; -+#ifdef HAVE_POLL -+ struct pollfd *pfd_array; -+ int pfds_last = 0; -+#else - fd_set rdfd, msfd; -+ int maxfd; -+#endif - struct timeval *timep = NULL; - const char *func = "redir_handler"; - union xsockaddr serveraddr ; -@@ -141,19 +146,43 @@ void redir_handler( struct server *serp - msg(LOG_ERR, func, "setsockopt RedirDescrip failed: %m"); - } - -+#ifdef HAVE_POLL -+#define REDIR_DESCRIP_INDEX 0 -+#define REDIR_SERVER_INDEX 1 -+ pfd_array = (struct pollfd *)calloc(sizeof(struct pollfd),INIT_POLLFDS); -+ if (pfd_array == NULL) -+ { -+ msg( LOG_ERR, func, "Cannot allocate memory for file descriptors!\n"); -+ exit( 1 ); -+ } -+ pfd_array[ REDIR_DESCRIP_INDEX ].fd = RedirDescrip; -+ pfd_array[ REDIR_DESCRIP_INDEX ].events = POLLIN; -+ pfd_array[ REDIR_SERVER_INDEX ].fd = RedirServerFd; -+ pfd_array[ REDIR_SERVER_INDEX ].events = POLLIN; -+ pfds_last += 2; -+#else - maxfd = (RedirServerFd > RedirDescrip)?RedirServerFd:RedirDescrip; - FD_ZERO(&msfd); - FD_SET(RedirDescrip, &msfd); - FD_SET(RedirServerFd, &msfd); -+#endif - - while(1) { -+#ifdef HAVE_POLL -+ if ( poll( pfd_array, pfds_last, -1 ) <= 0 ) { -+#else - memcpy(&rdfd, &msfd, sizeof(rdfd)); - if (select(maxfd + 1, &rdfd, (fd_set *)0, (fd_set *)0, timep) <= 0) { -+#endif - /* place for timeout code, currently does not time out */ - break; - } - -+#ifdef HAVE_POLL -+ if ( pfd_array[REDIR_DESCRIP_INDEX].revents ) { -+#else - if (FD_ISSET(RedirDescrip, &rdfd)) { -+#endif - do { - num_read = read(RedirDescrip, - buff, sizeof(buff)); -@@ -179,7 +208,11 @@ void redir_handler( struct server *serp - } - } - -+#ifdef HAVE_POLL -+ if ( pfd_array[REDIR_SERVER_INDEX].revents ) { -+#else - if (FD_ISSET(RedirServerFd, &rdfd)) { -+#endif - do { - num_read = read(RedirServerFd, - buff, sizeof(buff)); -diff -Nurp xinetd-2.3.14-orig/xinetd/server.c xinetd-2.3.14-poll/xinetd/server.c ---- xinetd-2.3.14-orig/xinetd/server.c 2005-03-29 17:50:34.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/server.c 2009-09-02 11:30:27.000000000 +0200 -@@ -298,7 +298,11 @@ void server_end( struct server *serp ) - - /* Added this for when accepting wait=yes services */ - if( SVC_WAITS( sp ) ) -+#ifdef HAVE_POLL -+ SVC_EVENTS( sp ) = POLLIN ; -+#else - FD_SET( SVC_FD( sp ), &ps.rws.socket_mask ) ; -+#endif /* HAVE_POLL */ - - svc_postmortem( sp, serp ) ; - server_release( serp ) ; -diff -Nurp xinetd-2.3.14-orig/xinetd/service.c xinetd-2.3.14-poll/xinetd/service.c ---- xinetd-2.3.14-orig/xinetd/service.c 2009-07-27 13:27:59.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/service.c 2009-09-02 17:03:49.000000000 +0200 -@@ -71,8 +71,6 @@ static const struct name_value service_s - { "BAD STATE", 0 } - } ; - -- -- - /* - * Allocate a new struct service and initialize it from scp - */ -@@ -115,6 +113,10 @@ struct service *svc_make_special( struct - - void svc_free( struct service *sp ) - { -+#ifdef HAVE_POLL -+ *SVC_POLLFD( sp ) = ps.rws.pfd_array[--ps.rws.pfds_last] ; -+#endif /* HAVE_POLL */ -+ - sc_free( SVC_CONF(sp) ) ; - CLEAR( *sp ) ; - FREE_SVC( sp ) ; -@@ -325,6 +327,25 @@ status_e svc_activate( struct service *s - return( OK ); - } - -+#ifdef HAVE_POLL -+ if ( ps.rws.pfds_last >= ps.rws.pfds_allocated ) -+ { -+ int pos; -+ ps.rws.pfds_allocated += INIT_POLLFDS; -+ struct pollfd *tmp = (struct pollfd *)realloc( ps.rws.pfd_array, -+ ps.rws.pfds_allocated*sizeof(struct pollfd)); -+ if ( tmp == NULL ) -+ { -+ out_of_memory( func ); -+ return( FAILED ); -+ } -+ memset(&ps.rws.pfd_array[ps.rws.pfds_last], 0, (ps.rws.pfds_allocated- -+ ps.rws.pfds_last)*sizeof(struct pollfd)); -+ ps.rws.pfd_array = tmp; -+ } -+ SVC_POLLFD( sp ) = &ps.rws.pfd_array[ps.rws.pfds_last++] ; -+#endif /* HAVE_POLL */ -+ - if( SC_IPV4( scp ) ) { - SVC_FD(sp) = socket( AF_INET, - SC_SOCKET_TYPE( scp ), SC_PROTOVAL( scp ) ) ; -@@ -390,9 +411,14 @@ status_e svc_activate( struct service *s - - SVC_STATE(sp) = SVC_ACTIVE ; - -+#ifdef HAVE_POLL -+ SVC_EVENTS( sp ) = POLLIN ; -+#else - FD_SET( SVC_FD(sp), &ps.rws.socket_mask ) ; -+ - if ( SVC_FD(sp) > ps.rws.mask_max ) - ps.rws.mask_max = SVC_FD(sp) ; -+#endif /* HAVE_POLL */ - - ps.rws.active_services++ ; - ps.rws.available_services++ ; -@@ -442,7 +468,11 @@ void svc_deactivate( struct service *sp - - if ( SVC_IS_ACTIVE( sp ) ) - { -+#ifdef HAVE_POLL -+ SVC_EVENTS( sp ) = 0; -+#else - FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ; -+#endif /* HAVE_POLL */ - ps.rws.active_services-- ; - } - -@@ -465,7 +495,15 @@ void svc_suspend( struct service *sp ) - return ; - } - -+#ifdef HAVE_POLL -+ /* -+ * don't reap the pfd from pfd_array, since we must have it allocated for -+ * SVC_FD( sp ) -+ */ -+ SVC_EVENTS( sp ) = 0; -+#else - FD_CLR( SVC_FD( sp ), &ps.rws.socket_mask ) ; -+#endif - ps.rws.active_services-- ; - if ( debug.on ) - msg( LOG_DEBUG, func, "Suspended service %s", SVC_ID( sp ) ) ; -@@ -481,7 +519,12 @@ void svc_resume( struct service *sp ) - { - const char *func = "svc_resume" ; - -+#ifdef HAVE_POLL -+ SVC_EVENTS( sp ) = POLLIN ; -+#else - FD_SET( SVC_FD( sp ), &ps.rws.socket_mask ) ; -+#endif -+ - ps.rws.active_services++ ; - if ( debug.on ) - msg( LOG_DEBUG, func, "Resumed service %s", SVC_ID( sp ) ) ; -diff -Nurp xinetd-2.3.14-orig/xinetd/service.h xinetd-2.3.14-poll/xinetd/service.h ---- xinetd-2.3.14-orig/xinetd/service.h 2005-03-29 17:50:34.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/service.h 2009-09-03 16:24:16.000000000 +0200 -@@ -17,6 +17,9 @@ - #include "pset.h" - #include "xlog.h" - #include "server.h" -+#ifdef HAVE_POLL -+#include "xpoll.h" -+#endif - - /* - * $Id: service.h,v 1.6 2012-05-09 15:40:29 bbraun Exp $ -@@ -45,7 +48,13 @@ struct service - state_e svc_state ; - int svc_ref_count ; /* # of pters to this struct */ - struct service_config *svc_conf ; /* service configuration */ -+ -+#ifdef HAVE_POLL -+ struct pollfd *svc_pfd ; /* pointer to the pollfd */ -+#else - int svc_fd ; /* The Listening FD for the service */ -+#endif /* HAVE_POLL */ -+ - unsigned svc_running_servers ; - unsigned svc_retry_servers ; - unsigned svc_attempts ; /* # of attempts to start server */ -@@ -70,7 +79,17 @@ struct service - * Field access macros - */ - #define SVC_CONF( sp ) ( (sp)->svc_conf ) -+ -+#ifdef HAVE_POLL -+#define SVC_POLLFD( sp ) ( (sp)->svc_pfd ) -+#define SVC_POLLFD_OFF( sp ) ( SVC_POLLFD( sp )-ps.rws.pfd_array ) -+#define SVC_EVENTS( sp ) ( POLLFD_EVENTS( SVC_POLLFD( sp ) ) ) -+#define SVC_REVENTS( sp ) ( POLLFD_REVENTS( SVC_POLLFD( sp ) ) ) -+#define SVC_FD( sp ) ( POLLFD_FD( SVC_POLLFD( sp ) ) ) -+#else - #define SVC_FD( sp ) ( (sp)->svc_fd ) -+#endif /* HAVE_POLL */ -+ - #define SVC_RUNNING_SERVERS( sp ) (sp)->svc_running_servers - #define SVC_RETRIES( sp ) (sp)->svc_retry_servers - #define SVC_LOG( sp ) (sp)->svc_log -diff -Nurp xinetd-2.3.14-orig/xinetd/state.h xinetd-2.3.14-poll/xinetd/state.h ---- xinetd-2.3.14-orig/xinetd/state.h 2005-03-31 01:15:28.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/state.h 2009-09-02 11:30:27.000000000 +0200 -@@ -21,7 +21,10 @@ - #endif - #include "libportable.h" - --#ifdef HAVE_SYS_SELECT_H -+#ifdef HAVE_POLL -+#include <poll.h> -+#endif -+#if HAVE_SYS_SELECT_H - #include <sys/select.h> - #endif - -@@ -32,7 +35,6 @@ - - struct read_only_state - { -- rlim_t orig_max_descriptors ; /* original soft rlimit */ - rlim_t max_descriptors ; /* original hard rlimit or OPEN_MAX */ - rlim_t process_limit ; /* if 0, there is no limit */ - int cc_interval ; /* # of seconds the cc gets invoked. */ -@@ -58,8 +60,15 @@ struct read_write_state - int available_services ; /* # of available services */ - int active_services ; /* services with descriptors set */ - /* in socket mask */ -+#ifdef HAVE_POLL -+ struct pollfd *pfd_array; /* array passed to poll(2) */ -+ int pfds_last; /* index of last fd in the array */ -+ int pfds_allocated; /* size of the array */ -+#else - fd_set socket_mask ; - int mask_max ; -+#endif /* HAVE_POLL */ -+ - pset_h servers ; /* table of running servers */ - pset_h retries ; /* table of servers to retry */ - pset_h services ; /* table of services */ -diff -Nurp xinetd-2.3.14-orig/xinetd/tcpint.c xinetd-2.3.14-poll/xinetd/tcpint.c ---- xinetd-2.3.14-orig/xinetd/tcpint.c 2009-07-27 13:27:59.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/tcpint.c 2009-09-02 16:49:32.000000000 +0200 -@@ -63,7 +63,15 @@ struct intercept_s *si_init( struct serv - return( ip ) ; - } - -+#ifdef HAVE_POLL -+static status_e handle_io( psi_h iter, channel_s *chp, -+ struct pollfd *pfd_handled, -+ struct pollfd *pfd_array, -+ int *pfds_last, -+ stream_status_e (*iofunc)() ); -+#else - static status_e handle_io( psi_h iter, channel_s *chp, fd_set *maskp, stream_status_e (*iofunc)() ); -+#endif - static stream_status_e tcp_local_to_remote( channel_s *chp ); - static stream_status_e tcp_remote_to_local( channel_s *chp ); - static void connection_request( struct intercept_s *ip, channel_s **chpp ); -@@ -82,14 +90,26 @@ void si_exit(void) - static void si_mux(void) - { - struct intercept_s *ip = &stream_intercept_state ; -+#ifdef HAVE_POLL -+ struct pollfd *pfd_array; -+ int pfds_last = 0; -+ int pfds_allocated = INIT_POLLFDS; -+#else - fd_set socket_mask ; - int mask_max ; -+#endif - psi_h iter ; - const char *func = "si_mux" ; - -+#ifdef HAVE_POLL -+ pfd_array = calloc(sizeof(struct pollfd),INIT_POLLFDS); -+ pfd_array[ pfds_last ].fd = INT_REMOTE( ip ) ; -+ pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT; -+#else - FD_ZERO( &socket_mask ) ; - FD_SET( INT_REMOTE( ip ), &socket_mask ) ; - mask_max = INT_REMOTE( ip ) ; -+#endif - - iter = psi_create( INT_CONNECTIONS( ip ) ) ; - if ( iter == NULL ) -@@ -101,26 +121,43 @@ static void si_mux(void) - for ( ;; ) - { - channel_s *chp ; -+#ifndef HAVE_POLL - fd_set read_mask ; -+#endif - int n_ready ; - -+#ifdef HAVE_POLL -+ n_ready = int_poll( pfds_last, pfd_array ) ; -+#else - read_mask = socket_mask ; - n_ready = int_select( mask_max+1, &read_mask ) ; -+#endif - - if ( n_ready == -1 ) - return ; - -+#ifdef HAVE_POLL -+ if ( pfd_array[0].revents & ( POLLIN | POLLOUT ) ) -+#else - if ( FD_ISSET( INT_REMOTE( ip ), &read_mask ) ) -+#endif - { - connection_request( ip, &chp ) ; - if ( chp != NULL ) - { -+#ifdef HAVE_POLL -+ pfd_array[ pfds_last ].fd = chp->ch_local_socket ; -+ pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT ; -+ pfd_array[ pfds_last ].fd = chp->ch_remote_socket ; -+ pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT ; -+#else - FD_SET( chp->ch_local_socket, &socket_mask ) ; - if ( chp->ch_local_socket > mask_max ) - mask_max = chp->ch_local_socket ; - FD_SET( chp->ch_remote_socket, &socket_mask ) ; - if ( chp->ch_remote_socket > mask_max ) - mask_max = chp->ch_remote_socket ; -+#endif - } - if ( --n_ready == 0 ) - continue ; -@@ -128,27 +165,57 @@ static void si_mux(void) - - for ( chp = CHP( psi_start(iter) ) ; chp ; chp = CHP( psi_next(iter) ) ) - { -+#ifdef HAVE_POLL -+ int i; -+ struct pollfd *local_pfd = NULL, *remote_pfd = NULL; -+ -+ /* TODO: detection with O(n)=1 */ -+ for (i = 0 ; i < pfds_last ; i++ ) -+ if (pfd_array[i].fd == chp->ch_local_socket) -+ local_pfd = &pfd_array[i]; -+ else if (pfd_array[i] .fd== chp->ch_remote_socket) -+ remote_pfd = &pfd_array[i]; -+ -+ if ( local_pfd != NULL && -+ local_pfd->revents & ( POLLIN | POLLOUT) ) -+#else - if ( FD_ISSET( chp->ch_local_socket, &read_mask ) ) -+#endif - { - #ifdef DEBUG_TCPINT - if ( debug.on ) - msg( LOG_DEBUG, func, "Input available on local socket %d", - chp->ch_local_socket ) ; - #endif -+#ifdef HAVE_POLL -+ if ( handle_io( iter, chp, local_pfd, pfd_array, -+ &pfds_last, tcp_local_to_remote ) == FAILED ) -+#else - if ( handle_io( iter, chp, &socket_mask, tcp_local_to_remote ) == FAILED ) -+#endif - return ; - if ( --n_ready == 0 ) - break ; - } - -+#ifdef HAVE_POLL -+ if ( remote_pfd != NULL && -+ remote_pfd->revents & ( POLLIN | POLLOUT) ) -+#else - if ( FD_ISSET( chp->ch_remote_socket, &read_mask ) ) -+#endif - { - #ifdef DEBUG_TCPINT - msg( LOG_DEBUG, func, "Input available on remote socket %d", - chp->ch_remote_socket ) ; - #endif -+#ifdef HAVE_POLL -+ if ( handle_io( iter, chp, remote_pfd, pfd_array, -+ &pfds_last, tcp_local_to_remote ) == FAILED ) -+#else - if ( handle_io( iter, chp, - &socket_mask, tcp_remote_to_local ) == FAILED ) -+#endif - return ; - if ( --n_ready == 0 ) - break ; -@@ -158,10 +225,19 @@ static void si_mux(void) - } - - -+#ifdef HAVE_POLL -+static status_e handle_io( psi_h iter, -+ channel_s *chp, -+ struct pollfd *pfd_handled, -+ struct pollfd *pfd_array, -+ int *pfds_last, -+ stream_status_e (*iofunc)() ) -+#else - static status_e handle_io( psi_h iter, - channel_s *chp, - fd_set *maskp, - stream_status_e (*iofunc)() ) -+#endif - { - const char *func = "handle_io" ; - -@@ -178,8 +254,13 @@ static status_e handle_io( psi_h iter, - xaddrname( &chp->ch_from ), ntohs(xaddrport( &chp->ch_from )), - chp->ch_local_socket, chp->ch_remote_socket ) ; - -+#ifdef HAVE_POLL -+ if ( pfd_handled != NULL) -+ *pfd_handled = pfd_array[ --( *pfds_last ) ]; -+#else - FD_CLR( chp->ch_local_socket, maskp ) ; - FD_CLR( chp->ch_remote_socket, maskp ) ; -+#endif - (void) Sclose( chp->ch_remote_socket ) ; - (void) Sclose( chp->ch_local_socket ) ; - psi_remove( iter ) ; -diff -Nurp xinetd-2.3.14-orig/xinetd/udpint.c xinetd-2.3.14-poll/xinetd/udpint.c ---- xinetd-2.3.14-orig/xinetd/udpint.c 2009-07-27 13:27:59.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/udpint.c 2009-09-02 16:59:33.000000000 +0200 -@@ -15,6 +15,9 @@ - #include <syslog.h> - #include <errno.h> - -+#ifdef HAVE_POLL -+#include <poll.h> -+#endif - #ifdef HAVE_SYS_SELECT_H - #include <sys/select.h> - #endif -@@ -97,34 +100,61 @@ void di_exit(void) - static void di_mux(void) - { - struct intercept_s *ip = &dgram_intercept_state ; -+#ifdef HAVE_POLL -+ struct pollfd *pfd_array; -+ int pfds_last = 0; -+ int pfds_allocated = INIT_POLLFDS; -+#else - fd_set socket_mask ; - int mask_max ; -+#endif - -+#ifdef HAVE_POLL -+ pfd_array = (struct pollfd *)calloc(sizeof(struct pollfd),INIT_POLLFDS); -+ pfd_array[ pfds_last ].fd = INT_REMOTE( ip ); -+ pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT; -+#else - FD_ZERO( &socket_mask ) ; - FD_SET( INT_REMOTE( ip ), &socket_mask ) ; - mask_max = INT_REMOTE( ip ) ; -+#endif - - for ( ;; ) - { - unsigned u ; - channel_s *chp ; -+#ifndef HAVE_POLL - fd_set read_mask ; -+#endif - int n_ready ; - -+#ifdef HAVE_POLL -+ n_ready = int_poll( pfds_last, pfd_array ) ; -+#else - read_mask = socket_mask ; - n_ready = int_select( mask_max+1, &read_mask ) ; -+#endif - - if ( n_ready == -1 ) - return ; - -+#ifdef HAVE_POLL -+ if ( pfd_array[0].revents & ( POLLIN | POLLOUT ) ) -+#else - if ( FD_ISSET( INT_REMOTE( ip ), &read_mask ) ) -+#endif - { - udp_remote_to_local( ip, &chp ) ; - if ( chp != NULL ) - { -+#ifdef HAVE_POLL -+ pfd_array[ pfds_last ].fd = chp->ch_local_socket ; -+ pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT ; -+#else - FD_SET( chp->ch_local_socket, &socket_mask ) ; - if ( chp->ch_local_socket > mask_max ) - mask_max = chp->ch_local_socket ; -+#endif - } - if ( --n_ready == 0 ) - continue ; -@@ -134,7 +164,17 @@ static void di_mux(void) - { - chp = CHP( pset_pointer( INT_CONNECTIONS( ip ), u ) ) ; - -+#ifdef HAVE_POLL -+ int i; -+ /* TODO: detection with O(n)=1 */ -+ for (i = 0 ; i < pfds_last ; i++) -+ if (pfd_array[i].fd == chp->ch_local_socket) -+ break; -+ if (pfd_array[i].fd == chp->ch_local_socket && -+ (pfd_array[i].revents & ( POLLIN | POLLOUT ))) -+#else - if ( FD_ISSET( chp->ch_local_socket, &read_mask ) ) -+#endif - { - if ( udp_local_to_remote( chp ) == FAILED ) - return ; -diff -Nurp xinetd-2.3.14-orig/xinetd/xmdns.c xinetd-2.3.14-poll/xinetd/xmdns.c ---- xinetd-2.3.14-orig/xinetd/xmdns.c 2005-04-08 23:23:07.000000000 +0200 -+++ xinetd-2.3.14-poll/xinetd/xmdns.c 2009-09-02 17:01:54.000000000 +0200 -@@ -109,7 +109,26 @@ int xinetd_mdns_init(void) { - ps.rws.mdns_state = NULL; - return -1; - } -+#ifdef HAVE_POLL -+ if ( ps.rws.pfds_last >= ps.rws.pfds_allocated ) -+ { -+ ps.rws.pfds_allocated += INIT_POLLFDS; -+ struct pollfd *tmp = (struct pollfd *)realloc( ps.rws.pfd_array, -+ ps.rws.pfds_allocated*sizeof(struct pollfd)); -+ if ( tmp == NULL ) -+ { -+ out_of_memory( func ); -+ return -1; -+ } -+ memset(&ps.rws.pfd_array[ps.rws.pfds_last], 0, (ps.rws.pfds_allocated- -+ ps.rws.pfds_last)*sizeof(struct pollfd)); -+ ps.rws.pfd_array = tmp; -+ } -+ ps.rws.pfd_array[ ps.rws.pfds_last ].fd = sw_discovery_socket(*(sw_discovery *)ps.rws.mdns_state); -+ ps.rws.pfd_array[ ps.rws.pfds_last++ ].events = POLLIN; -+#else - FD_SET( sw_discovery_socket(*(sw_discovery *)ps.rws.mdns_state), &ps.rws.socket_mask ) ; -+#endif - return 0; - #endif - } -diff -Nurp xinetd-2.3.14-orig/xinetd/xpoll.h xinetd-2.3.14-poll/xinetd/xpoll.h ---- xinetd-2.3.14-orig/xinetd/xpoll.h 1970-01-01 01:00:00.000000000 +0100 -+++ xinetd-2.3.14-poll/xinetd/xpoll.h 2009-09-02 11:30:27.000000000 +0200 -@@ -0,0 +1,23 @@ -+/* -+ * (c) Copyright 2009 by Red Hat Inc. -+ * All rights reserved. The file named COPYRIGHT specifies the terms -+ * and conditions for redistribution. -+ */ -+#include "config.h" -+#ifdef HAVE_POLL -+#ifndef _X_POLL_H -+#define _X_POLL_H -+ -+#include <poll.h> -+#include "defs.h" -+ -+ -+/* Field accessor methods for pollfd in defined in poll.h */ -+#define POLLFD_FD( pfd ) ( (pfd)->fd ) -+#define POLLFD_EVENTS( pfd ) ( (pfd)->events ) -+#define POLLFD_REVENTS( pfd ) ( (pfd)->revents ) -+ -+/* TODO: write memory management stuff in xpoll.c if needed */ -+ -+#endif /* _X_POLL_H */ -+#endif /* HAVE_POLL */ diff --git a/xinetd-2.3.14-readable-debuginfo.patch b/xinetd-2.3.14-readable-debuginfo.patch deleted file mode 100644 index 174791b..0000000 --- a/xinetd-2.3.14-readable-debuginfo.patch +++ /dev/null @@ -1,77 +0,0 @@ -Generate debuginfo package with all include files readable. - -The support libraries would install their header files with 640 permissions, -which is not what we want. - -diff -up xinetd-2.3.14/libs/src/misc/Makefile.in.orig xinetd-2.3.14/libs/src/misc/Makefile.in ---- xinetd-2.3.14/libs/src/misc/Makefile.in.orig 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.14/libs/src/misc/Makefile.in 2008-09-18 10:18:59.000000000 +0200 -@@ -49,7 +49,7 @@ CC_FLAGS = $(DEBUG) - CFLAGS = @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS) -I$(INCLUDEDIR) - - INSTALL = @INSTALL@ --FMODE = -m 640 # used by install -+FMODE = -m 644 # used by install - RANLIB = @RANLIB@ - - LIBNAME = lib$(NAME).a -diff -up xinetd-2.3.14/libs/src/portable/Makefile.in.orig xinetd-2.3.14/libs/src/portable/Makefile.in ---- xinetd-2.3.14/libs/src/portable/Makefile.in.orig 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.14/libs/src/portable/Makefile.in 2008-09-18 10:19:09.000000000 +0200 -@@ -44,7 +44,7 @@ CC_FLAGS = $(DEBUG) - CFLAGS = @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS) -I$(INCLUDEDIR) - - INSTALL = @INSTALL@ --FMODE = -m 640 # used by install -+FMODE = -m 644 # used by install - RANLIB = @RANLIB@ - - LIBNAME = lib$(NAME).a -diff -up xinetd-2.3.14/libs/src/pset/Makefile.in.orig xinetd-2.3.14/libs/src/pset/Makefile.in ---- xinetd-2.3.14/libs/src/pset/Makefile.in.orig 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.14/libs/src/pset/Makefile.in 2008-09-18 10:19:17.000000000 +0200 -@@ -41,7 +41,7 @@ CC_FLAGS = $(DEBUG) - CFLAGS = @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS) - - INSTALL = @INSTALL@ --FMODE = -m 640 # used by install -+FMODE = -m 644 # used by install - RANLIB = @RANLIB@ - - LIBNAME = lib$(NAME).a -diff -up xinetd-2.3.14/libs/src/sio/Makefile.in.orig xinetd-2.3.14/libs/src/sio/Makefile.in ---- xinetd-2.3.14/libs/src/sio/Makefile.in.orig 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.14/libs/src/sio/Makefile.in 2008-09-18 10:19:25.000000000 +0200 -@@ -40,7 +40,7 @@ CC_FLAGS = $(DEBUG) - CFLAGS = @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS) -I$(INCLUDEDIR) - - INSTALL = @INSTALL@ --FMODE = -m 640 # used by install -+FMODE = -m 644 # used by install - RANLIB = @RANLIB@ - - LIBNAME = lib$(NAME).a -diff -up xinetd-2.3.14/libs/src/str/Makefile.in.orig xinetd-2.3.14/libs/src/str/Makefile.in ---- xinetd-2.3.14/libs/src/str/Makefile.in.orig 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.14/libs/src/str/Makefile.in 2008-09-18 10:19:33.000000000 +0200 -@@ -51,7 +51,7 @@ CC_FLAGS = $(DEBUG) - CFLAGS = @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS) - - INSTALL = @INSTALL@ --FMODE = -m 640 # used by install -+FMODE = -m 644 # used by install - RANLIB = @RANLIB@ - - LIBNAME = lib$(NAME).a -diff -up xinetd-2.3.14/libs/src/xlog/Makefile.in.orig xinetd-2.3.14/libs/src/xlog/Makefile.in ---- xinetd-2.3.14/libs/src/xlog/Makefile.in.orig 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.14/libs/src/xlog/Makefile.in 2008-09-18 10:19:41.000000000 +0200 -@@ -46,7 +46,7 @@ CC_FLAGS = $(DEBUG) - CFLAGS = @CFLAGS@ $(CPP_FLAGS) $(CC_FLAGS) - - INSTALL = @INSTALL@ --FMODE = -m 640 # used by install -+FMODE = -m 644 # used by install - RANLIB = @RANLIB@ - - LIBNAME = lib$(NAME).a diff --git a/xinetd-2.3.14-realloc-remove.patch b/xinetd-2.3.14-realloc-remove.patch deleted file mode 100644 index 6fd1902..0000000 --- a/xinetd-2.3.14-realloc-remove.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -rup xinetd-2.3.14/xinetd/defs.h xinetd-2.3.14-mod/xinetd/defs.h ---- xinetd-2.3.14/xinetd/defs.h 2012-01-18 14:22:20.811100158 +0100 -+++ xinetd-2.3.14-mod/xinetd/defs.h 2012-01-18 13:32:46.000000000 +0100 -@@ -114,11 +114,7 @@ union xsockaddr { - * constants for limiting ps.rws.fd_list - */ - --#ifdef HAVE_POLL --#define INIT_POLLFDS 4096 --/* FIXME: not used */ --#define MAX_POLLFDS 16384 --#endif -+#define MAX_FDS 4096 - - /* - * When explicit values are given for enum's, that is because the structures -diff -rup xinetd-2.3.14/xinetd/init.c xinetd-2.3.14-mod/xinetd/init.c ---- xinetd-2.3.14/xinetd/init.c 2012-01-18 14:22:20.779100171 +0100 -+++ xinetd-2.3.14-mod/xinetd/init.c 2012-01-18 14:07:34.000000000 +0100 -@@ -151,7 +151,7 @@ static void set_fd_limit(void) - } - - if ( rl.rlim_max == RLIM_INFINITY ) -- rl.rlim_max = FD_SETSIZE; -+ rl.rlim_max = MAX_FDS; - - ps.ros.max_descriptors = rl.rlim_max ; - #else /* ! RLIMIT_NOFILE */ -@@ -283,12 +283,12 @@ static void init_rw_state( void ) - ps.rws.descriptors_free = ps.ros.max_descriptors - DESCRIPTORS_RESERVED ; - - #ifdef HAVE_POLL -- ps.rws.pfds_allocated = INIT_POLLFDS ; -+ ps.rws.pfds_allocated = ps.ros.max_descriptors ; - ps.rws.pfd_array = (struct pollfd *) - malloc( sizeof( struct pollfd ) * ps.rws.pfds_allocated ) ; - if ( ps.rws.pfd_array == NULL ) - { -- out_of_memory(func); -+ out_of_memory(func) ; - exit( 1 ) ; - } - ps.rws.pfds_last = 0 ; -diff -rup xinetd-2.3.14/xinetd/redirect.c xinetd-2.3.14-mod/xinetd/redirect.c ---- xinetd-2.3.14/xinetd/redirect.c 2012-01-18 14:22:20.780100170 +0100 -+++ xinetd-2.3.14-mod/xinetd/redirect.c 2012-01-18 12:22:08.000000000 +0100 -@@ -149,7 +149,7 @@ void redir_handler( struct server *serp - #ifdef HAVE_POLL - #define REDIR_DESCRIP_INDEX 0 - #define REDIR_SERVER_INDEX 1 -- pfd_array = (struct pollfd *)calloc(sizeof(struct pollfd),INIT_POLLFDS); -+ pfd_array = (struct pollfd *)calloc(sizeof(struct pollfd),MAX_FDS); - if (pfd_array == NULL) - { - msg( LOG_ERR, func, "Cannot allocate memory for file descriptors!\n"); -diff -rup xinetd-2.3.14/xinetd/service.c xinetd-2.3.14-mod/xinetd/service.c ---- xinetd-2.3.14/xinetd/service.c 2012-01-18 14:22:20.812100157 +0100 -+++ xinetd-2.3.14-mod/xinetd/service.c 2012-01-18 14:07:27.000000000 +0100 -@@ -114,10 +114,6 @@ struct service *svc_make_special( struct - - void svc_free( struct service *sp ) - { --#ifdef HAVE_POLL -- *SVC_POLLFD( sp ) = ps.rws.pfd_array[--ps.rws.pfds_last] ; --#endif /* HAVE_POLL */ -- - sc_free( SVC_CONF(sp) ) ; - CLEAR( *sp ) ; - FREE_SVC( sp ) ; -@@ -332,20 +328,10 @@ status_e svc_activate( struct service *s - } - - #ifdef HAVE_POLL -- if ( ps.rws.pfds_last >= ps.rws.pfds_allocated ) -+ if ( ps.rws.descriptors_free <= 0 ) - { -- int pos; -- ps.rws.pfds_allocated += INIT_POLLFDS; -- struct pollfd *tmp = (struct pollfd *)realloc( ps.rws.pfd_array, -- ps.rws.pfds_allocated*sizeof(struct pollfd)); -- if ( tmp == NULL ) -- { -- out_of_memory( func ); -- return( FAILED ); -- } -- ps.rws.pfd_array = tmp; -- memset(&ps.rws.pfd_array[ps.rws.pfds_last], 0, (ps.rws.pfds_allocated- -- ps.rws.pfds_last)*sizeof(struct pollfd)); -+ msg(LOG_ERR, func, "Maximum number of services reached") ; -+ return( FAILED ) ; - } - if ( sp->svc_pfd_index >= 0 ) - { -diff -rup xinetd-2.3.14/xinetd/tcpint.c xinetd-2.3.14-mod/xinetd/tcpint.c ---- xinetd-2.3.14/xinetd/tcpint.c 2012-01-18 14:22:20.782100169 +0100 -+++ xinetd-2.3.14-mod/xinetd/tcpint.c 2012-01-18 13:30:22.000000000 +0100 -@@ -93,7 +93,7 @@ static void si_mux(void) - #ifdef HAVE_POLL - struct pollfd *pfd_array; - int pfds_last = 0; -- int pfds_allocated = INIT_POLLFDS; -+ int pfds_allocated = MAX_FDS; - #else - fd_set socket_mask ; - int mask_max ; -@@ -102,7 +102,7 @@ static void si_mux(void) - const char *func = "si_mux" ; - - #ifdef HAVE_POLL -- pfd_array = calloc(sizeof(struct pollfd),INIT_POLLFDS); -+ pfd_array = calloc(sizeof(struct pollfd),MAX_FDS); - pfd_array[ pfds_last ].fd = INT_REMOTE( ip ) ; - pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT; - #else -diff -rup xinetd-2.3.14/xinetd/udpint.c xinetd-2.3.14-mod/xinetd/udpint.c ---- xinetd-2.3.14/xinetd/udpint.c 2012-01-18 14:22:20.783100169 +0100 -+++ xinetd-2.3.14-mod/xinetd/udpint.c 2012-01-18 12:22:00.000000000 +0100 -@@ -103,14 +103,14 @@ static void di_mux(void) - #ifdef HAVE_POLL - struct pollfd *pfd_array; - int pfds_last = 0; -- int pfds_allocated = INIT_POLLFDS; -+ int pfds_allocated = MAX_FDS; - #else - fd_set socket_mask ; - int mask_max ; - #endif - - #ifdef HAVE_POLL -- pfd_array = (struct pollfd *)calloc(sizeof(struct pollfd),INIT_POLLFDS); -+ pfd_array = (struct pollfd *)calloc(sizeof(struct pollfd),MAX_FDS); - pfd_array[ pfds_last ].fd = INT_REMOTE( ip ); - pfd_array[ pfds_last++ ].events = POLLIN | POLLOUT; - #else diff --git a/xinetd-2.3.14-retry-svc-activate-in-cps-restart.patch b/xinetd-2.3.14-retry-svc-activate-in-cps-restart.patch deleted file mode 100644 index 7ff5c0b..0000000 --- a/xinetd-2.3.14-retry-svc-activate-in-cps-restart.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Napur xinetd-2.3.14.old/xinetd/access.c xinetd-2.3.14.new/xinetd/access.c ---- xinetd-2.3.14.old/xinetd/access.c 2005-10-05 10:15:33.000000000 -0700 -+++ xinetd-2.3.14.new/xinetd/access.c 2012-02-22 20:12:09.120973124 -0800 -@@ -89,9 +89,20 @@ static void cps_service_restart(void) - msg(LOG_ERR, func, - "Activating service %s", SC_NAME(scp)); - } else { -- msg(LOG_ERR, func, -- "Error activating service %s", -- SC_NAME(scp)) ; -+ /* Try to restart the service */ -+ SVC_ATTEMPTS(sp) += 1; -+ if ( SVC_ATTEMPTS(sp) < MAX_SVC_ATTEMPTS ) { -+ msg(LOG_ERR, func, -+ "Error activating service %s, retrying %d more time(s)...", -+ SC_NAME(scp), -+ MAX_SVC_ATTEMPTS - SVC_ATTEMPTS(sp)); -+ xtimer_add(cps_service_restart, 1); -+ } else { -+ /* Give up */ -+ msg(LOG_ERR, func, -+ "Error activating service %s", -+ SC_NAME(scp)); -+ } - } /* else */ - } - } -diff -Napur xinetd-2.3.14.old/xinetd/service.c xinetd-2.3.14.new/xinetd/service.c ---- xinetd-2.3.14.old/xinetd/service.c 2012-02-22 19:16:56.288912783 -0800 -+++ xinetd-2.3.14.new/xinetd/service.c 2012-02-22 19:25:03.059356909 -0800 -@@ -397,6 +408,7 @@ status_e svc_activate( struct service *s - * Initialize the service data - */ - SVC_RUNNING_SERVERS(sp) = SVC_RETRIES(sp) = 0 ; -+ SVC_ATTEMPTS(sp) = 0; - - if ( SC_MUST_LISTEN( scp ) ) - (void) listen( SVC_FD(sp), LISTEN_BACKLOG ) ; -diff -Napur xinetd-2.3.14.old/xinetd/xconfig.h xinetd-2.3.14.new/xinetd/xconfig.h ---- xinetd-2.3.14.old/xinetd/xconfig.h 2003-02-19 09:29:28.000000000 -0800 -+++ xinetd-2.3.14.new/xinetd/xconfig.h 2012-02-22 19:20:20.360855514 -0800 -@@ -59,6 +59,12 @@ - #define DEFAULT_LOOP_TIME 10 - - /* -+ * The number of times to attempt re-activating a service after being -+ * deactivated due to the above. -+ */ -+#define MAX_SVC_ATTEMPTS 30 -+ -+/* - * Signal-to-action mapping - */ - #ifndef RECONFIG_HARD_SIG diff --git a/xinetd-2.3.14-rpc-specific-port.patch b/xinetd-2.3.14-rpc-specific-port.patch deleted file mode 100644 index 19376fd..0000000 --- a/xinetd-2.3.14-rpc-specific-port.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 1b91f7b0f67fba11ea8bbcdddef844656434c53c -Author: Jeffrey Bastian <jbastian(a)redhat.com> -Date: Tue Aug 17 13:45:20 2010 -0500 - - Let RPC services bind to a port - -diff --git a/xinetd/service.c b/xinetd/service.c -index 9f21f93..5d26885 100644 ---- a/xinetd/service.c -+++ b/xinetd/service.c -@@ -165,6 +165,7 @@ static status_e activate_rpc( struct service *sp ) - socklen_t sin_len = sizeof(tsin); - unsigned long vers ; - struct service_config *scp = SVC_CONF( sp ) ; -+ uint16_t service_port = SC_PORT( scp ) ; - struct rpc_data *rdp = SC_RPCDATA( scp ) ; - char *sid = SC_ID( scp ) ; - unsigned registered_versions = 0 ; -@@ -181,9 +182,11 @@ static status_e activate_rpc( struct service *sp ) - } - if( SC_IPV4( scp ) ) { - tsin.sa_in.sin_family = AF_INET ; -+ tsin.sa_in.sin_port = htons( service_port ) ; - sin_len = sizeof(struct sockaddr_in); - } else if( SC_IPV6( scp ) ) { - tsin.sa_in6.sin6_family = AF_INET6 ; -+ tsin.sa_in6.sin6_port = htons( service_port ); - sin_len = sizeof(struct sockaddr_in6); - } - diff --git a/xinetd-2.3.14-signal-log-hang.patch b/xinetd-2.3.14-signal-log-hang.patch deleted file mode 100644 index 18fd1a1..0000000 --- a/xinetd-2.3.14-signal-log-hang.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/xinetd/signals.c 2009-05-07 05:56:52.000000000 -0400 -+++ b/xinetd/signals.c.new 2009-05-07 05:56:44.000000000 -0400 -@@ -389,9 +390,11 @@ - break ; - - default: -- msg( LOG_NOTICE, func, "Unexpected signal %s", sig_name( sig ) ) ; -- if ( debug.on && sig == SIGINT ) -- exit( 1 ) ; -+ /* Let my_handler() queue this signal for later logging. -+ Calling msg() and thus syslog() directly here can hang up -+ the process, trying to acquire an already acquired lock, -+ because another syslog() could have been the interrupted code. */ -+ my_handler(sig); - } - } - -@@ -495,6 +497,9 @@ - default: - msg(LOG_ERR, func, "unexpected signal: %s in signal pipe", - sig_name(sig)); -+ -+ if ( debug.on && sig == SIGINT ) -+ exit( 1 ) ; - } - } - } diff --git a/xinetd-2.3.14-tcpmux.patch b/xinetd-2.3.14-tcpmux.patch deleted file mode 100644 index dd93a67..0000000 --- a/xinetd-2.3.14-tcpmux.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- xinetd-2.3.14/xinetd/service.c.tcpmux 2010-01-21 09:50:05.000000000 +0100 -+++ xinetd-2.3.14/xinetd/service.c 2010-01-21 10:21:14.000000000 +0100 -@@ -952,7 +952,12 @@ void close_all_svc_descriptors(void) - out_of_memory( "close_all_svc_descriptors" ) ; - - for ( osp = SP( psi_start( iter ) ) ; osp ; osp = SP( psi_next( iter ) ) ) -- (void) Sclose( SVC_FD( osp ) ) ; -+ { -+#ifdef HAVE_POLL -+ if ( osp && SVC_POLLFD( osp ) ) -+#endif -+ (void) Sclose( SVC_FD( osp ) ) ; -+ } - - psi_destroy( iter ) ; - } diff --git a/xinetd-2.3.14-udp-reconfig.patch b/xinetd-2.3.14-udp-reconfig.patch deleted file mode 100644 index 07e733e..0000000 --- a/xinetd-2.3.14-udp-reconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xinetd-2.3.14/xinetd/reconfig.c.orig 2010-06-01 12:58:18.000000000 +0200 -+++ xinetd-2.3.14/xinetd/reconfig.c 2010-06-01 12:58:23.000000000 +0200 -@@ -138,8 +138,8 @@ void hard_reconfig( void ) - * b. Terminate running servers and cancel retry attempts, in case - * of reconfiguration - */ -- svc_deactivate( osp ) ; - terminate_servers( osp ) ; -+ svc_deactivate( osp ) ; - cancel_service_retries( osp ) ; - - /* diff --git a/xinetd-2.3.15-PIE.patch b/xinetd-2.3.15-PIE.patch deleted file mode 100644 index d601949..0000000 --- a/xinetd-2.3.15-PIE.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xinetd-2.3.15/Makefile.in 2012-05-14 09:22:22.661617117 +0200 -+++ xinetd-2.3.15.new/Makefile.in 2012-05-14 09:32:05.260103054 +0200 -@@ -14,7 +14,7 @@ topdir = @top_srcdir@ - - LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@ - --CFLAGS += @CFLAGS@ -+CFLAGS += @CFLAGS@ -fPIE - DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -Wno-unused -g - - ---- xinetd-2.3.15/xinetd/Makefile.in 2005-03-31 01:15:28.000000000 +0200 -+++ xinetd-2.3.15.new/xinetd/Makefile.in 2012-05-14 09:32:24.183659971 +0200 -@@ -119,7 +119,7 @@ itox: itox.c - $(CC) $(CFLAGS) $(DEBUG) $(SRCDIR)/itox.c -o $@ $(LDFLAGS) $(LIBS) - - xinetd: $(OBJS) -- $(CC) $(CFLAGS) $(DEBUG) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@ -+ $(CC) $(CFLAGS) $(DEBUG) -o $@ -PIE $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@ - - clean: - rm -f $(OBJS) $(NAME) core itox diff --git a/xinetd-2.3.15-bad-port-check.patch b/xinetd-2.3.15-bad-port-check.patch deleted file mode 100644 index 7849a96..0000000 --- a/xinetd-2.3.15-bad-port-check.patch +++ /dev/null @@ -1,106 +0,0 @@ -Re-introduce bad_port_check(), which upstream dropped between 2.3.13 and 2.3.14 -for it having been "rather antiquated for years", with no justification given -for that claim. - ---- xinetd-2.3.15/xinetd/builtins.c 2012-05-09 17:40:29.000000000 +0200 -+++ xinetd-2.3.15.new/xinetd/builtins.c 2012-05-14 10:25:00.431529805 +0200 -@@ -52,6 +52,7 @@ static void dgram_daytime(const struct s - static void stream_chargen(const struct server *) ; - static void dgram_chargen(const struct server *) ; - static void tcpmux_handler(const struct server *) ; -+static int bad_port_check(const union xsockaddr *, const char *); - - /* - * SG - This is the call sequence to get to a built-in service -@@ -163,6 +164,25 @@ static void stream_echo( const struct se - Sclose(descriptor); - } - -+/* For internal UDP services, make sure we don't respond to our ports -+ * on other servers and to low ports of other services (such as DNS). -+ * This can cause looping. -+ */ -+static int bad_port_check( const union xsockaddr *sa, const char *func ) -+{ -+ uint16_t port = 0; -+ -+ port = ntohs( xaddrport( sa ) ); -+ -+ if ( port < 1024 ) { -+ msg(LOG_WARNING, func, -+ "Possible Denial of Service attack from %s %d", xaddrname(sa), port); -+ return (-1); -+ } -+ -+ return (0); -+} -+ - static void dgram_echo( const struct server *serp ) - { - char buf[ DATAGRAM_SIZE ] ; -@@ -170,6 +190,7 @@ static void dgram_echo( const struct ser - ssize_t cc ; - socklen_t sin_len = 0; - int descriptor = SERVER_FD( serp ) ; -+ const char *func = "dgram_echo" ; - - if( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) - sin_len = sizeof( struct sockaddr_in ); -@@ -178,6 +199,7 @@ static void dgram_echo( const struct ser - - cc = recvfrom( descriptor, buf, sizeof( buf ), 0, (struct sockaddr *)( &lsin ), &sin_len ) ; - if ( cc != (ssize_t)-1 ) { -+ if( bad_port_check(&lsin, func) != 0 ) return; - (void) sendto( descriptor, buf, (size_t)cc, 0, SA( &lsin ), sizeof( lsin ) ) ; - } - } -@@ -292,6 +314,7 @@ static void dgram_daytime( const struct - unsigned int buflen = sizeof( time_buf ) ; - int descriptor = SERVER_FD( serp ) ; - ssize_t val; -+ const char *func = "dgram_daytime" ; - - if ( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) - sin_len = sizeof( struct sockaddr_in ); -@@ -303,6 +326,8 @@ static void dgram_daytime( const struct - if ( val == (ssize_t)-1 ) - return ; - -+ if( bad_port_check(&lsin, func) != 0 ) return; -+ - daytime_protocol( time_buf, &buflen ) ; - - (void) sendto( descriptor, time_buf, buflen, 0, SA(&lsin), sizeof( lsin ) ) ; -@@ -359,6 +384,7 @@ static void dgram_time( const struct ser - socklen_t sin_len = 0 ; - int fd = SERVER_FD( serp ) ; - ssize_t val; -+ const char *func = "dgram_time" ; - - if ( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) - sin_len = sizeof( struct sockaddr_in ); -@@ -368,6 +394,7 @@ static void dgram_time( const struct ser - val = recvfrom( fd, buf, sizeof( buf ), 0, (struct sockaddr *)( &lsin ), &sin_len ); - if ( val == (ssize_t)-1 ) - return ; -+ if( bad_port_check(&lsin, func) != 0 ) return; - - time_protocol( time_buf ) ; - (void) sendto( fd, (char *) time_buf, 4, 0, SA( &lsin ), sin_len ) ; -@@ -466,6 +493,7 @@ static void dgram_chargen( const struct - int fd = SERVER_FD( serp ) ; - unsigned int left = sizeof( buf ) ; - ssize_t val; -+ const char *func = "dgram_chargen" ; - - if ( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) - sin_len = sizeof( struct sockaddr_in ); -@@ -480,6 +508,8 @@ static void dgram_chargen( const struct - bad_variable = 1 ; /* this will cause a compilation error */ - #endif - -+ if( bad_port_check(&lsin, func) != 0 ) return; -+ - for ( p = buf ; left > 2 ; left -= len, p += len ) - { - len = min( LINE_LENGTH+2, left ) ; diff --git a/xinetd-2.3.15-context-exepath.patch b/xinetd-2.3.15-context-exepath.patch deleted file mode 100644 index 1ecc432..0000000 --- a/xinetd-2.3.15-context-exepath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xinetd-2.3.15/xinetd/child.c 2013-06-25 14:12:24.599767760 +0200 -+++ xinetd-2.3.15/xinetd/child.c.new 2013-06-25 14:14:57.463905500 +0200 -@@ -532,7 +532,7 @@ static int set_context_from_socket( cons - if (getpeercon(fd, &peer_context) < 0) - goto fail; - -- exepath = SC_SERVER_ARGV( scp )[0]; -+ exepath = SC_SERVER( scp ); - if (getfilecon(exepath, &exec_context) < 0) - goto fail; - diff --git a/xinetd-2.3.15-creds.patch b/xinetd-2.3.15-creds.patch deleted file mode 100644 index a9f1db9..0000000 --- a/xinetd-2.3.15-creds.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch by Thomas Swan <thomas.swan(a)gmail.com> - -diff --git a/xinetd/builtins.c b/xinetd/builtins.c -index e61502f..a414cf3 100644 ---- a/xinetd/builtins.c -+++ b/xinetd/builtins.c -@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp ) - if( SC_IS_INTERNAL( scp ) ) { - SC_INTERNAL(scp, nserp); - } else { -- exec_server(nserp); -+ child_process(nserp); - } - } - diff --git a/xinetd-2.3.15-pie.patch b/xinetd-2.3.15-pie.patch deleted file mode 100644 index 255a10a..0000000 --- a/xinetd-2.3.15-pie.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xinetd-2.3.15/Makefile.in 2012-05-14 09:22:22.661617117 +0200 -+++ xinetd-2.3.15.new/Makefile.in 2012-05-14 09:32:05.260103054 +0200 -@@ -14,7 +14,7 @@ topdir = @top_srcdir@ - - LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@ - --CFLAGS += @CFLAGS@ -+CFLAGS += @CFLAGS@ -fpie - DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -Wno-unused -g - - ---- xinetd-2.3.15/xinetd/Makefile.in 2005-03-31 01:15:28.000000000 +0200 -+++ xinetd-2.3.15.new/xinetd/Makefile.in 2012-05-14 09:32:24.183659971 +0200 -@@ -119,7 +119,7 @@ itox: itox.c - $(CC) $(CFLAGS) $(DEBUG) $(SRCDIR)/itox.c -o $@ $(LDFLAGS) $(LIBS) - - xinetd: $(OBJS) -- $(CC) $(CFLAGS) $(DEBUG) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@ -+ $(CC) $(CFLAGS) $(DEBUG) -o $@ -pie $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@ - - clean: - rm -f $(OBJS) $(NAME) core itox diff --git a/xinetd-2.3.15-remove-deprecated-flask.h.patch b/xinetd-2.3.15-remove-deprecated-flask.h.patch deleted file mode 100644 index 1cb4e54..0000000 --- a/xinetd-2.3.15-remove-deprecated-flask.h.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up xinetd-2.3.15/xinetd/child.c.remove-flaskh xinetd-2.3.15/xinetd/child.c ---- xinetd-2.3.15/xinetd/child.c.remove-flaskh 2020-04-07 12:28:52.538123162 +0200 -+++ xinetd-2.3.15/xinetd/child.c 2020-04-07 12:28:58.980980069 +0200 -@@ -33,7 +33,6 @@ - #endif - #ifdef LABELED_NET - #include <selinux/selinux.h> --#include <selinux/flask.h> - #include <selinux/context.h> - #endif - -@@ -551,7 +550,7 @@ static int set_context_from_socket( cons - if (!(new_context = context_str(bcon))) - goto fail; - -- if (security_compute_create(new_context, exec_context, SECCLASS_PROCESS, -+ if (security_compute_create(new_context, exec_context, string_to_security_class("process"), - &new_exec_context) < 0) - goto fail; - diff --git a/xinetd-2.3.15-tcpmux-nameinargs-disable-service.patch b/xinetd-2.3.15-tcpmux-nameinargs-disable-service.patch deleted file mode 100644 index a42bd84..0000000 --- a/xinetd-2.3.15-tcpmux-nameinargs-disable-service.patch +++ /dev/null @@ -1,50 +0,0 @@ -Xinetd parses and applies its configuration line by line. If a user wants to -specify NAMEINARGS as a flag, it has to be *before* specifying 'server_args'. - -Author: Jan Synacek <jsynacek(a)redhat.com> -Resolves: #1033528 - ---- a/xinetd/parse.c 2013-11-21 10:51:25.025436376 +0100 -+++ b/xinetd/parse.c 2013-11-21 14:45:44.374121057 +0100 -@@ -633,7 +633,28 @@ static status_e identify_attribute( entr - - if ( (*ap->a_parser)( attr_values, scp, op ) == OK ) - { /* This is the normal path. */ -- SC_SPECIFY( scp, ap->a_id ) ; -+ /* If flags contain NAMEINARGS and server_args is already set, disable the service. -+ Server args are already set incorrectly. */ -+ if ( strcmp( ap->a_name, "flags" ) == 0 && -+ SC_SERVER_ARGV( scp ) ) -+ { -+ int i = 0, n = pset_count( attr_values ) ; -+ for ( ; i < n ; i++ ) { -+ char *v = (char *)pset_pointer( attr_values, i ) ; -+ if ( strcmp( v, "NAMEINARGS" ) == 0 ) -+ break ; -+ } -+ -+ if ( i != n ) { -+ parsemsg( LOG_ERR, func, -+ "NAMEINARGS flag is set after server_args - DISABLING SERVICE" ) ; -+ SC_DISABLE( scp ) ; -+ } -+ } -+ else -+ { -+ SC_SPECIFY( scp, ap->a_id ) ; -+ } - } - else if ( entry_type == SERVICE_ENTRY ) - { ---- a/xinetd/xinetd.conf.man 2013-12-03 10:06:35.717977075 +0100 -+++ b/xinetd/xinetd.conf.man 2013-12-03 10:41:14.779089430 +0100 -@@ -106,7 +106,8 @@ - This will cause the first argument in "server_args" to be argv[0] when - executing the server, as specified in "server". This allows you to use - tcpd by putting tcpd in "server" and the name of the server in "server_args" --like in normal inetd. -+like in normal inetd. This flag has to be specified before "server_args", -+otherwise is not taken into account. - .TP - .B NODELAY - If the service is a tcp service and the NODELAY flag is set, then the diff --git a/xinetd-2.3.15-udp-wait.patch b/xinetd-2.3.15-udp-wait.patch deleted file mode 100644 index 44a615c..0000000 --- a/xinetd-2.3.15-udp-wait.patch +++ /dev/null @@ -1,37 +0,0 @@ -Resolves: #1567239 - ---- a/xinetd/confparse.c 2018-05-04 11:00:11.019748833 +0200 -+++ b/xinetd/confparse.c 2018-05-04 11:49:26.519996478 +0200 -@@ -860,6 +860,14 @@ static status_e check_entry( struct serv - } - } - -+ if ( SC_SOCKET_TYPE(scp) == SOCK_DGRAM && !SC_WAITS(scp) ) -+ { -+ msg( LOG_ERR, func, -+ "Service %s has socket_type dgram, but does not wait", -+ SC_NAME(scp) ); -+ return FAILED; -+ } -+ - if ( service_attr_check( scp ) == FAILED ) - return( FAILED ) ; - ---- a/xinetd/main.c 2018-05-04 10:02:11.999315632 +0200 -+++ b/xinetd/main.c 2018-05-04 10:03:44.124500979 +0200 -@@ -296,6 +296,7 @@ static void find_bad_fd(void) - SVC_ID( sp ) ) ; - svc_deactivate( sp ) ; - found = TRUE ; -+ bad_fd_count++ ; - break ; - } - } -@@ -303,6 +304,7 @@ static void find_bad_fd(void) - { - #ifdef HAVE_POLL - ps.rws.pfd_array[fd].events = 0; -+ ps.rws.pfd_array[fd].fd = -1; - #else - FD_CLR( fd, &ps.rws.socket_mask ) ; - #endif diff --git a/xinetd.service b/xinetd.service deleted file mode 100644 index abf097d..0000000 --- a/xinetd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Xinetd A Powerful Replacement For Inetd -After=syslog.target network.target -Documentation=man:xinetd -Documentation=man:xinetd.conf -Documentation=man:xinetd.log - -[Service] -Type=forking -PIDFile=/var/run/xinetd.pid -ExecStart=/usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid -ExecReload=/usr/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target - diff --git a/xinetd.spec b/xinetd.spec deleted file mode 100644 index 9f0da5d..0000000 --- a/xinetd.spec +++ /dev/null @@ -1,485 +0,0 @@ -Summary: A secure replacement for inetd -Name: xinetd -Version: 2.3.15 -Release: 34%{?dist} -License: xinetd -Epoch: 2 -URL: https://github.com/xinetd-org/xinetd -# source can be downloaded at -# https://github.com/xinetd-org/xinetd/archive/xinetd-2-3-15.tar.gz -Source: xinetd-%{version}.tar.gz -Source1: xinetd.service -Patch0: xinetd-2.3.15-pie.patch -Patch4: xinetd-2.3.14-bind-ipv6.patch -Patch6: xinetd-2.3.14-man-section.patch -Patch7: xinetd-2.3.15-PIE.patch -Patch8: xinetd-2.3.14-ident-bind.patch -Patch9: xinetd-2.3.14-readable-debuginfo.patch -# Patch for clean reconfiguration using newer versions of autotools -Patch10: xinetd-2.3.14-autoconf.patch -# Completely rewritten socket handling code (it uses poll() instead -# of select() function) -Patch11: xinetd-2.3.14-poll.patch -# New configuration option (limit for files opened by child process) -Patch12: xinetd-2.3.14-file-limit.patch -# When using tcpmux, xinetd ended up with sigsegv -# (detection of NULL pointer in pollfd structure was missing) -Patch13: xinetd-2.3.14-tcpmux.patch -# When service is destroyed, destroy also its -# file descriptor in array given to poll function -Patch14: xinetd-2.3.14-clean-pfd.patch -# xinetd confuses ipv6 and ipv4 port parsing -# - furtunately, they have the same format, so everything -# works even without this patch -Patch15: xinetd-2.3.14-ipv6confusion.patch -# This fixes bug #593904 - online reconfiguration caused log message -# flood when turning off UDP service -Patch16: xinetd-2.3.14-udp-reconfig.patch -Patch18: xinetd-2.3.14-rpc-specific-port.patch -Patch19: xinetd-2.3.14-signal-log-hang.patch -Patch20: xinetd-2.3.14-fix-type-punned-ptr.patch -# Fix leaking file descriptors and pfd_array wasting -# This fixes #702670 -Patch21: xinetd-2.3.14-leaking-fds.patch -# Fix memory corruption when loading a large number of services -# This fixes #720390 -Patch22: xinetd-2.3.14-many-services.patch -# Remove realloc of fds that was causing memory corruption -Patch23: xinetd-2.3.14-realloc-remove.patch -# Fix leaking descriptor when starting a service fails -Patch24: xinetd-2.3.14-leaking-fds-2a.patch -# Fix #770858 - Instances limit in xinetd can be easily bypassed -Patch25: xinetd-2.3.14-instances.patch -# Fix #809272 - Service disabled due to bind failure -Patch26: xinetd-2.3.14-retry-svc-activate-in-cps-restart.patch -Patch27: xinetd-2.3.15-bad-port-check.patch -# Fix #977873 - Use full path to server when checking selinux context -Patch28: xinetd-2.3.15-context-exepath.patch -Patch29: xinetd-2.3.15-creds.patch -# Fix #1033528 - xinetd segfaults when connecting to tcpmux service -Patch30: xinetd-2.3.15-tcpmux-nameinargs-disable-service.patch -Patch31: xinetd-2.3.15-udp-wait.patch -Patch32: xinetd-2.3.15-remove-deprecated-flask.h.patch - -BuildRequires: gcc -BuildRequires: autoconf, automake, libtirpc-devel -BuildRequires: libselinux-devel >= 1.30 -BuildRequires: systemd-units -Requires(post): systemd-sysv -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -Requires: filesystem >= 2.0.1, setup -Provides: inetd - - -%description -Xinetd is a secure replacement for inetd, the Internet services -daemon. Xinetd provides access control for all services based on the -address of the remote host and/or on time of access and can prevent -denial-of-access attacks. Xinetd provides extensive logging, has no -limit on the number of server arguments, and lets you bind specific -services to specific IP addresses on your host machine. Each service -has its own specific configuration file for Xinetd; the files are -located in the /etc/xinetd.d directory. - -%prep -%setup -q - -# SPARC/SPARC64 needs -fPIE/-PIE -# This really should be detected by configure. -%ifarch sparcv9 sparc64 -%patch7 -p1 -b .PIE -%else -%patch0 -p1 -b .pie -%endif -%patch4 -p1 -b .bind -%patch6 -p1 -b .man-section -%patch8 -p1 -b .ident-bind -%patch9 -p1 -b .readable-debuginfo -%patch10 -p1 -b .autoconf -%patch11 -p1 -b .poll -%patch12 -p1 -b .file-limit -%patch13 -p1 -b .tcpmux -%patch14 -p1 -b .clean-pfd -%patch15 -p1 -b .ipv6confusion -%patch16 -p1 -b .udp-reconfig -%patch18 -p1 -b .rpc-specific-port -%patch19 -p1 -b .signal-log-hang -%patch20 -p1 -b .fix-type-punned-ptr -%patch21 -p1 -b .leaking-fds -%patch22 -p1 -b .many-services -%patch23 -p1 -b .realloc-remove -%patch24 -p1 -b .leaking-fds-2a -%patch25 -p1 -b .instances -%patch26 -p1 -b .retry-svc-activate -%patch27 -p1 -b .bad-port-check -%patch28 -p1 -b .context-exepath -%patch29 -p1 -b .creds -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -b .drop-flaskh - -aclocal -autoconf - -%build -# -pie -PIE flags added by separate patches -%configure --with-loadavg --with-inet6 --with-labeled-networking -make CFLAGS="$CFLAGS $(pkg-config --cflags libtirpc)" LDFLAGS="$LDFLAGS $(pkg-config --libs libtirpc) -Wl,-z,relro,-z,now" - -%install -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -mkdir -m 700 -p $RPM_BUILD_ROOT/etc/xinetd.d/ -# Remove unneeded service -rm -f contrib/xinetd.d/ftp-sensor -%make_install DAEMONDIR=$RPM_BUILD_ROOT/usr/sbin MANDIR=$RPM_BUILD_ROOT/%{_mandir} -install -m 600 contrib/xinetd.conf $RPM_BUILD_ROOT/etc -install -m 600 contrib/xinetd.d/* $RPM_BUILD_ROOT/etc/xinetd.d -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir} - -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/itox* -rm -f $RPM_BUILD_ROOT/usr/sbin/itox -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/xconv.pl* -rm -f $RPM_BUILD_ROOT/usr/sbin/xconv.pl - -%post -%systemd_post xinetd.service - -%preun -%systemd_preun xinetd.service - -%postun -%systemd_postun_with_restart xinetd.service - -%files -%doc CHANGELOG COPYRIGHT README xinetd/sample.conf contrib/empty.conf -%config(noreplace) /etc/xinetd.conf -%{_unitdir}/xinetd.service -%dir /etc/xinetd.d/ -%config(noreplace) /etc/xinetd.d/* -/usr/sbin/xinetd -%{_mandir}/*/* - -%changelog -* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-34 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Apr 7 2020 Petr Lautrbach <plautrba(a)redhat.com> - 2:2.3.15-32 -- Remove deprecation warning about flask.h usage - -* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Mar 20 2019 Peter Robinson <pbrobinson(a)fedoraproject.org> 2:2.3.15-29 -- Own the xinetd.d config directory - -* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 5 2018 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-26 -- fix xinetd infinite busy loop when datagram service has wait=yes (#1567239) - -* Thu Mar 15 2018 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-25 -- fix compilation, missing rpc headers (#1556550) - -* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Björn Esser <besser82(a)fedoraproject.org> - 2:2.3.15-23 -- Rebuilt for switch to libxcrypt - -* Mon Dec 4 2017 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-22 -- remove build dependency on tcp_wrappers (#1518797) - -* Tue Nov 07 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2:2.3.15-21 -- Remove old crufty coreutils requires - -* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.3.15-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.15-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.15-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.15-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Feb 24 2014 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-13 -- drop sysconfig-related stuff -- add documentation reference to the service file - -* Tue Jan 14 2014 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-12 -- fix bad URL - -* Fri Dec 13 2013 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-11 -- fixup of the previous patch -- Resolves: #1042652 -- Related: #1033528 - -* Tue Dec 3 2013 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-10 -- xinetd segfaults when connecting to tcpmux service -- Resolves: #1033528 - -* Fri Oct 4 2013 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-9 -- xinetd should not depend on NetworkManager-wait-online -- Resolves: #1002294 - -* Thu Oct 3 2013 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-8 -- Honor user and group directives -- Resolves: CVE-2013-4342 - -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.15-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jun 26 2013 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-6 -- Use full path to server when checking selinux context -- Resolves: #977873 - -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.15-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Sep 03 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-4 -- Change config files' permissions -- Resolves: #853144 - -* Wed Aug 22 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-3 -- Replace the makeinstall macro -- Add systemd-rpm macros -- Resolves: #850370 - -* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon May 14 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.15-1 -- Update to 2.3.15 -- Drop patches merged by upstream - (-log-crash, -tcp_rpc, -label, -contextconf, -ssize_t) -- Update -pie, -PIE, -poll patch -- Resolves: #820927 -- Add -bad-port-check patch - -* Fri Apr 13 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.14-46 -- Fix: service file: avoid problems when name resolution is not ready -- Resolves: #748931 - -* Fri Apr 13 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.14-45 -- Fix: Service disabled due to bind failure -- Update patch: xinetd-2.3.14-leaking-fds-2.patch -- Resolves: #809272 - -* Mon Mar 05 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.14-44 -- Fix: Instances limit in xinetd can be easily bypassed -- Resolves: #770858 - -* Mon Mar 05 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.14-43 -- Fix xinetd.service permissions -- Remove useless INSTALL from package documentation -- Implement reload in xinetd.service - -* Fri Mar 02 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.14-42 -- Fix leaking descriptor when starting a service fails (#795188) - -* Wed Jan 18 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.14-41 -- Remove realloc inside svc_activate that was causing memory corruption -- Number of alloc'd file descriptors is now determined by system limits (ulimit -n) -- Add patch -realloc-remove - -* Tue Jan 17 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.14-40 -- Fix memory corruption when loading a large number of services -- Resolves #720390 - -* Mon Jan 16 2012 Jan Synáček <jsynacek(a)redhat.com> - 2:2.3.14-39 -- Fix leaking file descriptors -- Resolves: #702670 - -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.14-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Sep 12 2011 Tom Callaway <spot(a)fedoraproject.org> - 2:2.3.14-37 -- covert to systemd - -* Thu Apr 21 2011 Vojtech Vitek (V-Teq) <vvitek(a)redhat.com> - 2:2.3.14-36 -- Fix build warning about "dereferencing type-punned pointer" - Related: #695674 -- Avoid possible hang while logging an unexpected signal - Related: #501604 -- Let RPC services bind to a specific port - Related: #624800 - -* Fri Feb 18 2011 Vojtech Vitek (V-Teq) <vvitek(a)redhat.com> - 2:2.3.14-35 -- fix crash when application's logfile hit size limit - Related: #244063 - -* Mon Feb 14 2011 Vojtech Vitek (V-Teq) <vvitek(a)redhat.com> - 2:2.3.14-34 -- Add -Wl,-z,relro,-z,now to LDFLAGS - -* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.14-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jun 02 2010 Jan Zeleny <jzeleny(a)redhat.com> - 2:2.3.14-32 -- fixed log message flooding when turning off UDP service during online - reconfiguration (#593904) - -* Fri Mar 19 2010 Jan Zeleny <jzeleny(a)redhat.com> - 2:2.3.14-31 -- corrected port parsing code (IPv4 and IPv6 were switched) -- commented patches I'm familiar with in spec file - -* Fri Mar 19 2010 Jan Zeleny <jzeleny(a)redhat.com> - 2:2.3.14-30 -- fixed flooding log with error messages when disabled service at runtime -- updated release number to 30 to prevent rpm from detecting this as downgrade - -* Thu Jan 21 2010 Jan Zeleny <jzeleny(a)redhat.com> - 2:2.3.14-28 -- fixed issue with tcpmux service (#543968) - -* Tue Oct 20 2009 Jan Zeleny <jzeleny(a)redhat.com> - 2:2.3.14-27 -- last update of init script modified to work with SELinux correctly -- added support for new configuration option - file limit for service - -* Mon Oct 12 2009 Jan Zeleny <jzeleny(a)redhat.com> - 2:2.3.14-26 -- updated init script (LSB compliance - #528154) - -* Thu Sep 17 2009 Jan Zeleny <jzeleny(a)redhat.com> - 2:2.3.14-25 -- correction of last patch replacing select() with poll() - -* Mon Sep 14 2009 Jan Zeleny <jzeleny(a)redhat.com> - 2:2.3.14-24 -- select() function and it's supporting macros replaced by poll() and it's supporting macros -- added patch of configure.in for clean compilation - -* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.14-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2:2.3.14-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Sep 18 2008 Jan Safranek <jsafranek(a)redhat.com> - 2:2.3.14-21 -- fix glitches found during package review (#226560) -- make all files in .debuginfo package readable by everyone - -* Wed Jul 16 2008 Jan Safranek <jsafranek(a)redhat.com> - 2:2.3.14-20 -- fix wrong bind() call (#448069) - -* Thu May 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2:2.3.14-19 -- fix sparc fPIE issues - -* Thu Jan 31 2008 Jan Safranek <jsafranek(a)redhat.com> - 2:2.3.14-18 -- fixed LABEL flag (#430929) - -* Wed Jan 30 2008 Jan Safranek <jsafranek(a)redhat.com> - 2:2.3.14-17 -- fixing init scripts (#430816) - -* Mon Jan 28 2008 Jan Safranek <jsafranek(a)redhat.com> - 2:2.3.14-16 -- xinetd.log man page is in the right section now (#428812) - -* Thu Sep 6 2007 Jan Safranek <jsafranek(a)redhat.com> - 2:2.3.14-15 -- initscript made LSB compliant (#247099) - -* Thu Sep 6 2007 Jan Safranek <jsafranek(a)redhat.com> - 2:2.3.14-14 -- removed inetdconvert script, nobody is using inetd - -* Wed Aug 22 2007 Jan Safranek <jsafranek(a)redhat.com> - 2:2.3.14-13 -- updated license field - -* Wed May 16 2007 Jan Safranek <jsafranek(a)redhat.com> - 2:2.3.14-12 -- bind IPv6 socket by default and switch to IPv4 on error - (bz#195265) -- service xinetd status returns actual status (bz#232887) -- use ssize_t instead of int (bz#211776) - -* Mon Dec 4 2006 Thomas Woerner <twoerner(a)redhat.com> - 2:2.3.14-11 -- tcp_wrappers has a new devel and libs sub package, therefore changing build - requirement for tcp_wrappers to tcp_wrappers-devel - -* Fri Dec 01 2006 James Antill <james.antill(a)redhat.com> - 2:2.3.14-9 -- Fix getpeercon() for LABELED networking MLS environments -- Resolves: rhbz#209379 - -* Sun Oct 01 2006 Jesse Keating <jkeating(a)redhat.com> - 2:2.3.14-8 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Wed Sep 20 2006 Steve Grubb <sgrubb(a)redhat.com> 2:2.3.14-7 -- Revised labeled networking patch to not allow redirection - -* Tue Aug 29 2006 Steve Grubb <sgrubb(a)redhat.com> 2:2.3.14-6 -- Revised labeled networking patch again - -* Thu Aug 24 2006 Steve Grubb <sgrubb(a)redhat.com> 2:2.3.14-5 -- Revised labeled networking patch - -* Wed Aug 23 2006 Steve Grubb <sgrubb(a)redhat.com> 2:2.3.14-4 -- Added labeled networking patch - -* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 2:2.3.14-3.1 -- rebuild - -* Fri Jun 16 2006 Steve Grubb <sgrubb(a)redhat.com> 2:2.3.14-3 -- Rework spec file & use xinetd's sevice config files - -* Fri Mar 24 2006 Jay Fenlason <fenlason(a)redhat.com> 2:2.3.14-2 -- Upgrade to new upstream version. This obsoletes the -libwrap, - -rpc, -banner, -bug140084 and -gcc4 patches. - -* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 2:2.3.13-6.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 2:2.3.13-6.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> -- rebuilt - -* Thu Feb 17 2005 Jay Fenlason <fenlason(a)redhat.com> 2:2.3.13-6 -- include new patch to allow gcc4 to compile xinetd. - -* Sat Jan 8 2005 Jay Fenlason <fenlason(a)redhat.com> 2:2.3.13-4 -- Added patch committed to upstream CVS to fix bz#140084 - (error logging accidentally using one of [012] as the syslog - descriptor) - -* Fri Jun 18 2004 Jay Fenlason <fenlason(a)redhat.com> 2:2.3.13-3 -- Add patch to fix #126242: banner's don't work - -* Thu Jun 17 2004 Jay Fenlason <fenlason(a)redhat.com> -- Remove the configuration for the no-longer-present "services" service. - Closes #126169 - -* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Fri May 14 2004 Jay Fenlason <fenlason(a)redhat.com> -- Add patch to allow multiple rpc services to cooexist as long as they're - different program numbers or different versions. - -* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Thu Jan 29 2004 Jay Fenlason <fenlason(a)redhat.com> 2.3.13-1 -- Upgrade to new upstream version, which obsoletes most patches. -- Add new tcp_rpc patch, to turn on the nolibwrap flag on tcp rpc services, - since libwrap cannot be used on them. - -* Sun Dec 28 2003 Florian La Roche <Florian.LaRoche(a)redhat.de> -- use new technology to filter python dep for inetdconvert instead - of changing the -x bit on file permissions - diff --git a/xinetd.sysconf b/xinetd.sysconf deleted file mode 100644 index 9edfe8c..0000000 --- a/xinetd.sysconf +++ /dev/null @@ -1,10 +0,0 @@ -# Add extra options here -EXTRAOPTIONS="" -# -# This is the locale information that xinetd uses. It is passed to every -# server that xinetd starts. It is set to en_US to maintain compatability -# with previous Red Hat Linux releases. -# -# To remove all locale information from xinetd's environment, set -# XINETD_LANG to the empty string or the string "none". -XINETD_LANG="en_US"

3 years, 4 months

1
0
0 / 0

Architecture specific change in rpms/rust-clap.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-clap.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-clap.git/commit/?id=0e019ca1.... Change: +%ifnarch aarch64 Thanks. Full change: ============ commit 0e019ca167404aadb276925d5ff9a1906f8aa06a Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Dec 10 16:45:18 2020 +0100 temporarily disable doctests on aarch64 diff --git a/rust-clap.spec b/rust-clap.spec index 8b37164..50bc04c 100644 --- a/rust-clap.spec +++ b/rust-clap.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 2.33.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple to use, efficient, and full-featured Command Line Argument Parser # Upstream license specification: MIT @@ -239,10 +239,19 @@ which use "yaml-rust" feature of "%{crate}" crate. %if %{with check} %check +%ifnarch aarch64 %cargo_test +%else +# rustdoc fails to compile some doctests on aarch64 +# https://bugzilla.redhat.com/show_bug.cgi?id=1902663 +%cargo_test -- --lib +%endif %endif %changelog +* Thu Dec 10 2020 Fabio Valentini <decathorpe(a)gmail.com> - 2.33.3-4 +- Temporarily disable doctests on aarch64. + * Wed Nov 25 2020 Fabio Valentini <decathorpe(a)gmail.com> - 2.33.3-3 - Remove features that have broken dependencies or are nightly-only.

3 years, 4 months

1
0
0 / 0

Architecture specific change in rpms/rust-slog.git

by githook-noreply＠fedoraproject.org

The package rpms/rust-slog.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-slog.git/commit/?id=f8bf8173.... Change: +%ifnarch aarch64 Thanks. Full change: ============ commit f8bf8173f58c1d6de7de2e269589a99eddf540d2 Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Dec 10 16:43:14 2020 +0100 temporarily disable doctests on aarch64 diff --git a/rust-slog.spec b/rust-slog.spec index 522e531..46d0d1e 100644 --- a/rust-slog.spec +++ b/rust-slog.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 2.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Structured, extensible, composable logging for Rust # Upstream license specification: MPL-2.0 OR MIT OR Apache-2.0 @@ -271,10 +271,19 @@ which use "std" feature of "%{crate}" crate. %if %{with check} %check +%ifnarch aarch64 %cargo_test +%else +# rustdoc fails to compile some doctests on aarch64 +# https://bugzilla.redhat.com/show_bug.cgi?id=1902663 +%cargo_test -- --lib +%endif %endif %changelog +* Thu Dec 10 2020 Fabio Valentini <decathorpe(a)gmail.com> - 2.7.0-2 +- Temporarily disable doctests on aarch64. + * Mon Nov 30 2020 Fabio Valentini <decathorpe(a)gmail.com> - 2.7.0-1 - Update to version 2.7.0. - Fixes RHBZ#1902585

3 years, 4 months

1
0
0 / 0

Architecture specific change in rpms/xalan-c.git

by githook-noreply＠fedoraproject.org

The package rpms/xalan-c.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/xalan-c.git/commit/?id=31274e91d4.... Change: -%ifarch alpha %{power64} s390x sparc64 x86_64 aarch64 Thanks. Full change: ============ commit bd312eca88e1c66f3dc9770348df8c61ecf52329 Author: Benjamin Beasley <code(a)musicinmybrain.net> Date: Wed Dec 9 20:28:51 2020 -0500 Fix sources diff --git a/.gitignore b/.gitignore index a3e016b..881f4a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Xalan-C_1_10_0-src.tar.gz xalan_c-1.11-src.tar.gz +/Xalan-C_1_11_0.tar.gz diff --git a/sources b/sources index d0041dd..98c86a6 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -0a3fbb535885531cc544b07a2060bfb1 Xalan-C_1_10_0-src.tar.gz -9227d3e7ab375da3c643934b33a585b8 xalan_c-1.11-src.tar.gz +SHA512 (Xalan-C_1_11_0.tar.gz) = c0af80cf6527237092360110963e953fce15f0140866b291d87c2d0fd91d9e8fb3b6da60a02e27f78ca7623898b5c062b0b6de5ef9f5c08ba13f6202120666ca commit 31274e91d4f92f2056d7e27ecdac54c27a650248 Author: Benjamin Beasley <code(a)musicinmybrain.net> Date: Wed Dec 9 12:12:11 2020 -0500 Packaging improvements, mostly backported from the version 1.12 RPM in Fedora 34: - Build API documentation with Doxygen - Update summaries and descriptions from upstream - Enable at least XPath tests - Drop unused old tarball and patches from source RPM diff --git a/xalan-c-1.10.0-gcc43.patch b/xalan-c-1.10.0-gcc43.patch deleted file mode 100644 index 264a0bd..0000000 --- a/xalan-c-1.10.0-gcc43.patch +++ /dev/null @@ -1,75 +0,0 @@ -The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in -unnecessary dependencies which aren't requested by the standard. -This fixes build for gcc-4.3 - -Lubomir Kundrak <lkundrak(a)redhat.com> - -diff -urp xml-xalan.orig/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp ---- xml-xalan.orig/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2005-05-05 02:32:04.000000000 +0200 -+++ xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2008-01-04 23:15:13.000000000 +0100 -@@ -31,6 +31,7 @@ - #include <sys/stat.h> - #include <errno.h> - #endif -+#include <cstring> - - - -diff -urp xml-xalan.orig/c/src/xalanc/XalanDOM/XalanDOMString.cpp xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp ---- xml-xalan.orig/c/src/xalanc/XalanDOM/XalanDOMString.cpp 2005-08-08 17:25:52.000000000 +0200 -+++ xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp 2008-01-04 23:17:08.000000000 +0100 -@@ -26,6 +26,7 @@ - - - #include <cstdlib> -+#include <cstring> - - - -diff -urp xml-xalan.orig/c/src/xalanc/XalanExe/XalanExe.cpp xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp ---- xml-xalan.orig/c/src/xalanc/XalanExe/XalanExe.cpp 2005-04-29 23:39:46.000000000 +0200 -+++ xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp 2008-01-04 23:23:09.000000000 +0100 -@@ -24,6 +24,7 @@ - #else - #include <iostream> - #endif -+#include <cstring> - - - -diff -urp xml-xalan.orig/c/src/xalanc/XMLSupport/FormatterToHTML.cpp xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp ---- xml-xalan.orig/c/src/xalanc/XMLSupport/FormatterToHTML.cpp 2005-06-30 23:52:35.000000000 +0200 -+++ xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp 2008-01-04 23:23:26.000000000 +0100 -@@ -26,6 +26,7 @@ - - - #include <cassert> -+#include <cstring> - - - -diff -urp xml-xalan.orig/c/src/xalanc/XSLT/ElemNumber.cpp xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp ---- xml-xalan.orig/c/src/xalanc/XSLT/ElemNumber.cpp 2005-07-26 22:09:17.000000000 +0200 -+++ xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp 2008-01-04 23:24:01.000000000 +0100 -@@ -15,6 +15,7 @@ - */ - #include "ElemNumber.hpp" - -+#include <cstring> - - - #include <xercesc/sax/AttributeList.hpp> -diff -urpxml-xalan/c/src/xalanc.orig/PlatformSupport/DoubleSupport.cpp xml-xalan/c/src/xalanc/PlatformSupport/DoubleSupport.cpp ---- xml-xalan/c/src/xalanc.orig/PlatformSupport/DoubleSupport.cpp 2010-02-12 11:11:30.000000000 +0000 -+++ xml-xalan/c/src/xalanc/PlatformSupport/DoubleSupport.cpp 2010-02-12 11:12:15.000000000 +0000 -@@ -19,9 +19,7 @@ - - #include <clocale> - #include <cmath> --#if !defined(XALAN_NO_STD_NUMERIC_LIMITS) --#include <limits> --#endif -+#include <climits> - - - #include "DOMStringHelper.hpp" diff --git a/xalan-c-1.10.0-new-xerces-c.patch b/xalan-c-1.10.0-new-xerces-c.patch deleted file mode 100644 index 8cb3e45..0000000 --- a/xalan-c-1.10.0-new-xerces-c.patch +++ /dev/null @@ -1,6687 +0,0 @@ -Make Xalan-C++ 1.10.0 compile with Xerces-C++ 3. - -This patch is a backport of the following changesets: -http://svn.apache.org/viewvc?view=rev&revision=482425 -http://svn.apache.org/viewvc?view=rev&revision=572759 -http://svn.apache.org/viewvc?view=rev&revision=651671 -http://svn.apache.org/viewvc?view=rev&revision=671671 -http://svn.apache.org/viewvc?view=rev&revision=672824 -http://svn.apache.org/viewvc?view=rev&revision=672963 -http://svn.apache.org/viewvc?view=rev&revision=696900 - -They were applied against the following tag: -web: http://svn.apache.org/viewvc/xalan/c/tags/Xalan-C_1_10_0/ -svn: http://svn.apache.org/repos/asf/xalan/c/tags/Xalan-C_1_10_0/ - -Conflicts were resolved manually, trying to keep the intended meaning -of the change. No guarantees, though. - -See also: -https://bugs.gentoo.org/show_bug.cgi?id=242218 -http://thread.gmane.org/gmane.text.xml.xalan.c++.user/3600/focus=3601 -https://issues.apache.org/jira/browse/XALANC-622 -https://issues.apache.org/jira/browse/XALANC-652 - -2008-10-20 Martin von Gagern - -Index: src/xalanc/PlatformSupport/AttributesImpl.cpp -=================================================================== ---- src/xalanc/PlatformSupport/AttributesImpl.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/AttributesImpl.cpp (working copy) -@@ -109,7 +109,7 @@ - // until we're done. - AttributesVectorType tempVector(getMemoryManager()); - -- const unsigned int theLength = theRHS.getLength(); -+ const XalanSize_t theLength = theRHS.getLength(); - - if (theLength > 0) - { -@@ -167,12 +167,12 @@ - // safe and don't need any try blocks. - AttributesImpl theTempList(getMemoryManager()); - -- const unsigned int theLength = theRHS.getLength(); -+ const XalanSize_t theLength = theRHS.getLength(); - - theTempList.reserve(theLength); - - // Add each attribute. -- for(unsigned int i = 0; i < theLength; i++) -+ for(XalanSize_t i = 0; i < theLength; i++) - { - theTempList.addAttribute( - theRHS.getURI(i), -@@ -192,7 +192,7 @@ - - - --unsigned int -+XalanSize_t - AttributesImpl::getLength() const - { - return unsigned(m_attributesVector.size()); -@@ -201,7 +201,7 @@ - - - const XMLCh* --AttributesImpl::getURI(const unsigned int index) const -+AttributesImpl::getURI(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -211,7 +211,7 @@ - - - const XMLCh* --AttributesImpl::getLocalName(const unsigned int index) const -+AttributesImpl::getLocalName(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -221,7 +221,7 @@ - - - const XMLCh* --AttributesImpl::getQName(const unsigned int index) const -+AttributesImpl::getQName(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -231,7 +231,7 @@ - - - const XMLCh* --AttributesImpl::getType(const unsigned int index) const -+AttributesImpl::getType(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -241,7 +241,7 @@ - - - const XMLCh* --AttributesImpl::getValue(const unsigned int index) const -+AttributesImpl::getValue(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -380,18 +380,41 @@ - - - -+bool -+AttributesImpl::getIndex( -+ const XMLCh* const uri, -+ const XMLCh* const localPart, -+ XalanSize_t& index) const -+{ -+ const int tempIndex = -+ getIndex(uri, localPart); -+ -+ if (tempIndex == -1) -+ { -+ return false; -+ } -+ else -+ { -+ index = tempIndex; -+ -+ return true; -+ } -+} -+ -+ -+ - int - AttributesImpl::getIndex( - const XMLCh* const uri, -- const XMLCh* const localName) const -+ const XMLCh* const localPart) const - { -- assert(uri != 0 && localName != 0); -+ assert(uri != 0 && localPart != 0); - - const AttributesVectorType::const_iterator i = - XALAN_STD_QUALIFIER find_if( - m_attributesVector.begin(), - m_attributesVector.end(), -- URIAndLocalNameCompareFunctor(uri, localName)); -+ URIAndLocalNameCompareFunctor(uri, localPart)); - - if (i != m_attributesVector.end()) - { -@@ -407,6 +430,28 @@ - - - -+bool -+AttributesImpl::getIndex( -+ const XMLCh* const qName, -+ XalanSize_t& index) const -+{ -+ const int tempIndex = -+ getIndex(qName); -+ -+ if (tempIndex == -1) -+ { -+ return false; -+ } -+ else -+ { -+ index = tempIndex; -+ -+ return true; -+ } -+} -+ -+ -+ - int - AttributesImpl::getIndex(const XMLCh* const qname) const - { -Index: src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp -=================================================================== ---- src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp (working copy) -@@ -43,13 +43,15 @@ - - - --NamedNodeMapAttributeList::NamedNodeMapAttributeList(const XalanNamedNodeMap& theMap, -- MemoryManagerType& theManager) : -+NamedNodeMapAttributeList::NamedNodeMapAttributeList( -+ const XalanNamedNodeMap& theMap, -+ MemoryManagerType& theManager) : - ParentType(), - m_nodeMap(theMap), - m_lastIndex(theMap.getLength() - 1), - m_memoryManager(theManager) - { -+ assert(theMap.getLength() != 0); - } - - -@@ -60,7 +62,7 @@ - - - --unsigned int -+XalanSize_t - NamedNodeMapAttributeList::getLength() const - { - return m_nodeMap.getLength(); -@@ -69,7 +71,7 @@ - - - const XMLCh* --NamedNodeMapAttributeList::getName(const unsigned int index) const -+NamedNodeMapAttributeList::getName(const XalanSize_t index) const - { - const XalanNode* const theAttribute = m_nodeMap.item(m_lastIndex - index); - assert(theAttribute != 0); -@@ -80,7 +82,7 @@ - - - const XMLCh* --NamedNodeMapAttributeList::getType(const unsigned int /* index */) const -+NamedNodeMapAttributeList::getType(const XalanSize_t /* index */) const - { - assert(length(s_typeString) > 0); - -@@ -90,9 +92,11 @@ - - - const XMLCh* --NamedNodeMapAttributeList::getValue(const unsigned int index) const -+NamedNodeMapAttributeList::getValue(const XalanSize_t index) const - { -- const XalanNode* const theAttribute = m_nodeMap.item(m_lastIndex - index); -+ assert(index <= m_lastIndex); -+ -+ const XalanNode* const theAttribute = m_nodeMap.item(m_lastIndex - index); - assert(theAttribute != 0); - - return c_wstr(theAttribute->getNodeValue()); -@@ -111,7 +115,7 @@ - - - const XMLCh* --NamedNodeMapAttributeList::getValue(const XMLCh* const name) const -+NamedNodeMapAttributeList::getValue(const XMLCh* const name) const - { - const XalanNode* theNode = m_nodeMap.getNamedItem(XalanDOMString(name, m_memoryManager)); - -Index: src/xalanc/PlatformSupport/StdBinInputStream.cpp -=================================================================== ---- src/xalanc/PlatformSupport/StdBinInputStream.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/StdBinInputStream.cpp (working copy) -@@ -43,7 +43,7 @@ - - - --unsigned int -+XalanFilePos - StdBinInputStream::curPos() const - { - return m_stream.tellg(); -@@ -51,10 +51,10 @@ - - - --unsigned int -+XalanSize_t - StdBinInputStream::readBytes( - XMLByte* const toFill, -- const unsigned int maxToRead) -+ const XalanSize_t maxToRead) - { - assert(sizeof(XMLByte) == sizeof(char)); - -@@ -80,4 +80,12 @@ - - - -+const XalanDOMChar* -+StdBinInputStream::getContentType() const -+{ -+ return 0; -+} -+ -+ -+ - XALAN_CPP_NAMESPACE_END -Index: src/xalanc/PlatformSupport/AttributeListImpl.hpp -=================================================================== ---- src/xalanc/PlatformSupport/AttributeListImpl.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/AttributeListImpl.hpp (working copy) -@@ -73,17 +73,17 @@ - } - - // These are inherited from AttributeList -- virtual unsigned int -+ virtual XalanSize_t - getLength() const; - - virtual const XMLCh* -- getName(const unsigned int index) const; -+ getName(const XalanSize_t index) const; - - virtual const XMLCh* -- getType(const unsigned int index) const; -+ getType(const XalanSize_t index) const; - - virtual const XMLCh* -- getValue(const unsigned int index) const; -+ getValue(const XalanSize_t index) const; - - virtual const XMLCh* - getType(const XMLCh* const name) const; -@@ -141,7 +141,7 @@ - * @param theCount The number to reserve - */ - void -- reserve(unsigned int theCount) -+ reserve(XalanSize_t theCount) - { - m_AttributeVector.reserve(theCount); - } -Index: src/xalanc/PlatformSupport/XSLException.hpp -=================================================================== ---- src/xalanc/PlatformSupport/XSLException.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/XSLException.hpp (working copy) -@@ -40,8 +40,6 @@ - { - public: - -- typedef XalanLocator::size_type size_type; -- - /** - * Constructor - * -@@ -119,7 +117,7 @@ - * - * @return the line number - */ -- size_type -+ XalanFileLoc - getLineNumber() const - { - return m_lineNumber; -@@ -130,13 +128,12 @@ - * - * @return the column number - */ -- size_type -+ XalanFileLoc - getColumnNumber() const - { - return m_columnNumber; - } - -- - MemoryManagerType& - getMemoryManager()const - { -Index: src/xalanc/PlatformSupport/XalanLocator.hpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanLocator.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanLocator.hpp (working copy) -@@ -45,8 +45,6 @@ - - typedef Locator ParentType; - -- typedef XMLSSize_t size_type; -- - XalanLocator() {} - - virtual -@@ -58,28 +56,28 @@ - virtual const XMLCh* - getSystemId() const = 0; - -- virtual size_type -+ virtual XalanFileLoc - getLineNumber() const = 0; - -- virtual size_type -+ virtual XalanFileLoc - getColumnNumber() const = 0; - -- static size_type -+ static XalanFileLoc - getLineNumber(const ParentType* theLocator) - { -- return theLocator == 0 ? size_type(-1) : theLocator->getLineNumber(); -+ return theLocator == 0 ? getUnknownValue() : theLocator->getLineNumber(); - } - -- static size_type -+ static XalanFileLoc - getColumnNumber(const ParentType* theLocator) - { -- return theLocator == 0 ? size_type(-1) : theLocator->getColumnNumber(); -+ return theLocator == 0 ? getUnknownValue() : theLocator->getColumnNumber(); - } - -- static size_type -+ static XalanFileLoc - getUnknownValue() - { -- return size_type(-1); -+ return XalanFileLoc(-1); - } - - private: -Index: src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp (working copy) -@@ -74,4 +74,12 @@ - - - -+MemoryManager* -+XalanMemoryManagerDefault::getExceptionMemoryManager() -+{ -+ return this; -+} -+ -+ -+ - XALAN_CPP_NAMESPACE_END -Index: src/xalanc/PlatformSupport/FormatterListener.hpp -=================================================================== ---- src/xalanc/PlatformSupport/FormatterListener.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/FormatterListener.hpp (working copy) -@@ -66,7 +66,7 @@ - typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler ParentType; - - // A handy typedef... Must match DocumentHandler's type for characters(), etc... -- typedef unsigned int size_type; -+ typedef XalanSize_t size_type; - - enum eFormat - { -Index: src/xalanc/PlatformSupport/DOMStringHelper.hpp -=================================================================== ---- src/xalanc/PlatformSupport/DOMStringHelper.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/DOMStringHelper.hpp (working copy) -@@ -705,7 +705,7 @@ - { - public: - -- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int); -+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type); - - static void - DoubleToCharacters( -Index: src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp -=================================================================== ---- src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp (working copy) -@@ -43,24 +43,25 @@ - typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList ParentType; - - explicit -- NamedNodeMapAttributeList(const XalanNamedNodeMap& theMap, -- MemoryManagerType& theManager); -+ NamedNodeMapAttributeList( -+ const XalanNamedNodeMap& theMap, -+ MemoryManagerType& theManager); - - virtual - ~NamedNodeMapAttributeList(); - - // These are inherited from AttributeList -- virtual unsigned int -+ virtual XalanSize_t - getLength() const; - - virtual const XalanDOMChar* -- getName(const unsigned int index) const; -+ getName(const XalanSize_t index) const; - - virtual const XalanDOMChar* -- getType(const unsigned int index) const; -+ getType(const XalanSize_t index) const; - - virtual const XalanDOMChar* -- getValue(const unsigned int index) const; -+ getValue(const XalanSize_t index) const; - - virtual const XalanDOMChar* - getType(const XalanDOMChar* const name) const; -@@ -83,11 +84,11 @@ - // Data members... - const XalanNamedNodeMap& m_nodeMap; - -- const unsigned int m_lastIndex; -+ const XalanSize_t m_lastIndex; - -+ MemoryManagerType& m_memoryManager; -+ - static const XalanDOMChar s_typeString[]; -- -- MemoryManagerType& m_memoryManager; - }; - - -Index: src/xalanc/PlatformSupport/AttributesImpl.hpp -=================================================================== ---- src/xalanc/PlatformSupport/AttributesImpl.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/AttributesImpl.hpp (working copy) -@@ -65,31 +65,42 @@ - AttributesImpl& - operator=(const AttributesType& theRHS); - -- // These are inherited from AttributeList -- virtual unsigned int -+ // These are inherited from Attributes -+ virtual XalanSize_t - getLength() const; - - virtual const XMLCh* -- getURI(const unsigned int index) const; -+ getURI(const XalanSize_t index) const; - - virtual const XMLCh* -- getLocalName(const unsigned int index) const; -+ getLocalName(const XalanSize_t index) const; - - virtual const XMLCh* -- getQName(const unsigned int index) const; -+ getQName(const XalanSize_t index) const; - - virtual const XMLCh* -- getType(const unsigned int index) const; -+ getType(const XalanSize_t index) const; - - virtual const XMLCh* -- getValue(const unsigned int index) const; -+ getValue(const XalanSize_t index) const; - -- virtual int -+ virtual bool -+ getIndex( -+ const XMLCh* const uri, -+ const XMLCh* const localPart, -+ XalanSize_t& index) const; -+ -+ virtual int - getIndex( - const XMLCh* const uri, -- const XMLCh* const localName) const; -+ const XMLCh* const localPart) const; - -- virtual int -+ virtual bool -+ getIndex( -+ const XMLCh* const qName, -+ XalanSize_t& index) const; -+ -+ virtual int - getIndex(const XMLCh* const qname) const; - - virtual const XMLCh* -@@ -186,7 +197,7 @@ - * @param theCount The number to reserve - */ - void -- reserve(unsigned int theCount) -+ reserve(XalanSize_t theCount) - { - m_attributesVector.reserve(theCount); - } -Index: src/xalanc/PlatformSupport/AttributeListImpl.cpp -=================================================================== ---- src/xalanc/PlatformSupport/AttributeListImpl.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/AttributeListImpl.cpp (working copy) -@@ -110,7 +110,7 @@ - // until we're done. - AttributeVectorType tempVector(getMemoryManager()); - -- const unsigned int theLength = theRHS.getLength(); -+ const XalanSize_t theLength = theRHS.getLength(); - - if (theLength > 0) - { -@@ -166,12 +166,12 @@ - // safe and don't need any try blocks. - AttributeListImpl theTempList(getMemoryManager()); - -- const unsigned int theLength = theRHS.getLength(); -+ const XalanSize_t theLength = theRHS.getLength(); - - theTempList.reserve(theLength); - - // Add each attribute. -- for(unsigned int i = 0; i < theLength; i++) -+ for(XalanSize_t i = 0; i < theLength; i++) - { - theTempList.addAttribute( - theRHS.getName(i), -@@ -189,7 +189,7 @@ - - - --unsigned int -+XalanSize_t - AttributeListImpl::getLength() const - { - // Make sure the mismatch between Xerces and vector<> doesn't cause a problem... -@@ -201,7 +201,7 @@ - - - const XMLCh* --AttributeListImpl::getName(const unsigned int index) const -+AttributeListImpl::getName(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -211,7 +211,7 @@ - - - const XMLCh* --AttributeListImpl::getType(const unsigned int index) const -+AttributeListImpl::getType(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -221,7 +221,7 @@ - - - const XMLCh* --AttributeListImpl::getValue(const unsigned int index) const -+AttributeListImpl::getValue(const XalanSize_t index) const - { - assert(index < getLength()); - -Index: src/xalanc/PlatformSupport/StdBinInputStream.hpp -=================================================================== ---- src/xalanc/PlatformSupport/StdBinInputStream.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/StdBinInputStream.hpp (working copy) -@@ -58,14 +58,17 @@ - virtual - ~StdBinInputStream(); - -- virtual unsigned int -+ virtual XalanFilePos - curPos() const; - -- virtual unsigned int -+ virtual XalanSize_t - readBytes( - XMLByte* const toFill, -- const unsigned int maxToRead); -+ const XalanSize_t maxToRead); - -+ virtual const XalanDOMChar* -+ getContentType() const; -+ - private: - - // Unimplemented... -Index: src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp (working copy) -@@ -52,6 +52,9 @@ - virtual void - deallocate(void* pointer); - -+ virtual MemoryManager* -+ getExceptionMemoryManager(); -+ - private: - - // These are not implemented. -Index: src/xalanc/PlatformSupport/XalanTranscodingServices.hpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanTranscodingServices.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanTranscodingServices.hpp (working copy) -@@ -56,8 +56,8 @@ - static void - terminate(); - -- typedef unsigned char XalanXMLByte; -- typedef unsigned int size_type; -+ typedef unsigned char XalanXMLByte; -+ typedef XalanSize_t size_type; - typedef unsigned int UnicodeCharType; - - static size_type -Index: src/xalanc/PlatformSupport/XalanMemoryManagement.cpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanMemoryManagement.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanMemoryManagement.cpp (working copy) -@@ -40,7 +40,8 @@ - - return 0; - } -- virtual void -+ -+ virtual void - deallocate( void* /* pDataPointer */ ) - { - XALAN_USING_STD(bad_alloc) -@@ -48,8 +49,12 @@ - throw bad_alloc(); - - } -- -- -+ -+ MemoryManager* -+ getExceptionMemoryManager() -+ { -+ return this; -+ } - }; - - -Index: src/xalanc/Include/VCPPDefinitions.hpp -=================================================================== ---- src/xalanc/Include/VCPPDefinitions.hpp (revision 706129) -+++ src/xalanc/Include/VCPPDefinitions.hpp (working copy) -@@ -17,7 +17,7 @@ - #define VCPPDEFINITIONS_HEADER_GUARD_1357924680 - - --#pragma warning(disable: 4127 4251 4511 4512 4514 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715) -+#pragma warning(disable: 4127 4251 4345 4351 4511 4512 4514 4521 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715) - - - // --------------------------------------------------------------------------- -Index: src/xalanc/Include/PlatformDefinitions.hpp -=================================================================== ---- src/xalanc/Include/PlatformDefinitions.hpp (revision 706129) -+++ src/xalanc/Include/PlatformDefinitions.hpp (working copy) -@@ -120,6 +120,16 @@ - typedef unsigned short XalanDOMChar; - #endif - -+#if XERCES_VERSION_MAJOR < 3 -+typedef unsigned int XalanSize_t; -+typedef unsigned int XalanFilePos; -+typedef unsigned int XalanFileLoc; -+#else -+typedef XMLSize_t XalanSize_t; -+typedef XMLFilePos XalanFilePos; -+typedef XMLFileLoc XalanFileLoc; -+#endif -+ - template<bool value> - struct XalanCompileErrorBoolean - { -Index: src/xalanc/XPath/XPathProcessorImpl.hpp -=================================================================== ---- src/xalanc/XPath/XPathProcessorImpl.hpp (revision 706129) -+++ src/xalanc/XPath/XPathProcessorImpl.hpp (working copy) -@@ -70,6 +70,8 @@ - - typedef XalanVector<bool> BoolVectorType; - -+ typedef XalanDOMString::size_type t_size_type; -+ - XPathProcessorImpl(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR); - - virtual -@@ -121,12 +123,12 @@ - * When a separator token is found, see if there's a element name or the - * like to map. - */ -- int -+ t_size_type - mapNSTokens( - const XalanDOMString& pat, -- int startSubstring, -- int posOfNSSep, -- int posOfScan); -+ t_size_type startSubstring, -+ t_size_type posOfNSSep, -+ t_size_type posOfScan); - - /** - * Check if m_token==s. If m_token is null, this won't throw -Index: src/xalanc/XPath/XPathExecutionContextDefault.cpp -=================================================================== ---- src/xalanc/XPath/XPathExecutionContextDefault.cpp (revision 706129) -+++ src/xalanc/XPath/XPathExecutionContextDefault.cpp (working copy) -@@ -492,8 +492,8 @@ - { - assert(m_xpathEnvSupport != 0); - -- XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue(); -- XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue(); - - MemoryManagerType& theManager = const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager(); - -@@ -546,8 +546,8 @@ - { - assert(m_xpathEnvSupport != 0); - -- XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue(); -- XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue(); - - MemoryManagerType& theManager = const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager(); - -@@ -600,8 +600,8 @@ - { - assert(m_xpathEnvSupport != 0); - -- XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue(); -- XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue(); - - MemoryManagerType& theManager = const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager(); - -Index: src/xalanc/XPath/XPathExecutionContextDefault.hpp -=================================================================== ---- src/xalanc/XPath/XPathExecutionContextDefault.hpp (revision 706129) -+++ src/xalanc/XPath/XPathExecutionContextDefault.hpp (working copy) -@@ -32,9 +32,6 @@ - - - --/** -- * @author <a href="mailto:david_n_bertoni@lotus.com">David N. Bertoni</a> -- */ - // Base class include file. - #include <xalanc/XPath/XPathExecutionContext.hpp> - -@@ -346,7 +343,11 @@ - - protected: - -- typedef XalanObjectCache<MutableNodeRefList, DefaultCacheCreateFunctorMemMgr<MutableNodeRefList>, DeleteFunctor<MutableNodeRefList>, ClearCacheResetFunctor<MutableNodeRefList> > NodeListCacheType; -+ typedef XalanObjectCache< -+ MutableNodeRefList, -+ DefaultCacheCreateFunctorMemMgr<MutableNodeRefList>, -+ DeleteFunctor<MutableNodeRefList>, -+ ClearCacheResetFunctor<MutableNodeRefList> > NodeListCacheType; - - enum { eNodeListCacheListSize = 50 }; - -Index: src/xalanc/XPath/FormatterStringLengthCounter.cpp -=================================================================== ---- src/xalanc/XPath/FormatterStringLengthCounter.cpp (revision 706129) -+++ src/xalanc/XPath/FormatterStringLengthCounter.cpp (working copy) -@@ -76,8 +76,8 @@ - - void - FormatterStringLengthCounter::characters( -- const XMLCh* const /* chars */, -- const unsigned int length) -+ const XMLCh* const /* chars */, -+ const size_type length) - { - m_count += length; - } -@@ -86,8 +86,8 @@ - - void - FormatterStringLengthCounter::charactersRaw( -- const XMLCh* const /* chars */, -- const unsigned int /*length */) -+ const XMLCh* const /* chars */, -+ const size_type /*length */) - { - } - -@@ -101,8 +101,8 @@ - - void - FormatterStringLengthCounter::ignorableWhitespace( -- const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const XMLCh* const /* chars */, -+ const size_type /* length */) - { - } - -@@ -133,8 +133,8 @@ - - void - FormatterStringLengthCounter::cdata( -- const XMLCh* const /* ch */, -- const unsigned int /* length */) -+ const XMLCh* const /* ch */, -+ const size_type /* length */) - { - } - -Index: src/xalanc/XPath/XPathConstructionContext.hpp -=================================================================== ---- src/xalanc/XPath/XPathConstructionContext.hpp (revision 706129) -+++ src/xalanc/XPath/XPathConstructionContext.hpp (working copy) -@@ -123,20 +123,11 @@ - { - } - -- // Note non-const copy semantics... -- GetAndReleaseCachedString(GetAndReleaseCachedString& theSource) : -- m_constructionContext(theSource.m_constructionContext), -- m_string(theSource.m_string) -- { -- theSource.m_string = 0; -- } -- - ~GetAndReleaseCachedString() - { -- if (m_string != 0) -- { -- m_constructionContext->releaseCachedString(*m_string); -- } -+ assert(m_string != 0); -+ -+ m_constructionContext->releaseCachedString(*m_string); - } - - XalanDOMString& -@@ -150,13 +141,18 @@ - XPathConstructionContext& - getConstructionContext() const - { -+ assert(m_constructionContext != 0); -+ - return *m_constructionContext; - } - -- - private: - - // Not implemented... -+ GetAndReleaseCachedString(); -+ -+ GetAndReleaseCachedString(const GetAndReleaseCachedString&); -+ - GetAndReleaseCachedString& - operator=(const GetAndReleaseCachedString&); - -Index: src/xalanc/XPath/XPathExecutionContext.hpp -=================================================================== ---- src/xalanc/XPath/XPathExecutionContext.hpp (revision 706129) -+++ src/xalanc/XPath/XPathExecutionContext.hpp (working copy) -@@ -35,9 +35,6 @@ - - - --/** -- * @author <a href="mailto:david_n_bertoni@lotus.com">David N. Bertoni</a> -- */ - // Base class header file... - #include <xalanc/PlatformSupport/ExecutionContext.hpp> - -@@ -470,6 +467,10 @@ - private: - - // Not implemented... -+ GetAndReleaseCachedString(); -+ -+ GetAndReleaseCachedString(const GetAndReleaseCachedString&); -+ - GetAndReleaseCachedString& - operator=(const GetAndReleaseCachedString&); - -Index: src/xalanc/XPath/XObject.hpp -=================================================================== ---- src/xalanc/XPath/XObject.hpp (revision 706129) -+++ src/xalanc/XPath/XObject.hpp (working copy) -@@ -141,7 +141,7 @@ - virtual const XalanDOMString& - str() const; - -- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int); -+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type); - - /** - * Send the string value to a FormatterListener instance. -Index: src/xalanc/XPath/FormatterStringLengthCounter.hpp -=================================================================== ---- src/xalanc/XPath/FormatterStringLengthCounter.hpp (revision 706129) -+++ src/xalanc/XPath/FormatterStringLengthCounter.hpp (working copy) -@@ -41,8 +41,6 @@ - { - public: - -- typedef unsigned long size_type; -- - /** - * FormatterStringLengthCounter instance constructor. - */ -@@ -81,12 +79,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -94,7 +92,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -110,7 +108,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - private: - -Index: src/xalanc/XPath/XPathProcessorImpl.cpp -=================================================================== ---- src/xalanc/XPath/XPathProcessorImpl.cpp (revision 706129) -+++ src/xalanc/XPath/XPathProcessorImpl.cpp (working copy) -@@ -212,16 +212,16 @@ - - m_expression->setCurrentPattern(m_constructionContext->getPooledString(pat)); - -- const int nChars = length(pat); -+ const t_size_type nChars = length(pat); - -- int startSubstring = -1; -- int posOfNSSep = -1; -+ t_size_type startSubstring = XalanDOMString::npos; -+ t_size_type posOfNSSep = XalanDOMString::npos; - - const XPathConstructionContext::GetAndReleaseCachedString theGuard(*m_constructionContext); - - XalanDOMString& theToken = theGuard.get(); - -- for(int i = 0; i < nChars; i++) -+ for(t_size_type i = 0; i < nChars; i++) - { - XalanDOMChar c = charAt(pat, i); - -@@ -229,9 +229,9 @@ - { - case XalanUnicode::charQuoteMark: - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i); - } -@@ -253,7 +253,7 @@ - - addToTokenQueue(theToken); - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - else - { -@@ -264,9 +264,9 @@ - - case XalanUnicode::charApostrophe: - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i); - } -@@ -288,7 +288,7 @@ - - addToTokenQueue(theToken); - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - else - { -@@ -302,9 +302,9 @@ - case XalanUnicode::charSpace: - case XalanUnicode::charHTab: - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i); - } -@@ -315,14 +315,14 @@ - addToTokenQueue(theToken); - } - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - } - break; - - case XalanUnicode::charHyphenMinus: - { -- if(!(startSubstring == -1)) -+ if(!(startSubstring == XalanDOMString::npos)) - { - break; - } -@@ -347,9 +347,9 @@ - case XalanUnicode::charLessThanSign: - case XalanUnicode::charGreaterThanSign: - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i); - } -@@ -360,7 +360,7 @@ - addToTokenQueue(theToken); - } - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - - substring(pat, theToken, i, i + 1); -@@ -373,7 +373,7 @@ - { - if(posOfNSSep == i - 1 && i > 0) - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { - if (startSubstring < i - 1) - { -@@ -383,8 +383,8 @@ - } - } - -- startSubstring = -1; -- posOfNSSep = -1; -+ startSubstring = XalanDOMString::npos; -+ posOfNSSep = XalanDOMString::npos; - - substring(pat, theToken, i - 1, i + 1); - -@@ -401,7 +401,7 @@ - - default: - { -- if(-1 == startSubstring) -+ if(XalanDOMString::npos == startSubstring) - { - startSubstring = i; - -@@ -440,16 +440,16 @@ - - addToTokenQueue(theToken); - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - } - } - } - } - -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, nChars); - } -@@ -504,12 +504,12 @@ - - - --int -+XPathProcessorImpl::t_size_type - XPathProcessorImpl::mapNSTokens( - const XalanDOMString& pat, -- int startSubstring, -- int posOfNSSep, -- int posOfScan) -+ t_size_type startSubstring, -+ t_size_type posOfNSSep, -+ t_size_type posOfScan) - { - assert(m_prefixResolver != 0); - -@@ -575,7 +575,7 @@ - } - } - -- return -1; -+ return XalanDOMString::npos; - } - - -@@ -2938,14 +2938,16 @@ - bool - XPathProcessorImpl::isCurrentLiteral() const - { -- const int last = length(m_token) - 1; -+ const t_size_type theLength = m_token.length(); - -- if (last <= 0) -+ if (theLength <= 1) - { - return false; - } - else - { -+ const t_size_type last = theLength - 1; -+ - const XalanDOMChar c0 = m_tokenChar; - const XalanDOMChar cX = charAt(m_token, last); - -Index: src/xalanc/XPath/XPath.hpp -=================================================================== ---- src/xalanc/XPath/XPath.hpp (revision 706129) -+++ src/xalanc/XPath/XPath.hpp (working copy) -@@ -241,7 +241,7 @@ - XPathExecutionContext& executionContext, - XalanDOMString& result) const; - -- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int); -+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type); - - /** - * Execute the XPath from the provided context. -Index: src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp -=================================================================== ---- src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp (working copy) -@@ -83,6 +83,12 @@ - - static ExceptionCode - translateErrorCode(DOMExceptionType::ExceptionCode theCode); -+ -+ static ExceptionCode -+ translateErrorCode(short theCode) -+ { -+ return translateErrorCode(static_cast<DOMExceptionType::ExceptionCode>(theCode)); -+ } - }; - - -Index: src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp -=================================================================== ---- src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp (working copy) -@@ -741,7 +741,12 @@ - DOMParserType* const theParser = - new (&theMemoryManager) DOMParserType(0, &theMemoryManager); - -+#if XERCES_VERSION_MAJOR < 3 - theParser->setExpandEntityReferences(true); -+#else -+ theParser->setCreateEntityReferenceNodes(false); -+#endif -+ - theParser->setDoNamespaces(m_doNamespaces); - theParser->setEntityResolver(m_entityResolver); - -@@ -759,7 +764,11 @@ - SAXParserType* const theParser = - new (&theMemoryManager) SAXParserType(0, &theMemoryManager); - -+#if XERCES_VERSION_MAJOR < 3 - theParser->setDoValidation(false); -+#else -+ theParser->setValidationScheme(SAXParserType::Val_Never); -+#endif - - theParser->setDoNamespaces(false); - -Index: src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp -=================================================================== ---- src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp (working copy) -@@ -48,17 +48,17 @@ - ~XercesNamedNodeMapAttributeList(); - - // These are inherited from AttributeList -- virtual unsigned int -+ virtual XalanSize_t - getLength() const; - - virtual const XMLCh* -- getName(const unsigned int index) const; -+ getName(const XalanSize_t index) const; - - virtual const XMLCh* -- getType(const unsigned int index) const; -+ getType(const XalanSize_t index) const; - - virtual const XMLCh* -- getValue(const unsigned int index) const; -+ getValue(const XalanSize_t index) const; - - virtual const XMLCh* - getType(const XMLCh* const name) const; -@@ -81,7 +81,7 @@ - // Data members... - const DOMNamedNodeMapType* const m_nodeMap; - -- const XMLSizeType m_lastIndex; -+ const XalanSize_t m_lastIndex; - - static const XMLCh s_typeString[]; - }; -Index: src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp -=================================================================== ---- src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp (working copy) -@@ -191,7 +191,7 @@ - void - FormatterToXercesDOM::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - m_textBuffer.append(chars, length); - } -@@ -201,7 +201,7 @@ - void - FormatterToXercesDOM::charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - try - { -@@ -237,7 +237,7 @@ - void - FormatterToXercesDOM::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - try - { -@@ -301,7 +301,7 @@ - void - FormatterToXercesDOM::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - try - { -Index: src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp -=================================================================== ---- src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp (working copy) -@@ -48,6 +48,7 @@ - m_nodeMap(theMap), - m_lastIndex(theMap->getLength() - 1) - { -+ assert(theMap->getLength() != 0); - } - - -@@ -58,7 +59,7 @@ - - - --unsigned int -+XalanSize_t - XercesNamedNodeMapAttributeList::getLength() const - { - return m_lastIndex + 1; -@@ -67,7 +68,7 @@ - - - const XMLCh* --XercesNamedNodeMapAttributeList::getName(const unsigned int index) const -+XercesNamedNodeMapAttributeList::getName(const XalanSize_t index) const - { - const DOMNodeType* const theAttribute = m_nodeMap->item(m_lastIndex - index); - assert(theAttribute != 0); -@@ -78,7 +79,7 @@ - - - const XMLCh* --XercesNamedNodeMapAttributeList::getType(const unsigned int /* index */) const -+XercesNamedNodeMapAttributeList::getType(const XalanSize_t /* index */) const - { - assert(length(s_typeString) > 0); - -@@ -88,7 +89,7 @@ - - - const XMLCh* --XercesNamedNodeMapAttributeList::getValue(const unsigned int index) const -+XercesNamedNodeMapAttributeList::getValue(const XalanSize_t index) const - { - const DOMNodeType* const theAttribute = m_nodeMap->item(m_lastIndex - index); - assert(theAttribute != 0); -@@ -126,7 +127,7 @@ - const XMLCh* - XercesNamedNodeMapAttributeList::getValue(const char* const /*name*/) const - { -- assert( 0 ); -+ assert(false); - - return 0; - } -Index: src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp -=================================================================== ---- src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp (working copy) -@@ -82,12 +82,12 @@ - ~FormatterToXercesDOM(); - - -- // These methods are inherited from DocumentHandler ... -+ // These methods are inherited from FormatterListener... - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - comment(const XMLCh* const data); -@@ -95,7 +95,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -120,12 +120,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -Index: src/xalanc/XSLT/XSLTProcessor.hpp -=================================================================== ---- src/xalanc/XSLT/XSLTProcessor.hpp (revision 706129) -+++ src/xalanc/XSLT/XSLTProcessor.hpp (working copy) -@@ -80,7 +80,7 @@ - { - public: - -- typedef size_t size_type; -+ typedef XalanSize_t size_type; - - XSLTProcessor(); - -Index: src/xalanc/XSLT/ElemCopyOf.cpp -=================================================================== ---- src/xalanc/XSLT/ElemCopyOf.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemCopyOf.cpp (working copy) -@@ -49,8 +49,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -60,13 +60,13 @@ - { - bool isSelectCurrentNode = false; - -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; ++i) -+ for (XalanSize_t i = 0; i < nAttrs; ++i) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_SELECT)) -+ if (equals(aname, Constants::ATTRNAME_SELECT)) - { - const XalanDOMChar* const avalue = atts.getValue(i); - assert(avalue != 0); -@@ -80,7 +80,7 @@ - m_selectPattern = constructionContext.createXPath(getLocator(), avalue, *this); - } - } -- else if(isAttrOK( -+ else if (isAttrOK( - aname, - atts, - i, -@@ -124,7 +124,7 @@ - - if (m_selectPattern == 0) - { -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - StylesheetExecutionContext::BorrowReturnMutableNodeRefList theNodeList(executionContext); - -@@ -147,7 +147,7 @@ - const XObjectPtr value(m_selectPattern->execute(*this, executionContext)); - assert(value.null() == false); - -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - executionContext.fireSelectEvent( - SelectionEvent( -@@ -209,7 +209,7 @@ - - if (m_selectPattern == 0) - { -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - StylesheetExecutionContext::BorrowReturnMutableNodeRefList theNodeList(executionContext); - -@@ -232,7 +232,7 @@ - const XObjectPtr value(m_selectPattern->execute(*this, executionContext)); - assert(value.null() == false); - -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - executionContext.fireSelectEvent( - SelectionEvent( -@@ -283,7 +283,7 @@ - - - const XPath* --ElemCopyOf::getXPath(unsigned int index) const -+ElemCopyOf::getXPath(XalanSize_t index) const - { - return index == 0 ? m_selectPattern : 0; - } -Index: src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp -=================================================================== ---- src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp (working copy) -@@ -23,7 +23,9 @@ - - - --XalanElemAttributeSetAllocator::XalanElemAttributeSetAllocator(MemoryManagerType& theManager, size_type theBlockCount) : -+XalanElemAttributeSetAllocator::XalanElemAttributeSetAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount) : - m_allocator(theManager, theBlockCount) - { - } -@@ -41,8 +43,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - data_type* const theBlock = m_allocator.allocateBlock(); - assert(theBlock != 0); -Index: src/xalanc/XSLT/ElemAttribute.hpp -=================================================================== ---- src/xalanc/XSLT/ElemAttribute.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemAttribute.hpp (working copy) -@@ -52,8 +52,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemAttribute(); -Index: src/xalanc/XSLT/XalanElemElementAllocator.hpp -=================================================================== ---- src/xalanc/XSLT/XalanElemElementAllocator.hpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemElementAllocator.hpp (working copy) -@@ -57,7 +57,9 @@ - * - * @param theBlockSize The block size. - */ -- XalanElemElementAllocator(MemoryManagerType& theManager, size_type theBlockCount); -+ XalanElemElementAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount); - - ~XalanElemElementAllocator(); - -@@ -77,8 +79,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - /** - * Determine if an object is owned by the allocator... -Index: src/xalanc/XSLT/XalanElemAttributeAllocator.hpp -=================================================================== ---- src/xalanc/XSLT/XalanElemAttributeAllocator.hpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemAttributeAllocator.hpp (working copy) -@@ -57,7 +57,9 @@ - * - * @param theBlockSize The block size. - */ -- XalanElemAttributeAllocator(MemoryManagerType& theManager, size_type theBlockCount); -+ XalanElemAttributeAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount); - - ~XalanElemAttributeAllocator(); - -@@ -77,8 +79,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - /** - * Determine if an object is owned by the allocator... -Index: src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp -=================================================================== ---- src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp (working copy) -@@ -631,8 +631,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - Type* theResult; - -@@ -656,9 +656,12 @@ - const AttributeListType& atts, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = XalanLocator::getLineNumber(locator); -- const XalanLocator::size_type columnNumber = XalanLocator::getColumnNumber(locator); -+ const XalanFileLoc lineNumber = -+ XalanLocator::getLineNumber(locator); - -+ const XalanFileLoc columnNumber = -+ XalanLocator::getColumnNumber(locator); -+ - ElemTemplateElement* theElement = 0; - - switch(token) -@@ -975,9 +978,12 @@ - const AttributeListType& atts, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = XalanLocator::getLineNumber(locator); -- const XalanLocator::size_type columnNumber = XalanLocator::getColumnNumber(locator); -+ const XalanFileLoc lineNumber = -+ XalanLocator::getLineNumber(locator); - -+ const XalanFileLoc columnNumber = -+ XalanLocator::getColumnNumber(locator); -+ - ElemTemplateElement* theElement = 0; - - if (token == ELEMNAME_LITERAL_RESULT) -@@ -1032,9 +1038,6 @@ - ExtensionNSHandler& handler, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = XalanLocator::getLineNumber(locator); -- const XalanLocator::size_type columnNumber = XalanLocator::getColumnNumber(locator); -- - m_allocatedElements.push_back(0); - - m_allocatedElements.back() = ElemExtensionCall::create( -@@ -1043,8 +1046,8 @@ - stylesheetTree, - name, - atts, -- lineNumber, -- columnNumber, -+ XalanLocator::getLineNumber(locator), -+ XalanLocator::getColumnNumber(locator), - handler); - - return m_allocatedElements.back(); -@@ -1061,14 +1064,11 @@ - bool disableOutputEscaping, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = XalanLocator::getLineNumber(locator); -- const XalanLocator::size_type columnNumber = XalanLocator::getColumnNumber(locator); -- - return m_elemTextLiteralAllocator.create( - *this, - stylesheetTree, -- lineNumber, -- columnNumber, -+ XalanLocator::getLineNumber(locator), -+ XalanLocator::getColumnNumber(locator), - chars, - 0, - length, -@@ -1992,7 +1992,7 @@ - } - }; - --const unsigned int StylesheetConstructionContextDefault::s_elementTokenTableSize = -+const XalanSize_t StylesheetConstructionContextDefault::s_elementTokenTableSize = - sizeof(s_elementTokenTable) / sizeof(s_elementTokenTable[0]); - - const StylesheetConstructionContextDefault::ElementTokenTableEntry& StylesheetConstructionContextDefault::s_elementTokenTableLast = -Index: src/xalanc/XSLT/StylesheetConstructionContext.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetConstructionContext.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetConstructionContext.hpp (working copy) -@@ -76,12 +76,6 @@ - - typedef XalanQName::NamespacesStackType NamespacesStackType; - --#if defined(XALAN_STRICT_ANSI_HEADERS) -- typedef std::size_t size_type; --#else -- typedef size_t size_type; --#endif -- - /** - * IDs for XSL element types. These are the values - * that must be returned by getElementToken(). -Index: src/xalanc/XSLT/ElemDecimalFormat.hpp -=================================================================== ---- src/xalanc/XSLT/ElemDecimalFormat.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemDecimalFormat.hpp (working copy) -@@ -57,8 +57,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - - ~ElemDecimalFormat(); -@@ -83,7 +83,7 @@ - } - - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index) const; - - private: - -Index: src/xalanc/XSLT/ElemAttributeSet.hpp -=================================================================== ---- src/xalanc/XSLT/ElemAttributeSet.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemAttributeSet.hpp (working copy) -@@ -49,8 +49,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemAttributeSet(); -Index: src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp -=================================================================== ---- src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (working copy) -@@ -928,9 +928,9 @@ - - void - StylesheetExecutionContextDefault::characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length) - { - assert(m_xsltProcessor != 0); - -@@ -941,9 +941,9 @@ - - void - StylesheetExecutionContextDefault::charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length) - { - assert(m_xsltProcessor != 0); - -Index: src/xalanc/XSLT/ElemSort.cpp -=================================================================== ---- src/xalanc/XSLT/ElemSort.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemSort.cpp (working copy) -@@ -39,8 +39,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -52,38 +52,38 @@ - m_orderAVT(0), - m_caseOrderAVT(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_SELECT)) -+ if (equals(aname, Constants::ATTRNAME_SELECT)) - { - m_selectPattern - = constructionContext.createXPath(getLocator(), atts.getValue(i), *this); - } -- else if(equals(aname, Constants::ATTRNAME_LANG)) -+ else if (equals(aname, Constants::ATTRNAME_LANG)) - { - m_langAVT = - constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this); - } -- else if(equals(aname, Constants::ATTRNAME_DATATYPE)) -+ else if (equals(aname, Constants::ATTRNAME_DATATYPE)) - { - m_dataTypeAVT = - constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this); - } -- else if(equals(aname, Constants::ATTRNAME_ORDER)) -+ else if (equals(aname, Constants::ATTRNAME_ORDER)) - { - m_orderAVT = - constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this); - } -- else if(equals(aname, Constants::ATTRNAME_CASEORDER)) -+ else if (equals(aname, Constants::ATTRNAME_CASEORDER)) - { - m_caseOrderAVT = - constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this); - } -- else if(isAttrOK( -+ else if (isAttrOK( - aname, - atts, - i, -@@ -126,8 +126,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - typedef ElemSort ThisType; - -@@ -163,7 +163,7 @@ - - - const XPath* --ElemSort::getXPath(unsigned int index) const -+ElemSort::getXPath(XalanSize_t index) const - { - return index == 0 ? m_selectPattern : 0; - } -Index: src/xalanc/XSLT/ElemElement.hpp -=================================================================== ---- src/xalanc/XSLT/ElemElement.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemElement.hpp (working copy) -@@ -60,8 +60,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemElement(); -Index: src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp -=================================================================== ---- src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp (working copy) -@@ -57,7 +57,9 @@ - * - * @param theBlockSize The block size. - */ -- XalanElemApplyTemplatesAllocator(MemoryManagerType& theManager, size_type theBlockCount); -+ XalanElemApplyTemplatesAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount); - - ~XalanElemApplyTemplatesAllocator(); - -@@ -77,8 +79,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - /** - * Determine if an object is owned by the allocator... -Index: src/xalanc/XSLT/ElemCopyOf.hpp -=================================================================== ---- src/xalanc/XSLT/ElemCopyOf.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemCopyOf.hpp (working copy) -@@ -57,8 +57,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - - -@@ -76,7 +76,7 @@ - execute(StylesheetExecutionContext& executionContext) const; - #endif - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index) const; - - private: - -Index: src/xalanc/XSLT/ElemApplyTemplates.cpp -=================================================================== ---- src/xalanc/XSLT/ElemApplyTemplates.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemApplyTemplates.cpp (working copy) -@@ -50,8 +50,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ParentType( - constructionContext, - stylesheetTree, -@@ -60,9 +60,9 @@ - StylesheetConstructionContext::ELEMNAME_APPLY_TEMPLATES), - m_mode(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -Index: src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp -=================================================================== ---- src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp (working copy) -@@ -57,7 +57,9 @@ - * - * @param theBlockSize The block size. - */ -- XalanElemAttributeSetAllocator(MemoryManagerType& theManager, size_type theBlockCount); -+ XalanElemAttributeSetAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount); - - ~XalanElemAttributeSetAllocator(); - -@@ -77,8 +79,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - /** - * Determine if an object is owned by the allocator... -Index: src/xalanc/XSLT/StylesheetExecutionContext.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetExecutionContext.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetExecutionContext.hpp (working copy) -@@ -56,6 +56,7 @@ - - - #include <xalanc/PlatformSupport/AttributeListImpl.hpp> -+#include <xalanc/PlatformSupport/FormatterListener.hpp> - #include <xalanc/PlatformSupport/XalanCollationServices.hpp> - - -@@ -105,12 +106,10 @@ - { - public: - --#if defined(XALAN_STRICT_ANSI_HEADERS) -- typedef std::size_t tl_size_type; --#else -- typedef size_t tl_size_type; --#endif -+ typedef XalanSize_t tl_size_type; - -+ typedef FormatterListener::size_type fl_size_type; -+ - #if defined(XALAN_NO_STD_NAMESPACE) - typedef ostream StreamType; - #else -@@ -1069,9 +1068,9 @@ - */ - virtual void - characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) = 0; -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length) = 0; - - /** - * Receive notification of character data. If available, when the -@@ -1084,9 +1083,9 @@ - */ - virtual void - charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) = 0; -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length) = 0; - - /** - * Called when a Comment is to be constructed. -Index: src/xalanc/XSLT/ElemTemplateElement.cpp -=================================================================== ---- src/xalanc/XSLT/ElemTemplateElement.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemTemplateElement.cpp (working copy) -@@ -82,8 +82,8 @@ - ElemTemplateElement::ElemTemplateElement( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken) : - PrefixResolver(), - m_stylesheet(stylesheetTree), -@@ -112,8 +112,8 @@ - Stylesheet& stylesheetTree, - int xslToken, - const XalanDOMString& baseURI, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - PrefixResolver(), - m_stylesheet(stylesheetTree), - m_namespacesHandler(constructionContext.getMemoryManager()), -@@ -158,7 +158,7 @@ - ElemTemplateElement::isAttrOK( - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext) const - { - return m_stylesheet.isAttrOK(attrName, atts, which, constructionContext); -@@ -171,7 +171,7 @@ - const XalanDOMChar* elementName, - const XalanDOMChar* aname, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext) - { - if(constructionContext.isXMLSpaceAttribute( -@@ -1062,12 +1062,13 @@ - - - const XPath* --ElemTemplateElement::getXPath(unsigned int /* index */) const -+ElemTemplateElement::getXPath(XalanSize_t /* index */) const - { - return 0; - } - - -+ - #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION) - const ElemTemplateElement* - ElemTemplateElement::findTemplateToTransformChild( -@@ -1504,8 +1505,8 @@ - - - ElemTemplateElement::LocatorProxy::LocatorProxy( -- size_type theLineNumber, -- size_type theColumnNumber, -+ XMLFileLoc theLineNumber, -+ XMLFileLoc theColumnNumber, - const XalanDOMString& theURI) : - m_lineNumber(theLineNumber), - m_columnNumber(theColumnNumber), -@@ -1521,7 +1522,7 @@ - - - --ElemTemplateElement::LocatorProxy::size_type -+XMLFileLoc - ElemTemplateElement::LocatorProxy::getLineNumber() const - { - return m_lineNumber; -@@ -1529,7 +1530,7 @@ - - - --ElemTemplateElement::LocatorProxy::size_type -+XMLFileLoc - ElemTemplateElement::LocatorProxy::getColumnNumber() const - { - return m_columnNumber; -Index: src/xalanc/XSLT/Stylesheet.cpp -=================================================================== ---- src/xalanc/XSLT/Stylesheet.cpp (revision 706129) -+++ src/xalanc/XSLT/Stylesheet.cpp (working copy) -@@ -252,9 +252,9 @@ - XPath* matchAttr = 0; - XPath* useAttr = 0; - -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for(XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -@@ -317,7 +317,7 @@ - } - } - -- if(0 == theQName) -+ if (0 == theQName) - { - const GetAndReleaseCachedString theGuard(constructionContext); - -@@ -331,7 +331,7 @@ - locator); - } - -- if(0 == matchAttr) -+ if (0 == matchAttr) - { - const GetAndReleaseCachedString theGuard(constructionContext); - -@@ -345,7 +345,7 @@ - locator); - } - -- if(0 == useAttr) -+ if (0 == useAttr) - { - const GetAndReleaseCachedString theGuard(constructionContext); - -@@ -374,13 +374,13 @@ - void - Stylesheet::pushNamespaces(const AttributeListType& atts) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - - NamespaceVectorType namespaces(getMemoryManager()); - - XalanDOMString prefix(getMemoryManager()); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for(XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - const XalanDOMChar* const value = atts.getValue(i); -@@ -438,12 +438,10 @@ - Stylesheet::PatternTableVectorType& theList, - const XalanMatchPatternData* thePattern) - { -- -- typedef Stylesheet::size_type size_type; - assert(thePattern != 0); - - const double thePatternPriority = thePattern->getPriorityOrDefault(); -- const size_type thePatternPosition = thePattern->getPosition(); -+ const XalanSize_t thePatternPosition = thePattern->getPosition(); - - typedef Stylesheet::PatternTableVectorType PatternTableListType; - typedef PatternTableListType::iterator iterator; -@@ -452,7 +450,7 @@ - - const iterator theEnd = theList.end(); - -- while(theCurrent != theEnd) -+ while (theCurrent != theEnd) - { - const double theCurrentPriority = (*theCurrent)->getPriorityOrDefault(); - -@@ -626,7 +624,7 @@ - Stylesheet::isAttrOK( - const XalanDOMChar* attrName, - const AttributeListType& /* atts */, -- int /* which */, -+ XalanSize_t /* which */, - StylesheetConstructionContext& constructionContext) const - { - // Namespace declarations are OK by definition -@@ -1497,16 +1495,16 @@ - const AttributeListType& atts, - StylesheetConstructionContext& constructionContext) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - - const XalanDOMString* stylesheetNamespace = 0; - const XalanDOMString* resultNamespace = 0; - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_STYLESHEET_PREFIX) == true) -+ if (equals(aname, Constants::ATTRNAME_STYLESHEET_PREFIX) == true) - { - const XalanDOMChar* const value = atts.getValue(i); - -@@ -1519,7 +1517,7 @@ - stylesheetNamespace = getNamespaceForPrefix(value, constructionContext); - } - } -- else if(equals(aname, Constants::ATTRNAME_RESULT_PREFIX)) -+ else if (equals(aname, Constants::ATTRNAME_RESULT_PREFIX)) - { - const XalanDOMChar* const value = atts.getValue(i); - -@@ -1532,7 +1530,7 @@ - resultNamespace = getNamespaceForPrefix(value, constructionContext); - } - } -- else if(!isAttrOK(aname, atts, i, constructionContext)) -+ else if (!isAttrOK(aname, atts, i, constructionContext)) - { - const GetAndReleaseCachedString theGuard(constructionContext); - -@@ -1588,10 +1586,10 @@ - const AttributeListType& atts, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = -+ const XalanFileLoc lineNumber = - XalanLocator::getLineNumber(locator); - -- const XalanLocator::size_type columnNumber = -+ const XalanFileLoc columnNumber = - XalanLocator::getColumnNumber(locator); - - m_elemDecimalFormats.reserve(m_elemDecimalFormats.size() + 1); -Index: src/xalanc/XSLT/ElemUse.cpp -=================================================================== ---- src/xalanc/XSLT/ElemUse.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemUse.cpp (working copy) -@@ -48,8 +48,8 @@ - ElemUse::ElemUse( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken) : - ElemTemplateElement(constructionContext, - stylesheetTree, -@@ -268,7 +268,7 @@ - StylesheetConstructionContext& constructionContext, - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which) -+ XalanSize_t which) - { - bool isUAS = false; - -Index: src/xalanc/XSLT/ElemValueOf.cpp -=================================================================== ---- src/xalanc/XSLT/ElemValueOf.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemValueOf.cpp (working copy) -@@ -185,7 +185,7 @@ - void - characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - m_executionContext.characters(chars, 0, length); - } -@@ -193,7 +193,7 @@ - void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - m_executionContext.charactersRaw(chars, 0, length); - } -@@ -206,7 +206,7 @@ - void - ignorableWhitespace( - const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -232,7 +232,7 @@ - void - cdata( - const XMLCh* const /* ch */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -Index: src/xalanc/XSLT/ElemCopy.cpp -=================================================================== ---- src/xalanc/XSLT/ElemCopy.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemCopy.cpp (working copy) -@@ -46,32 +46,32 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemUse(constructionContext, - stylesheetTree, - lineNumber, - columnNumber, - StylesheetConstructionContext::ELEMNAME_COPY) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(processUseAttributeSets( -+ if (processUseAttributeSets( - constructionContext, - aname, - atts, - i) == false && -- processSpaceAttr( -+ processSpaceAttr( - Constants::ELEMNAME_COPY_WITH_PREFIX_STRING.c_str(), - aname, - atts, - i, - constructionContext) == false && -- isAttrOK( -+ isAttrOK( - aname, - atts, - i, -@@ -94,6 +94,7 @@ - } - - -+ - #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION) - const ElemTemplateElement* - ElemCopy::startElement(StylesheetExecutionContext& executionContext) const -@@ -120,7 +121,6 @@ - executionContext.copyNamespaceAttributes(*sourceNode); - - return beginExecuteChildren(executionContext); -- - } - else - { -Index: src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (working copy) -@@ -213,8 +213,9 @@ - getURLFromString(const XalanDOMString& urlString); - - virtual XalanDOMString& -- getURLStringFromString(const XalanDOMString& urlString, -- XalanDOMString& theResult); -+ getURLStringFromString( -+ const XalanDOMString& urlString, -+ XalanDOMString& theResult); - - virtual URLAutoPtrType - getURLFromString( -@@ -648,7 +649,7 @@ - - static const ElementTokenTableEntry s_elementTokenTable[]; - -- static const unsigned int s_elementTokenTableSize; -+ static const XalanSize_t s_elementTokenTableSize; - - static const ElementTokenTableEntry& s_elementTokenTableLast; - -Index: src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp (working copy) -@@ -471,15 +471,15 @@ - - virtual void - characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length); - - virtual void - charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length); - - virtual void - comment(const XalanDOMChar* data); -@@ -515,8 +515,7 @@ - endCreateXResultTreeFrag(); - - virtual void -- beginFormatToText( -- XalanDOMString& theResult); -+ beginFormatToText(XalanDOMString& theResult); - - virtual void - endFormatToText(); -Index: src/xalanc/XSLT/ElemSort.hpp -=================================================================== ---- src/xalanc/XSLT/ElemSort.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemSort.hpp (working copy) -@@ -59,8 +59,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - static ElemSort* - create( -@@ -68,8 +68,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - ~ElemSort(); - -@@ -132,7 +132,7 @@ - getElementName() const; - - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index = 0) const; - - private: - -Index: src/xalanc/XSLT/XSLTEngineImpl.cpp -=================================================================== ---- src/xalanc/XSLT/XSLTEngineImpl.cpp (revision 706129) -+++ src/xalanc/XSLT/XSLTEngineImpl.cpp (working copy) -@@ -692,7 +692,7 @@ - #if defined(XALAN_OLD_STYLE_CASTS) - nsNode = (const XalanElement*)&fragBase; - #else -- nsNode = static_cast<XalanElement*>(node); -+ nsNode = static_cast<const XalanElement*>(node); - #endif - } - else -@@ -1064,9 +1064,12 @@ - - XalanDOMString uri( theManager ); - -- int lineNumber = XalanLocator::getUnknownValue(); -- int columnNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc lineNumber = -+ XalanLocator::getUnknownValue(); - -+ XalanFileLoc columnNumber = -+ XalanLocator::getUnknownValue(); -+ - const LocatorType* locator = getLocatorFromStack(); - - if (locator == 0 && styleNode != 0) -@@ -1136,8 +1139,8 @@ - id = &theDummy; - } - -- const XalanLocator::size_type lineNumber = locator.getLineNumber(); -- const XalanLocator::size_type columnNumber = locator.getColumnNumber(); -+ XalanFileLoc lineNumber = locator.getLineNumber(); -+ XalanFileLoc columnNumber = locator.getColumnNumber(); - - if (m_problemListener != 0) - { -@@ -1364,12 +1367,12 @@ - - void - XSLTEngineImpl::addResultAttribute( -- AttributeListImpl& attList, -- const XalanDOMString& aname, -- const XalanDOMChar* value, -- XalanDOMString::size_type theLength, -- bool fromCopy, -- const LocatorType* locator) -+ AttributeListImpl& attList, -+ const XalanDOMString& aname, -+ const XalanDOMChar* value, -+ size_type theLength, -+ bool fromCopy, -+ const LocatorType* locator) - { - assert(value != 0); - -@@ -1517,13 +1520,13 @@ - const AttributeListImpl& thePendingAttributes = - (const AttributeListImpl&)getPendingAttributes(); - -- const unsigned int n = thePendingAttributes.getLength(); -+ const XalanSize_t n = thePendingAttributes.getLength(); - -- for(unsigned int i = 0; i < n; i++) -+ for (XalanSize_t i = 0; i < n; i++) - { -- if(equals( -- thePendingAttributes.getName(i), -- DOMServices::s_XMLNamespace) == true) -+ if (equals( -+ thePendingAttributes.getName(i), -+ DOMServices::s_XMLNamespace) == true) - { - return true; - } -@@ -1650,7 +1653,7 @@ - - flushPending(); - -- const unsigned int nAtts = atts.getLength(); -+ const XalanSize_t nAtts = atts.getLength(); - - assert(m_outputContextStack.empty() == false); - -@@ -1659,7 +1662,7 @@ - - thePendingAttributes.clear(); - -- for(unsigned int i = 0; i < nAtts; i++) -+ for (XalanSize_t i = 0; i < nAtts; i++) - { - thePendingAttributes.addAttribute( - atts.getName(i), -@@ -1708,8 +1711,8 @@ - - void - XSLTEngineImpl::characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type length) - { - characters( - ch, -@@ -1721,9 +1724,9 @@ - - void - XSLTEngineImpl::characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length) - { - assert(getFormatterListenerImpl() != 0); - assert(ch != 0); -@@ -1732,11 +1735,11 @@ - - doFlushPending(); - -- if(generateCDATASection() == true) -+ if (generateCDATASection() == true) - { - getFormatterListenerImpl()->cdata(ch + start, length); - -- if(getTraceListeners() > 0) -+ if (getTraceListeners() > 0) - { - fireCharacterGenerateEvent(ch, start, length, true); - } -@@ -1745,7 +1748,7 @@ - { - getFormatterListenerImpl()->characters(ch + start, length); - -- if(getTraceListeners() > 0) -+ if (getTraceListeners() > 0) - { - fireCharacterGenerateEvent(ch, start, length, false); - } -@@ -1817,9 +1820,9 @@ - - void - XSLTEngineImpl::charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length) - { - assert(ch != 0); - assert(length != 0); -@@ -1880,8 +1883,8 @@ - - void - XSLTEngineImpl::ignorableWhitespace( -- const XalanDOMChar* ch, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type length) - { - assert(getFormatterListenerImpl() != 0); - assert(ch != 0); -@@ -1973,9 +1976,9 @@ - - void - XSLTEngineImpl::cdata( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length) - { - assert(getFormatterListenerImpl() != 0); - assert(ch != 0); -@@ -2716,7 +2719,7 @@ - const XalanDOMString& thePrefix, - XalanDOMString::size_type thePrefixLength) - { -- const unsigned int thePendingAttributesCount = -+ const XalanSize_t thePendingAttributesCount = - thePendingAttributes.getLength(); - - if (thePendingAttributesCount == 0) -@@ -2729,7 +2732,7 @@ - bool fResult = false; - - // Check each attribute... -- for (unsigned int i = 0; i < thePendingAttributesCount; ++i) -+ for (XalanSize_t i = 0; i < thePendingAttributesCount; ++i) - { - const XalanDOMChar* const thePendingAttributeName = - thePendingAttributes.getName(i); -@@ -3141,10 +3144,10 @@ - - void - XSLTEngineImpl::fireCharacterGenerateEvent( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length, -- bool isCDATA) -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length, -+ bool isCDATA) - { - const GenerateEvent ge( - isCDATA == true ? GenerateEvent::EVENTTYPE_CDATA : GenerateEvent::EVENTTYPE_CHARACTERS, -Index: src/xalanc/XSLT/DecimalToRoman.hpp -=================================================================== ---- src/xalanc/XSLT/DecimalToRoman.hpp (revision 706129) -+++ src/xalanc/XSLT/DecimalToRoman.hpp (working copy) -@@ -38,7 +38,7 @@ - { - enum { eMaxLetter = 2 }; - -- typedef unsigned long ValueType; -+ typedef XalanSize_t ValueType; - - ValueType m_postValue; - -Index: src/xalanc/XSLT/ElemForEach.cpp -=================================================================== ---- src/xalanc/XSLT/ElemForEach.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemForEach.cpp (working copy) -@@ -55,8 +55,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -66,17 +66,17 @@ - m_sortElems(constructionContext.getMemoryManager()), - m_sortElemsCount(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_SELECT)) -+ if (equals(aname, Constants::ATTRNAME_SELECT)) - { - m_selectPattern = constructionContext.createXPath(getLocator(), atts.getValue(i), *this); - } -- else if(isAttrOK( -+ else if (isAttrOK( - aname, - atts, - i, -@@ -96,7 +96,7 @@ - } - } - -- if(0 == m_selectPattern) -+ if (0 == m_selectPattern) - { - error( - constructionContext, -@@ -111,8 +111,8 @@ - ElemForEach::ElemForEach( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken) : - ElemTemplateElement(constructionContext, - stylesheetTree, -@@ -147,8 +147,8 @@ - const AttributeListType& atts, - const LocatorType* locator) - { -- const int lineNumber = XalanLocator::getLineNumber(locator); -- const int columnNumber = XalanLocator::getColumnNumber(locator); -+ const XalanFileLoc lineNumber = XalanLocator::getLineNumber(locator); -+ const XalanFileLoc columnNumber = XalanLocator::getColumnNumber(locator); - - m_sortElems.reserve(m_sortElems.size() + 1); - -@@ -826,7 +826,7 @@ - - - const XPath* --ElemForEach::getXPath(unsigned int index) const -+ElemForEach::getXPath(XalanSize_t index) const - { - return index == 0 ? m_selectPattern : 0; - } -Index: src/xalanc/XSLT/ElemApplyTemplates.hpp -=================================================================== ---- src/xalanc/XSLT/ElemApplyTemplates.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemApplyTemplates.hpp (working copy) -@@ -50,11 +50,11 @@ - * @param columnNumber column number in document - */ - ElemApplyTemplates( -- StylesheetConstructionContext& constructionContext, -- Stylesheet& stylesheetTree, -- const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ StylesheetConstructionContext& constructionContext, -+ Stylesheet& stylesheetTree, -+ const AttributeListType& atts, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemApplyTemplates(); -Index: src/xalanc/XSLT/StylesheetHandler.cpp -=================================================================== ---- src/xalanc/XSLT/StylesheetHandler.cpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetHandler.cpp (working copy) -@@ -1525,7 +1525,7 @@ - void - StylesheetHandler::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if (m_inTemplate == false && - inExtensionElement() == false && -@@ -1551,7 +1551,7 @@ - void - StylesheetHandler::cdata( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - accumulateText(chars, length); - -@@ -1565,7 +1565,7 @@ - void - StylesheetHandler::ignorableWhitespace( - const XMLCh* const /*chars*/, -- const unsigned int /*length*/) -+ const size_type /*length*/) - { - // Ignore! - m_lastPopped = 0; -@@ -1617,7 +1617,7 @@ - void - StylesheetHandler::charactersRaw( - const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -1625,8 +1625,8 @@ - - void - StylesheetHandler::processText( -- const XMLCh* chars, -- XalanDOMString::size_type length) -+ const XMLCh* chars, -+ size_type length) - { - if(m_inTemplate) - { -@@ -1719,8 +1719,8 @@ - - void - StylesheetHandler::accumulateText( -- const XMLCh* chars, -- XalanDOMString::size_type length) -+ const XMLCh* chars, -+ size_type length) - { - if(m_inTemplate) - { -Index: src/xalanc/XSLT/ElemTemplateElement.hpp -=================================================================== ---- src/xalanc/XSLT/ElemTemplateElement.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemTemplateElement.hpp (working copy) -@@ -89,8 +89,8 @@ - ElemTemplateElement( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken); - - /** -@@ -110,8 +110,8 @@ - Stylesheet& stylesheetTree, - int xslToken, - const XalanDOMString& baseURI = XalanDOMString(XalanMemMgrs::getDummyMemMgr()), -- int lineNumber = XalanLocator::getUnknownValue(), -- int columnNumber = XalanLocator::getUnknownValue()); -+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue(), -+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue()); - - virtual - ~ElemTemplateElement(); -@@ -138,7 +138,7 @@ - isAttrOK( - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext) const; - - /** -@@ -156,7 +156,7 @@ - const XalanDOMChar* elementName, - const XalanDOMChar* aname, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext); - - /** -@@ -615,7 +615,7 @@ - * @return pointer or null - */ - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index) const; - - // These interfaces are inherited from PrefixResolver... - -@@ -633,8 +633,8 @@ - public: - - LocatorProxy( -- size_type theLineNumber, -- size_type theColumnNumber, -+ XMLFileLoc theLineNumber, -+ XMLFileLoc theColumnNumber, - const XalanDOMString& theURI); - - virtual -@@ -646,10 +646,10 @@ - virtual const XMLCh* - getSystemId() const; - -- virtual size_type -+ virtual XMLFileLoc - getLineNumber() const; - -- virtual size_type -+ virtual XMLFileLoc - getColumnNumber() const; - - const XalanDOMString& -@@ -670,21 +670,21 @@ - operator==(const LocatorProxy&) const; - - // data members... -- const size_type m_lineNumber; -+ const XMLFileLoc m_lineNumber; - -- const size_type m_columnNumber; -+ const XMLFileLoc m_columnNumber; - - const XalanDOMString& m_uri; - }; - - -- LocatorProxy::size_type -+ XMLFileLoc - getLineNumber() const - { - return m_locatorProxy.getLineNumber(); - } - -- LocatorProxy::size_type -+ XMLFileLoc - getColumnNumber() const - { - return m_locatorProxy.getColumnNumber(); -Index: src/xalanc/XSLT/Stylesheet.hpp -=================================================================== ---- src/xalanc/XSLT/Stylesheet.hpp (revision 706129) -+++ src/xalanc/XSLT/Stylesheet.hpp (working copy) -@@ -86,7 +86,6 @@ - - public: - -- typedef StylesheetConstructionContext::size_type size_type; - typedef StylesheetExecutionContext::ParamVectorType ParamVectorType; - typedef XalanQName::NamespaceVectorType NamespaceVectorType; - typedef XalanQName::NamespacesStackType NamespacesStackType; -@@ -288,7 +287,7 @@ - isAttrOK( - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext) const; - - /** -@@ -298,8 +297,9 @@ - * @return namespace string for node, or null if not found. - */ - const XalanDOMString* -- getNamespaceFromStack(const XalanDOMString& nodeName, -- XalanDOMString& theBuffer) const -+ getNamespaceFromStack( -+ const XalanDOMString& nodeName, -+ XalanDOMString& theBuffer) const - { - return getNamespaceFromStack(c_wstr(nodeName), theBuffer); - } -@@ -311,8 +311,9 @@ - * @return namespace string for node, or null if not found. - */ - const XalanDOMString* -- getNamespaceFromStack(const XalanDOMChar* nodeName, -- XalanDOMString& theBuffer) const; -+ getNamespaceFromStack( -+ const XalanDOMChar* nodeName, -+ XalanDOMString& theBuffer) const; - - /** - * Get the namespace from a prefix by searching the stack of namespace -Index: src/xalanc/XSLT/ElemUse.hpp -=================================================================== ---- src/xalanc/XSLT/ElemUse.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemUse.hpp (working copy) -@@ -56,8 +56,8 @@ - ElemUse( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken); - - virtual -@@ -77,7 +77,7 @@ - StylesheetConstructionContext& constructionContext, - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which); -+ XalanSize_t which); - - // These methods are inherited from ElemTemplateElement ... - -Index: src/xalanc/XSLT/ElemCallTemplate.cpp -=================================================================== ---- src/xalanc/XSLT/ElemCallTemplate.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemCallTemplate.cpp (working copy) -@@ -54,13 +54,13 @@ - m_templateName(0), - m_template(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for(XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_NAME)) -+ if (equals(aname, Constants::ATTRNAME_NAME)) - { - m_templateName = constructionContext.createXalanQName( - atts.getValue(i), -@@ -76,7 +76,7 @@ - atts.getValue(i)); - } - } -- else if(isAttrOK( -+ else if (isAttrOK( - aname, - atts, - i, -Index: src/xalanc/XSLT/CountersTable.hpp -=================================================================== ---- src/xalanc/XSLT/CountersTable.hpp (revision 706129) -+++ src/xalanc/XSLT/CountersTable.hpp (working copy) -@@ -55,7 +55,7 @@ - */ - struct Counter - { -- typedef unsigned long CountType; -+ typedef XalanSize_t CountType; - - typedef XalanVector<XalanNode*> NodeVectorType; - -Index: src/xalanc/XSLT/ElemCopy.hpp -=================================================================== ---- src/xalanc/XSLT/ElemCopy.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemCopy.hpp (working copy) -@@ -49,8 +49,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - // These methods are inherited from ElemTemplateElement ... - -Index: src/xalanc/XSLT/ElemChoose.cpp -=================================================================== ---- src/xalanc/XSLT/ElemChoose.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemChoose.cpp (working copy) -@@ -48,26 +48,26 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, - columnNumber, - StylesheetConstructionContext::ELEMNAME_CHOOSE) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(isAttrOK( -+ if (isAttrOK( - aname, - atts, - i, - constructionContext) == false && -- processSpaceAttr( -+ processSpaceAttr( - Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING.c_str(), - aname, - atts, -@@ -107,17 +107,17 @@ - { - const int type = node->getXSLToken(); - -- if(StylesheetConstructionContext::ELEMNAME_WHEN == type) -+ if (StylesheetConstructionContext::ELEMNAME_WHEN == type) - { - -- const XPath* const theXPath = node->getXPath(); -+ const XPath* const theXPath = node->getXPath(0); - assert(theXPath != 0); - - bool test; - - theXPath->execute(*this, executionContext, test); - -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - executionContext.fireSelectEvent( - SelectionEvent(executionContext, -@@ -172,7 +172,7 @@ - if(StylesheetConstructionContext::ELEMNAME_WHEN == type) - { - -- const XPath* const theXPath = node->getXPath(); -+ const XPath* const theXPath = node->getXPath(0); - assert(theXPath != 0); - - bool test; -Index: src/xalanc/XSLT/ElemApplyImport.cpp -=================================================================== ---- src/xalanc/XSLT/ElemApplyImport.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemApplyImport.cpp (working copy) -@@ -52,21 +52,21 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, - columnNumber, - StylesheetConstructionContext::ELEMNAME_APPLY_IMPORTS) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(isAttrOK( -+ if (isAttrOK( - aname, - atts, - i, -Index: src/xalanc/XSLT/KeyDeclaration.hpp -=================================================================== ---- src/xalanc/XSLT/KeyDeclaration.hpp (revision 706129) -+++ src/xalanc/XSLT/KeyDeclaration.hpp (working copy) -@@ -54,8 +54,8 @@ - const XPath& matchPattern, - const XPath& use, - const XalanDOMString& uri, -- XalanLocator::size_type lineNumber, -- XalanLocator::size_type columnNumber) : -+ XMLFileLoc lineNumber, -+ XMLFileLoc columnNumber) : - m_qname(&qname), - m_match(&matchPattern), - m_use(&use), -@@ -136,7 +136,7 @@ - * - * @return The line number - */ -- XalanLocator::size_type -+ XMLFileLoc - getLineNumber() const - { - return m_lineNumber; -@@ -147,7 +147,7 @@ - * - * @return The column number - */ -- XalanLocator::size_type -+ XMLFileLoc - getColumnNumber() const - { - return m_columnNumber; -@@ -163,9 +163,9 @@ - - const XalanDOMString* m_uri; - -- XalanLocator::size_type m_lineNumber; -+ XMLFileLoc m_lineNumber; - -- XalanLocator::size_type m_columnNumber; -+ XMLFileLoc m_columnNumber; - }; - - -Index: src/xalanc/XSLT/ElemAttribute.cpp -=================================================================== ---- src/xalanc/XSLT/ElemAttribute.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemAttribute.cpp (working copy) -@@ -46,8 +46,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -56,9 +56,9 @@ - m_nameAVT(0), - m_namespaceAVT(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -@@ -398,6 +398,7 @@ - } - - executionContext.getAndPopCachedString(); -+ - return 0; - } - -Index: src/xalanc/XSLT/XSLTEngineImpl.hpp -=================================================================== ---- src/xalanc/XSLT/XSLTEngineImpl.hpp (revision 706129) -+++ src/xalanc/XSLT/XSLTEngineImpl.hpp (working copy) -@@ -425,7 +425,7 @@ - addResultNamespaceDecl( - const XalanDOMString& prefix, - const XalanDOMChar* namespaceVal, -- XalanDOMString::size_type len) -+ size_type len) - { - m_resultNamespacesStack.addDeclaration( - prefix, -@@ -496,15 +496,15 @@ - * @param theLength The length of the value - * @param fromCopy true if the attribute is being copied from the source tree - * @param locator The Locator for reporting errors. -- */ -- void -- addResultAttribute( -- AttributeListImpl& attList, -- const XalanDOMString& aname, -- const XalanDOMChar* value, -- XalanDOMString::size_type theLength, -- bool fromCopy = false, -- const LocatorType* locator = 0); -+ */ -+ void -+ addResultAttribute( -+ AttributeListImpl& attList, -+ const XalanDOMString& aname, -+ const XalanDOMChar* value, -+ size_type theLength, -+ bool fromCopy = false, -+ const LocatorType* locator = 0); - - /** - * Add attribute to pending attributes list, and if it is a namespace, add -@@ -585,15 +585,15 @@ - void - endElement(const XalanDOMChar* name); - -- void -- characters ( -- const XalanDOMChar* ch, -- XalanDOMString::size_type length); -+ void -+ characters ( -+ const XalanDOMChar* ch, -+ size_type length); - -- void -- ignorableWhitespace( -- const XalanDOMChar* ch, -- XalanDOMString::size_type length); -+ void -+ ignorableWhitespace( -+ const XalanDOMChar* ch, -+ size_type length); - - void - processingInstruction( -@@ -603,18 +603,18 @@ - void - resetDocument(); - -- /** -- * Receive notification of character data. -- * -- * @param ch pointer to characters from the XML document -- * @param start startng offset in 'ch' array -- * @param length number of characters to read from the array -- */ -- void -- characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ /** -+ * Receive notification of character data. -+ * -+ * @param ch pointer to characters from the XML document -+ * @param start startng offset in 'ch' array -+ * @param length number of characters to read from the array -+ */ -+ void -+ characters( -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length); - - /** - * Send character data from the node to the result tree. -@@ -641,20 +641,20 @@ - void - startElement(const XalanDOMChar* name); - -- /** -- * Receive notification of character data. If available, when the -- * disable-output-escaping attribute is used, output raw text without -- * escaping. -- * -- * @param ch pointer to characters from the XML document -- * @param start start position in the array -- * @param length number of characters to read from the array -- */ -- void -- charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ /** -+ * Receive notification of character data. If available, when the -+ * disable-output-escaping attribute is used, output raw text without -+ * escaping. -+ * -+ * @param ch pointer to characters from the XML document -+ * @param start start position in the array -+ * @param length number of characters to read from the array -+ */ -+ void -+ charactersRaw( -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length); - - /** - * Send raw character data from the node to the result tree. -@@ -689,18 +689,18 @@ - void - entityReference(const XalanDOMChar* data); - -- /** -- * Receive notification of cdata. -- * -- * @param ch pointer to characters from the XML document -- * @param start start position in the array -- * @param length number of characters to read from the array -- */ -- void -- cdata( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ /** -+ * Receive notification of cdata. -+ * -+ * @param ch pointer to characters from the XML document -+ * @param start start position in the array -+ * @param length number of characters to read from the array -+ */ -+ void -+ cdata( -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length); - - /** - * Clone a node to the result tree -@@ -1600,12 +1600,12 @@ - const XalanDOMString& theString, - bool isCDATA); - -- void -- fireCharacterGenerateEvent( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length, -- bool isCDATA); -+ void -+ fireCharacterGenerateEvent( -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length, -+ bool isCDATA); - - void - checkDefaultNamespace( -Index: src/xalanc/XSLT/ElemForEach.hpp -=================================================================== ---- src/xalanc/XSLT/ElemForEach.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemForEach.hpp (working copy) -@@ -67,11 +67,11 @@ - * @param columnNumber column number in document - */ - ElemForEach( -- StylesheetConstructionContext& constructionContext, -- Stylesheet& stylesheetTree, -- const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ StylesheetConstructionContext& constructionContext, -+ Stylesheet& stylesheetTree, -+ const AttributeListType& atts, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemForEach(); -@@ -112,7 +112,7 @@ - #endif - - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index) const; - - protected: - -@@ -126,11 +126,11 @@ - * @param xslToken an integer representing the type of instance. - */ - ElemForEach( -- StylesheetConstructionContext& constructionContext, -- Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -- int xslToken); -+ StylesheetConstructionContext& constructionContext, -+ Stylesheet& stylesheetTree, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, -+ int xslToken); - - #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION) - -Index: src/xalanc/XSLT/XalanElemElementAllocator.cpp -=================================================================== ---- src/xalanc/XSLT/XalanElemElementAllocator.cpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemElementAllocator.cpp (working copy) -@@ -23,7 +23,9 @@ - - - --XalanElemElementAllocator::XalanElemElementAllocator(MemoryManagerType& theManager, size_type theBlockCount) : -+XalanElemElementAllocator::XalanElemElementAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount) : - m_allocator(theManager, theBlockCount) - { - } -@@ -41,8 +43,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - data_type* const theBlock = m_allocator.allocateBlock(); - assert(theBlock != 0); -Index: src/xalanc/XSLT/XalanElemAttributeAllocator.cpp -=================================================================== ---- src/xalanc/XSLT/XalanElemAttributeAllocator.cpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemAttributeAllocator.cpp (working copy) -@@ -23,7 +23,9 @@ - - - --XalanElemAttributeAllocator::XalanElemAttributeAllocator(MemoryManagerType& theManager, size_type theBlockCount) : -+XalanElemAttributeAllocator::XalanElemAttributeAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount) : - m_allocator(theManager, theBlockCount) - { - } -@@ -41,8 +43,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - data_type* const theBlock = m_allocator.allocateBlock(); - assert(theBlock != 0); -Index: src/xalanc/XSLT/StylesheetHandler.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetHandler.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetHandler.hpp (working copy) -@@ -129,7 +129,10 @@ - * @see #ignorableWhitespace - * @see org.xml.sax.Locator - */ -- virtual void characters (const XMLCh* const chars, const unsigned int length); -+ virtual void -+ characters( -+ const XMLCh* const chars, -+ const size_type length); - - /** - * Receive notification of character data. If available, when the -@@ -141,7 +144,10 @@ - * @param length number of characters to read from the array - * @exception SAXException - */ -- virtual void charactersRaw(const XMLCh* const chars, const unsigned int length); -+ virtual void -+ charactersRaw( -+ const XMLCh* const chars, -+ const size_type length); - - /** - * Receive notification of cdata. -@@ -166,7 +172,10 @@ - * @exception SAXException - * @see #ignorableWhitespace - */ -- virtual void cdata(const XMLCh* const ch, const unsigned int length); -+ virtual void -+ cdata( -+ const XMLCh* const ch, -+ const size_type length); - - /** - * Receive notification of ignorable whitespace in element content. -@@ -191,7 +200,10 @@ - * @exception SAXException - * @see #characters - */ -- virtual void ignorableWhitespace (const XMLCh* const chars, const unsigned int length); -+ virtual void -+ ignorableWhitespace( -+ const XMLCh* const chars, -+ const size_type length); - - /** - * Receive notification of a processing instruction. -@@ -467,13 +479,13 @@ - - void - processText( -- const XMLCh* chars, -- XalanDOMString::size_type length); -+ const XMLCh* chars, -+ size_type length); - - void - accumulateText( -- const XMLCh* chars, -- XalanDOMString::size_type length); -+ const XMLCh* chars, -+ size_type length); - - void - processAccumulatedText(); -Index: src/xalanc/XSLT/ElemDecimalFormat.cpp -=================================================================== ---- src/xalanc/XSLT/ElemDecimalFormat.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemDecimalFormat.cpp (working copy) -@@ -50,8 +50,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -66,13 +66,13 @@ - m_decimalFormatSymbols.setInfinity(XalanDOMString(constructionContext.getMemoryManager())); - m_decimalFormatSymbols.setNaN(XalanDOMString(constructionContext.getMemoryManager())); - -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_NAME)) -+ if (equals(aname, Constants::ATTRNAME_NAME)) - { - assert(atts.getValue(i) != 0); - -@@ -90,7 +90,7 @@ - atts.getValue(i)); - } - } -- else if(equals(aname, Constants::ATTRNAME_DECIMALSEPARATOR)) -+ else if (equals(aname, Constants::ATTRNAME_DECIMALSEPARATOR)) - { - const XalanDOMChar* const decimalSepValue = atts.getValue(i); - assert(decimalSepValue != 0); -@@ -109,7 +109,7 @@ - decimalSepValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_GROUPINGSEPARATOR)) -+ else if (equals(aname, Constants::ATTRNAME_GROUPINGSEPARATOR)) - { - const XalanDOMChar* const sepValue = atts.getValue(i); - assert(sepValue!= 0); -@@ -128,13 +128,13 @@ - sepValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_INFINITY)) -+ else if (equals(aname, Constants::ATTRNAME_INFINITY)) - { - assert(atts.getValue(i) != 0); - - m_decimalFormatSymbols.setInfinity(atts.getValue(i)); - } -- else if(equals(aname, Constants::ATTRNAME_MINUSSIGN)) -+ else if (equals(aname, Constants::ATTRNAME_MINUSSIGN)) - { - const XalanDOMChar* const minusValue = atts.getValue(i); - assert(minusValue != 0); -@@ -153,13 +153,13 @@ - minusValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_NAN)) -+ else if (equals(aname, Constants::ATTRNAME_NAN)) - { - assert(atts.getValue(i) != 0); - - m_decimalFormatSymbols.setNaN(atts.getValue(i)); - } -- else if(equals(aname, Constants::ATTRNAME_PERCENT)) -+ else if (equals(aname, Constants::ATTRNAME_PERCENT)) - { - const XalanDOMChar* const percentValue = atts.getValue(i); - assert(percentValue != 0); -@@ -178,7 +178,7 @@ - percentValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_PERMILLE)) -+ else if (equals(aname, Constants::ATTRNAME_PERMILLE)) - { - const XalanDOMChar* const permilleValue = atts.getValue(i); - assert(permilleValue != 0); -@@ -197,7 +197,7 @@ - permilleValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_ZERODIGIT)) -+ else if (equals(aname, Constants::ATTRNAME_ZERODIGIT)) - { - const XalanDOMChar* const zeroDigitValue = atts.getValue(i); - assert(zeroDigitValue != 0); -@@ -216,7 +216,7 @@ - zeroDigitValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_DIGIT)) -+ else if (equals(aname, Constants::ATTRNAME_DIGIT)) - { - const XalanDOMChar* const digitValue = atts.getValue(i); - assert(digitValue != 0); -@@ -308,7 +308,7 @@ - - - const XPath* --ElemDecimalFormat::getXPath(unsigned int index) const -+ElemDecimalFormat::getXPath(XalanSize_t index) const - { - const XPath* result = 0; - -Index: src/xalanc/XSLT/ElemAttributeSet.cpp -=================================================================== ---- src/xalanc/XSLT/ElemAttributeSet.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemAttributeSet.cpp (working copy) -@@ -41,8 +41,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemUse(constructionContext, - stylesheetTree, - lineNumber, -@@ -50,13 +50,13 @@ - StylesheetConstructionContext::ELEMNAME_ATTRIBUTE_SET), - m_qname(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_NAME)) -+ if (equals(aname, Constants::ATTRNAME_NAME)) - { - m_qname = constructionContext.createXalanQName( - atts.getValue(i), -@@ -72,12 +72,12 @@ - atts.getValue(i)); - } - } -- else if(processUseAttributeSets( -+ else if (processUseAttributeSets( - constructionContext, - aname, - atts, - i) == false && -- isAttrOK( -+ isAttrOK( - aname, - atts, - i, -@@ -91,7 +91,7 @@ - } - } - -- if(m_qname == 0) -+ if (m_qname == 0) - { - error( - constructionContext, -Index: src/xalanc/XSLT/ElemChoose.hpp -=================================================================== ---- src/xalanc/XSLT/ElemChoose.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemChoose.hpp (working copy) -@@ -49,8 +49,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - - // These methods are inherited from ElemTemplateElement ... -Index: src/xalanc/XSLT/ElemApplyImport.hpp -=================================================================== ---- src/xalanc/XSLT/ElemApplyImport.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemApplyImport.hpp (working copy) -@@ -50,8 +50,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - - // These methods are inherited from ElemTemplateElement ... -@@ -77,7 +77,6 @@ - virtual ElemTemplateElement* - appendChildElem(ElemTemplateElement* newChild); - -- - private: - }; - -Index: src/xalanc/XSLT/ElemElement.cpp -=================================================================== ---- src/xalanc/XSLT/ElemElement.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemElement.cpp (working copy) -@@ -45,8 +45,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemUse(constructionContext, - stylesheetTree, - lineNumber, -@@ -59,9 +59,9 @@ - // turn them off... - // m_namespacesHandler.setProcessNamespaceAliaises(false); - -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -@@ -125,6 +125,7 @@ - } - - -+ - #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION) - const ElemTemplateElement* - ElemElement::startElement(StylesheetExecutionContext& executionContext) const -Index: src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp -=================================================================== ---- src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp (working copy) -@@ -23,7 +23,9 @@ - - - --XalanElemApplyTemplatesAllocator::XalanElemApplyTemplatesAllocator(MemoryManagerType& theManager, size_type theBlockCount) : -+XalanElemApplyTemplatesAllocator::XalanElemApplyTemplatesAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount) : - m_allocator(theManager, theBlockCount) - { - } -@@ -41,8 +43,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - data_type* const theBlock = m_allocator.allocateBlock(); - assert(theBlock != 0); -Index: src/xalanc/XMLSupport/XalanIndentWriter.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanIndentWriter.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanIndentWriter.hpp (working copy) -@@ -22,18 +22,21 @@ - - #include <xalanc/Include/XalanVector.hpp> - -+#include <xalanc/PlatformSupport/FormatterListener.hpp> - #include <xalanc/PlatformSupport/Writer.hpp> - - - XALAN_CPP_NAMESPACE_BEGIN - - --template<class WhiteSpaceWriter, -- class NewLineWriter> -+template< -+ class WhiteSpaceWriter, -+ class NewLineWriter> - class XalanIndentWriter - { - public: -- typedef typename XalanDOMString::size_type size_type; -+ -+ typedef FormatterListener::size_type size_type; - typedef XalanVector<bool> BoolStackType; - typedef typename WhiteSpaceWriter::writer_type writer_type; - -Index: src/xalanc/XMLSupport/XalanUTF8Writer.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanUTF8Writer.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanUTF8Writer.hpp (working copy) -@@ -150,34 +150,40 @@ - /** - * Writes name chars , if not presentable, throws - */ -- void writeNameChar(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writeNameChar( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writePIChars(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writePIChars( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writeCommentChars(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writeCommentChars( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - void - safeWriteContent( -- const XalanDOMChar* theChars, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theChars, -+ size_type theLength) - { - for(size_type i = 0; i < theLength; ++i) - { -@@ -187,8 +193,8 @@ - - void - write( -- const value_type* theChars, -- XalanDOMString::size_type theLength) -+ const value_type* theChars, -+ size_type theLength) - { - #if defined(NDEBUG) - if (theLength > sizeof(m_buffer)) -@@ -214,7 +220,7 @@ - m_bufferRemaining -= theLength; - } - #else -- for(XalanDOMString::size_type i = 0; i < theLength; ++i) -+ for(size_type i = 0; i < theLength; ++i) - { - write(theChars[i]); - } -@@ -251,8 +257,8 @@ - - void - write( -- const XalanDOMChar* theChars, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theChars, -+ size_type theLength) - { - for(size_type i = 0; i < theLength; ++i) - { -@@ -262,13 +268,13 @@ - - size_type - write( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - XalanDOMChar ch = chars[start]; - -- if (XalanFormatterWriter::isUTF16HighSurrogate(ch) == false) -+ if (isUTF16HighSurrogate(ch) == false) - { - write((unsigned int)ch); - } -@@ -276,7 +282,7 @@ - { - if (start + 1 >= length) - { -- XalanFormatterWriter::throwInvalidUTF16SurrogateException( -+ throwInvalidUTF16SurrogateException( - ch, - 0, - getMemoryManager()); -@@ -284,7 +290,7 @@ - else - { - write( -- XalanFormatterWriter::decodeUTF16SurrogatePair( -+ decodeUTF16SurrogatePair( - ch, - chars[++start], - getMemoryManager())); -@@ -296,8 +302,8 @@ - - void - writeSafe( -- const XalanDOMChar* theChars, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theChars, -+ size_type theLength) - { - XalanDOMChar ch = 0; - -@@ -305,15 +311,15 @@ - { - ch = theChars[i]; - -- if (XalanFormatterWriter::isUTF16HighSurrogate(ch) == true) -+ if (isUTF16HighSurrogate(ch) == true) - { - if (i + 1 >= theLength) - { -- XalanFormatterWriter::throwInvalidUTF16SurrogateException(ch, 0, getMemoryManager()); -+ throwInvalidUTF16SurrogateException(ch, 0, getMemoryManager()); - } - else - { -- write(XalanFormatterWriter::decodeUTF16SurrogatePair(ch, theChars[i+1], getMemoryManager())); -+ write(decodeUTF16SurrogatePair(ch, theChars[i + 1], getMemoryManager())); - - ++i; - } -@@ -410,7 +416,7 @@ - } - else - { -- XalanFormatterWriter::throwInvalidCharacterException(theChar, getMemoryManager()); -+ throwInvalidCharacterException(theChar, getMemoryManager()); - } - } - -@@ -421,11 +427,11 @@ - - - // Data members... -- value_type m_buffer[kBufferSize]; -+ value_type m_buffer[kBufferSize]; - -- value_type* m_bufferPosition; -+ value_type* m_bufferPosition; - -- XalanDOMString::size_type m_bufferRemaining; -+ size_type m_bufferRemaining; - }; - - -Index: src/xalanc/XMLSupport/XalanFormatterWriter.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanFormatterWriter.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanFormatterWriter.hpp (working copy) -@@ -24,6 +24,7 @@ - #include <xercesc/sax/SAXException.hpp> - - #include <xalanc/PlatformSupport/DOMStringHelper.hpp> -+#include <xalanc/PlatformSupport/FormatterListener.hpp> - #include <xalanc/PlatformSupport/Writer.hpp> - #include <xalanc/PlatformSupport/XalanMessageLoader.hpp> - #include <xalanc/PlatformSupport/XalanOutputStream.hpp> -@@ -42,6 +43,9 @@ - { - public: - -+ typedef FormatterListener::size_type size_type; -+ -+ - template <class WriterType> - class NewLineWriterFunctor - { -@@ -90,14 +94,14 @@ - /** - * The length of the the string of characters that represents the newline - */ -- XalanDOMString::size_type m_newlineStringLength; -+ size_type m_newlineStringLength; - }; - - template<class WriterType> - class WhiteSpaceWriterFunctor - { -- typedef XalanDOMString::size_type size_type; - typedef typename WriterType::value_type value_type; -+ - public: - typedef WriterType writer_type; - -@@ -150,9 +154,6 @@ - - public: - -- typedef XalanDOMString::size_type size_type; -- -- - XalanFormatterWriter( - Writer& theWriter, - MemoryManager& theMemoryManager) : -@@ -313,7 +314,7 @@ - /** - * The length of the the string of characters that represents the newline - */ -- XalanDOMString::size_type m_newlineStringLength; -+ size_type m_newlineStringLength; - - /** - * Format a code point as a numeric character reference. -Index: src/xalanc/XMLSupport/FormatterToHTML.cpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToHTML.cpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToHTML.cpp (working copy) -@@ -156,7 +156,7 @@ - m_attrCharsMap[XalanUnicode::charLessThanSign] = 0; - m_attrCharsMap[XalanUnicode::charGreaterThanSign] = 0; - -- for(XalanDOMString::size_type i = 160; i < SPECIALSSIZE; i++) -+ for(size_type i = 160; i < SPECIALSSIZE; i++) - { - m_attrCharsMap[i] = 'S'; - } -@@ -481,7 +481,7 @@ - void - FormatterToHTML::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if(length != 0) - { -@@ -590,7 +590,7 @@ - void - FormatterToHTML::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - if(m_isScriptOrStyleElem == true) - { -@@ -632,7 +632,7 @@ - const XMLCh* const data) - - { -- const XalanDOMString::size_type dataLength = length(data); -+ const size_type dataLength = length(data); - - // Use a fairly nasty hack to tell if the next node is supposed to be - // unescaped text. -@@ -689,13 +689,13 @@ - - void - FormatterToHTML::writeCharacters( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theString, -+ size_type theLength) - { - assert(theString != 0); - -- XalanDOMString::size_type i = 0; -- XalanDOMString::size_type firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < theLength) - { -@@ -768,13 +768,13 @@ - - void - FormatterToHTML::writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength) -+ const XalanDOMChar* theString, -+ size_type theStringLength) - { - assert(theString != 0); - -- XalanDOMString::size_type i = 0; -- XalanDOMString::size_type firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < theStringLength) - { -@@ -853,8 +853,8 @@ - - void - FormatterToHTML::copyEntityIntoBuffer( -- const XalanDOMChar* s, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* s, -+ size_type theLength) - { - assert(s != 0); - -@@ -885,11 +885,11 @@ - const XalanDOMChar* value, - const XalanHTMLElementsProperties::ElementProperties& elemProperties) - { -- const XalanDOMString::size_type nameLength = length(name); -+ const size_type nameLength = length(name); - - accumContent(XalanUnicode::charSpace); - -- const XalanDOMString::size_type valueLength = length(value); -+ const size_type valueLength = length(value); - - if((valueLength == 0 || equalsIgnoreCaseASCII(name, nameLength, value, valueLength)) && - elemProperties.isAttribute(name, XalanHTMLElementsProperties::ATTREMPTY) == true) -@@ -919,8 +919,8 @@ - - void - FormatterToHTML::writeAttrURI( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength) -+ const XalanDOMChar* theString, -+ size_type theStringLength) - { - assert(theString != 0); - -@@ -939,7 +939,7 @@ - // causing damage. If the URL is already properly escaped, in theory, this - // function should not change the string value. - -- for (XalanDOMString::size_type i = 0; i < theStringLength; ++i) -+ for (size_type i = 0; i < theStringLength; ++i) - { - const XalanDOMChar ch = theString[i]; - -@@ -1123,8 +1123,8 @@ - - if (m_prefixResolver != 0) - { -- const XalanDOMString::size_type theLength = length(theElementName); -- const XalanDOMString::size_type theColonIndex = indexOf(theElementName, XalanUnicode::charColon); -+ const size_type theLength = length(theElementName); -+ const size_type theColonIndex = indexOf(theElementName, XalanUnicode::charColon); - - const XalanDOMString* thePrefix = &s_emptyString; - -Index: src/xalanc/XMLSupport/FormatterToHTML.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToHTML.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToHTML.hpp (working copy) -@@ -118,7 +118,7 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - // These methods are inherited from FormatterToXML... - -@@ -135,7 +135,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -159,19 +159,19 @@ - { - enum { eMaxLength = 8 }; - -- XalanDOMChar m_char; -+ XalanDOMChar m_char; - -- XalanDOMString::size_type m_length; -+ size_type m_length; - -- XalanDOMChar m_string[eMaxLength + 1]; -+ XalanDOMChar m_string[eMaxLength + 1]; - }; - - protected: - - virtual void - writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength); -+ const XalanDOMChar* theString, -+ size_type theStringLength); - - virtual void - accumCommentData(const XalanDOMChar* data); -@@ -181,13 +181,11 @@ - - void - writeCharacters( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theLength); -+ const XalanDOMChar* theString, -+ size_type theLength); - - private: - -- typedef XalanDOMString::size_type size_type; -- - /** - * The string "<!DOCTYPE HTML". - */ -@@ -230,8 +228,8 @@ - - void - copyEntityIntoBuffer( -- const XalanDOMChar* s, -- XalanDOMString::size_type theLength); -+ const XalanDOMChar* s, -+ size_type theLength); - - void - copyEntityIntoBuffer(const XalanDOMString& s); -@@ -256,8 +254,8 @@ - */ - void - writeAttrURI( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength); -+ const XalanDOMChar* theString, -+ size_type theStringLength); - - /** - * Accumulate the specified character by converting its numeric value to -Index: src/xalanc/XMLSupport/FormatterToNull.cpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToNull.cpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToNull.cpp (working copy) -@@ -76,7 +76,7 @@ - void - FormatterToNull::characters( - const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -85,7 +85,7 @@ - void - FormatterToNull::charactersRaw( - const XMLCh* const /* chars */, -- const unsigned int /*length */) -+ const size_type /*length */) - { - } - -@@ -100,7 +100,7 @@ - void - FormatterToNull::ignorableWhitespace( - const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -131,8 +131,8 @@ - - void - FormatterToNull::cdata( -- const XMLCh* const /* ch */, -- const unsigned int /* length */) -+ const XMLCh* const /* ch */, -+ const size_type /* length */) - { - } - -Index: src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp (working copy) -@@ -233,7 +233,7 @@ - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - writeParentTagEnd(); - -@@ -391,7 +391,7 @@ - m_writer.write(value_type(XalanUnicode::charQuestionMark)); - writeName(target); - -- const XalanDOMString::size_type len = length(data); -+ const size_type len = length(data); - - // We need to make sure there is a least one whitespace character - // between the target and the data. -@@ -416,7 +416,7 @@ - void - writeCharacters( - const XMLCh* chars, -- unsigned int length) -+ size_type length) - { - assert(length != 0); - -@@ -424,8 +424,8 @@ - - m_indentHandler.setPreserve(true); - -- unsigned int i = 0; -- unsigned int firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < length) - { -@@ -466,7 +466,7 @@ - void - writeCDATA( - const XMLCh* chars, -- unsigned int length) -+ size_type length) - { - assert(length != 0); - -@@ -638,12 +638,12 @@ - * @param start the start offset into the string. - * @param length the length of the string. - */ -- XalanDOMString::size_type -+ size_type - writeNormalizedChar( -- XalanDOMChar ch, -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ XalanDOMChar ch, -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - if (XalanUnicode::charLF == ch) - { -@@ -679,11 +679,11 @@ - m_writer.write(value_type(XalanUnicode::charSemicolon)); - } - -- XalanDOMString::size_type -+ size_type - writeNormalizedCharBig( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - assert( start < length); - -@@ -712,11 +712,11 @@ - */ - void - writeCDATAChars( -- const XalanDOMChar chars[], -- XalanDOMString::size_type length, -- bool& outsideCDATA) -+ const XalanDOMChar chars[], -+ size_type length, -+ bool& outsideCDATA) - { -- XalanDOMString::size_type i = 0; -+ size_type i = 0; - - while(i < length) - { -@@ -795,13 +795,13 @@ - */ - void - writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength) -+ const XalanDOMChar* theString, -+ size_type theStringLength) - { - assert(theString != 0); - -- XalanDOMString::size_type i = 0; -- XalanDOMString::size_type firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < theStringLength) - { -@@ -863,10 +863,10 @@ - */ - void - writeNormalizedData( -- const XalanDOMChar* theData, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theData, -+ size_type theLength) - { -- for (XalanDOMString::size_type i = 0; i < theLength; ++i) -+ for (size_type i = 0; i < theLength; ++i) - { - const XalanDOMChar theChar = theData[i]; - -@@ -876,8 +876,8 @@ - - void - safeWriteContent( -- const XalanDOMChar* theChars, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theChars, -+ size_type theLength) - { - for(size_type i = 0; i < theLength; ++i) - { -Index: src/xalanc/XMLSupport/FormatterToNull.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToNull.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToNull.hpp (working copy) -@@ -74,12 +74,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -87,7 +87,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -104,7 +104,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - private: - -Index: src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp -=================================================================== ---- src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp (working copy) -@@ -258,7 +258,7 @@ - void - XalanXMLSerializerBase::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if(length != 0) - { -@@ -280,7 +280,7 @@ - void - XalanXMLSerializerBase::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - if (length != 0) - { -@@ -322,7 +322,7 @@ - void - XalanXMLSerializerBase::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if (length > 0) - { -@@ -380,7 +380,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::s_xhtmlDocTypeStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::s_xhtmlDocTypeStringLength = - FXML_SIZE(s_xhtmlDocTypeString); - - -@@ -481,7 +481,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderStartStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderStartStringLength = - FXML_SIZE(s_doctypeHeaderStartString); - - const char XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicString[] = -@@ -498,7 +498,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicStringLength = - FXML_SIZE(s_doctypeHeaderPublicString); - - const char XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemString[] = -@@ -515,7 +515,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemStringLength = - FXML_SIZE(s_doctypeHeaderSystemString); - - const char XalanXMLSerializerBase::UTF8::s_xmlHeaderStartString[] = -@@ -538,7 +538,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStartStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStartStringLength = - FXML_SIZE(s_xmlHeaderStartString); - - const char XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingString[] = -@@ -558,7 +558,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingStringLength = - FXML_SIZE(s_xmlHeaderEncodingString); - - const char XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneString[] = -@@ -580,7 +580,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneStringLength = - FXML_SIZE(s_xmlHeaderStandaloneString); - - const char XalanXMLSerializerBase::UTF8::s_xmlHeaderEndString[] = -@@ -591,7 +591,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEndStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEndStringLength = - FXML_SIZE(s_xmlHeaderEndString); - - const char XalanXMLSerializerBase::UTF8::s_defaultVersionString[] = -@@ -602,7 +602,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_defaultVersionStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_defaultVersionStringLength = - FXML_SIZE(s_defaultVersionString); - - const char XalanXMLSerializerBase::UTF8::s_cdataOpenString[] = -@@ -619,7 +619,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_cdataOpenStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_cdataOpenStringLength = - FXML_SIZE(s_cdataOpenString); - - const char XalanXMLSerializerBase::UTF8::s_cdataCloseString[] = -@@ -630,7 +630,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_cdataCloseStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_cdataCloseStringLength = - FXML_SIZE(s_cdataCloseString); - - -@@ -656,7 +656,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xhtmlDocTypeStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xhtmlDocTypeStringLength = - FXML_SIZE(s_xhtmlDocTypeString); - - const char XalanXMLSerializerBase::UTF8::s_lessThanEntityString[] = -@@ -668,7 +668,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_lessThanEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_lessThanEntityStringLength = - FXML_SIZE(s_lessThanEntityString); - - const char XalanXMLSerializerBase::UTF8::s_greaterThanEntityString[] = -@@ -680,7 +680,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_greaterThanEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_greaterThanEntityStringLength = - FXML_SIZE(s_greaterThanEntityString); - - const char XalanXMLSerializerBase::UTF8::s_ampersandEntityString[] = -@@ -693,7 +693,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_ampersandEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_ampersandEntityStringLength = - FXML_SIZE(s_ampersandEntityString); - - const char XalanXMLSerializerBase::UTF8::s_quoteEntityString[] = -@@ -707,7 +707,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_quoteEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_quoteEntityStringLength = - FXML_SIZE(s_quoteEntityString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartString[] = -@@ -725,7 +725,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartStringLength = - FXML_SIZE(s_doctypeHeaderStartString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicString[] = -@@ -742,7 +742,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicStringLength = - FXML_SIZE(s_doctypeHeaderPublicString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemString[] = -@@ -759,7 +759,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemStringLength = - FXML_SIZE(s_doctypeHeaderSystemString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderStartString[] = -@@ -782,7 +782,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStartStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStartStringLength = - FXML_SIZE(s_xmlHeaderStartString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingString[] = -@@ -802,7 +802,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingStringLength = - FXML_SIZE(s_xmlHeaderEncodingString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneString[] = -@@ -824,7 +824,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneStringLength = - FXML_SIZE(s_xmlHeaderStandaloneString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderEndString[] = -@@ -835,7 +835,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEndStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEndStringLength = - FXML_SIZE(s_xmlHeaderEndString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_defaultVersionString[] = -@@ -846,7 +846,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_defaultVersionStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_defaultVersionStringLength = - FXML_SIZE(s_defaultVersionString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_cdataOpenString[] = -@@ -863,7 +863,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_cdataOpenStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_cdataOpenStringLength = - FXML_SIZE(s_cdataOpenString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_cdataCloseString[] = -@@ -874,7 +874,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_cdataCloseStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_cdataCloseStringLength = - FXML_SIZE(s_cdataCloseString); - - -@@ -900,7 +900,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xhtmlDocTypeStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xhtmlDocTypeStringLength = - FXML_SIZE(s_xhtmlDocTypeString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_lessThanEntityString[] = -@@ -912,7 +912,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_lessThanEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_lessThanEntityStringLength = - FXML_SIZE(s_lessThanEntityString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_greaterThanEntityString[] = -@@ -924,7 +924,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_greaterThanEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_greaterThanEntityStringLength = - FXML_SIZE(s_greaterThanEntityString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_ampersandEntityString[] = -@@ -937,7 +937,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_ampersandEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_ampersandEntityStringLength = - FXML_SIZE(s_ampersandEntityString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_quoteEntityString[] = -@@ -951,7 +951,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_quoteEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_quoteEntityStringLength = - FXML_SIZE(s_quoteEntityString); - - -Index: src/xalanc/XMLSupport/FormatterToText.cpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToText.cpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToText.cpp (working copy) -@@ -187,7 +187,7 @@ - void - FormatterToText::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_writer != 0); - -@@ -245,7 +245,7 @@ - void - FormatterToText::charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - characters(chars, length); - } -@@ -262,7 +262,7 @@ - void - FormatterToText::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if (m_handleIgnorableWhitespace == true) - { -@@ -301,7 +301,7 @@ - void - FormatterToText::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - characters(ch, length); - } -Index: src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp (working copy) -@@ -122,12 +122,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length) = 0; -+ const size_type length) = 0; - - virtual void - entityReference(const XMLCh* const name) = 0; -@@ -135,7 +135,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -151,7 +151,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual const XalanDOMString& - getDoctypeSystem() const; -@@ -207,107 +207,107 @@ - /** - * The string "<!DOCTYPE ". - */ -- static const char s_doctypeHeaderStartString[]; -+ static const char s_doctypeHeaderStartString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderStartStringLength; -+ static const size_type s_doctypeHeaderStartStringLength; - - /** - * The string " PUBLIC \"". - */ -- static const char s_doctypeHeaderPublicString[]; -+ static const char s_doctypeHeaderPublicString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderPublicStringLength; -+ static const size_type s_doctypeHeaderPublicStringLength; - - /** - * The string " SYSTEM \"". - */ -- static const char s_doctypeHeaderSystemString[]; -+ static const char s_doctypeHeaderSystemString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderSystemStringLength; -+ static const size_type s_doctypeHeaderSystemStringLength; - - /** - * The string "<?xml version=\"". - */ -- static const char s_xmlHeaderStartString[]; -+ static const char s_xmlHeaderStartString[]; - -- static const XalanDOMString::size_type s_xmlHeaderStartStringLength; -+ static const size_type s_xmlHeaderStartStringLength; - - /** - * The string "\" encoding=\"". - */ -- static const char s_xmlHeaderEncodingString[]; -+ static const char s_xmlHeaderEncodingString[]; - -- static const XalanDOMString::size_type s_xmlHeaderEncodingStringLength; -+ static const size_type s_xmlHeaderEncodingStringLength; - - /** - * The string "\" standalone=\"". - */ -- static const char s_xmlHeaderStandaloneString[]; -+ static const char s_xmlHeaderStandaloneString[]; - -- static const XalanDOMString::size_type s_xmlHeaderStandaloneStringLength; -+ static const size_type s_xmlHeaderStandaloneStringLength; - - /** - * The string "\"?>". - */ -- static const char s_xmlHeaderEndString[]; -+ static const char s_xmlHeaderEndString[]; - -- static const XalanDOMString::size_type s_xmlHeaderEndStringLength; -+ static const size_type s_xmlHeaderEndStringLength; - - /** - * The string "1.0". - */ -- static const char s_defaultVersionString[]; -+ static const char s_defaultVersionString[]; - -- static const XalanDOMString::size_type s_defaultVersionStringLength; -+ static const size_type s_defaultVersionStringLength; - - /** - * The string "-//W3C//DTD XHTML". - */ -- static const XalanDOMChar s_xhtmlDocTypeString[]; -+ static const XalanDOMChar s_xhtmlDocTypeString[]; - -- static const XalanDOMString::size_type s_xhtmlDocTypeStringLength; -+ static const size_type s_xhtmlDocTypeStringLength; - - /** - * The string "<![CDATA[". - */ -- static const char s_cdataOpenString[]; -+ static const char s_cdataOpenString[]; - -- static const XalanDOMString::size_type s_cdataOpenStringLength; -+ static const size_type s_cdataOpenStringLength; - - /** - * The string "]]>". - */ -- static const char s_cdataCloseString[]; -+ static const char s_cdataCloseString[]; - -- static const XalanDOMString::size_type s_cdataCloseStringLength; -+ static const size_type s_cdataCloseStringLength; - - /** - * The string "<". - */ -- static const char s_lessThanEntityString[]; -+ static const char s_lessThanEntityString[]; - -- static const XalanDOMString::size_type s_lessThanEntityStringLength; -+ static const size_type s_lessThanEntityStringLength; - - /** - * The string ">". - */ -- static const char s_greaterThanEntityString[]; -+ static const char s_greaterThanEntityString[]; - -- static const XalanDOMString::size_type s_greaterThanEntityStringLength; -+ static const size_type s_greaterThanEntityStringLength; - - /** - * The string "&". - */ -- static const char s_ampersandEntityString[]; -+ static const char s_ampersandEntityString[]; - -- static const XalanDOMString::size_type s_ampersandEntityStringLength; -+ static const size_type s_ampersandEntityStringLength; - - /** - * The string """. - */ -- static const char s_quoteEntityString[]; -+ static const char s_quoteEntityString[]; - -- static const XalanDOMString::size_type s_quoteEntityStringLength; -+ static const size_type s_quoteEntityStringLength; - }; - - class XALAN_XMLSUPPORT_EXPORT UTF16 -@@ -322,107 +322,107 @@ - /** - * The string "<!DOCTYPE ". - */ -- static const XalanDOMChar s_doctypeHeaderStartString[]; -+ static const XalanDOMChar s_doctypeHeaderStartString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderStartStringLength; -+ static const size_type s_doctypeHeaderStartStringLength; - - /** - * The string " PUBLIC \"". - */ -- static const XalanDOMChar s_doctypeHeaderPublicString[]; -+ static const XalanDOMChar s_doctypeHeaderPublicString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderPublicStringLength; -+ static const size_type s_doctypeHeaderPublicStringLength; - - /** - * The string " SYSTEM \"". - */ -- static const XalanDOMChar s_doctypeHeaderSystemString[]; -+ static const XalanDOMChar s_doctypeHeaderSystemString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderSystemStringLength; -+ static const size_type s_doctypeHeaderSystemStringLength; - - /** - * The string "<?xml version=\"". - */ -- static const XalanDOMChar s_xmlHeaderStartString[]; -+ static const XalanDOMChar s_xmlHeaderStartString[]; - -- static const XalanDOMString::size_type s_xmlHeaderStartStringLength; -+ static const size_type s_xmlHeaderStartStringLength; - - /** - * The string "\" encoding=\"". - */ -- static const XalanDOMChar s_xmlHeaderEncodingString[]; -+ static const XalanDOMChar s_xmlHeaderEncodingString[]; - -- static const XalanDOMString::size_type s_xmlHeaderEncodingStringLength; -+ static const size_type s_xmlHeaderEncodingStringLength; - - /** - * The string "\" standalone=\"". - */ -- static const XalanDOMChar s_xmlHeaderStandaloneString[]; -+ static const XalanDOMChar s_xmlHeaderStandaloneString[]; - -- static const XalanDOMString::size_type s_xmlHeaderStandaloneStringLength; -+ static const size_type s_xmlHeaderStandaloneStringLength; - - /** - * The string "\"?>". - */ -- static const XalanDOMChar s_xmlHeaderEndString[]; -+ static const XalanDOMChar s_xmlHeaderEndString[]; - -- static const XalanDOMString::size_type s_xmlHeaderEndStringLength; -+ static const size_type s_xmlHeaderEndStringLength; - - /** - * The string "1.0". - */ -- static const XalanDOMChar s_defaultVersionString[]; -+ static const XalanDOMChar s_defaultVersionString[]; - -- static const XalanDOMString::size_type s_defaultVersionStringLength; -+ static const size_type s_defaultVersionStringLength; - - /** - * The string "-//W3C//DTD XHTML". - */ -- static const XalanDOMChar s_xhtmlDocTypeString[]; -+ static const XalanDOMChar s_xhtmlDocTypeString[]; - -- static const XalanDOMString::size_type s_xhtmlDocTypeStringLength; -+ static const size_type s_xhtmlDocTypeStringLength; - - /** - * The string "<![CDATA[". - */ -- static const XalanDOMChar s_cdataOpenString[]; -+ static const XalanDOMChar s_cdataOpenString[]; - -- static const XalanDOMString::size_type s_cdataOpenStringLength; -+ static const size_type s_cdataOpenStringLength; - - /** - * The string "]]>". - */ -- static const XalanDOMChar s_cdataCloseString[]; -+ static const XalanDOMChar s_cdataCloseString[]; - -- static const XalanDOMString::size_type s_cdataCloseStringLength; -+ static const size_type s_cdataCloseStringLength; - - /** - * The string "<". - */ -- static const XalanDOMChar s_lessThanEntityString[]; -+ static const XalanDOMChar s_lessThanEntityString[]; - -- static const XalanDOMString::size_type s_lessThanEntityStringLength; -+ static const size_type s_lessThanEntityStringLength; - - /** - * The string ">". - */ -- static const XalanDOMChar s_greaterThanEntityString[]; -+ static const XalanDOMChar s_greaterThanEntityString[]; - -- static const XalanDOMString::size_type s_greaterThanEntityStringLength; -+ static const size_type s_greaterThanEntityStringLength; - - /** - * The string "&". - */ -- static const XalanDOMChar s_ampersandEntityString[]; -+ static const XalanDOMChar s_ampersandEntityString[]; - -- static const XalanDOMString::size_type s_ampersandEntityStringLength; -+ static const size_type s_ampersandEntityStringLength; - - /** - * The string """. - */ -- static const XalanDOMChar s_quoteEntityString[]; -+ static const XalanDOMChar s_quoteEntityString[]; - -- static const XalanDOMString::size_type s_quoteEntityStringLength; -+ static const size_type s_quoteEntityStringLength; - }; - - enum -@@ -569,12 +569,12 @@ - virtual void - writeCharacters( - const XMLCh* chars, -- unsigned int length) = 0; -+ size_type length) = 0; - - virtual void - writeCDATA( - const XMLCh* chars, -- unsigned int length) = 0; -+ size_type length) = 0; - - virtual void - outputNewline() = 0; -@@ -692,7 +692,7 @@ - */ - const XalanDOMString m_standalone; - -- const XalanDOMString m_encoding; -+ const XalanDOMString m_encoding; - - static bool - isUTF16HighSurrogate(XalanDOMChar theChar) -@@ -790,9 +790,9 @@ - /** - * The string "-//W3C//DTD XHTML". - */ -- static const XalanDOMChar s_xhtmlDocTypeString[]; -+ static const XalanDOMChar s_xhtmlDocTypeString[]; - -- static const XalanDOMString::size_type s_xhtmlDocTypeStringLength; -+ static const size_type s_xhtmlDocTypeStringLength; - }; - - -Index: src/xalanc/XMLSupport/FormatterToText.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToText.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToText.hpp (working copy) -@@ -187,12 +187,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -200,7 +200,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -216,7 +216,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - private: - -Index: src/xalanc/XMLSupport/FormatterToXML.cpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToXML.cpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToXML.cpp (working copy) -@@ -695,13 +695,13 @@ - - void - FormatterToXML::accumNameArray( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { -- const XalanDOMString::size_type n = start + length; -+ const size_type n = start + length; - -- for(XalanDOMString::size_type i = start; i < n; ++i) -+ for(size_type i = start; i < n; ++i) - { - accumName(chars[i]); - } -@@ -711,13 +711,13 @@ - - void - FormatterToXML::accumContentArray( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { -- const XalanDOMString::size_type n = start + length; -+ const size_type n = start + length; - -- for(XalanDOMString::size_type i = start; i < n; ++i) -+ for(size_type i = start; i < n; ++i) - { - accumContent(chars[i]); - } -@@ -727,13 +727,13 @@ - - void - FormatterToXML::accumArrayUTF( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { -- const XalanDOMString::size_type n = start + length; -+ const size_type n = start + length; - -- for(XalanDOMString::size_type i = start; i < n; ++i) -+ for(size_type i = start; i < n; ++i) - { - accumCharUTF(chars[i]); - } -@@ -743,9 +743,9 @@ - - void - FormatterToXML::accumArrayUTFDirect( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - assert(m_maxCharacter >= 65535); - assert(m_stream != 0); -@@ -854,13 +854,13 @@ - - - --XalanDOMString::size_type -+FormatterToXML::size_type - FormatterToXML::accumDefaultEscape( -- XalanDOMChar ch, -- XalanDOMString::size_type i, -- const XalanDOMChar chars[], -- XalanDOMString::size_type len, -- bool escLF) -+ XalanDOMChar ch, -+ size_type i, -+ const XalanDOMChar chars[], -+ size_type len, -+ bool escLF) - { - if(!accumDefaultEntity(ch, escLF)) - { -@@ -1258,7 +1258,7 @@ - void - FormatterToXML::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if(length != 0) - { -@@ -1278,8 +1278,8 @@ - - m_ispreserve = true; - -- unsigned int i = 0; -- unsigned int firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < length) - { -@@ -1318,7 +1318,7 @@ - void - FormatterToXML::charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - writeParentTagEnd(); - -@@ -1378,13 +1378,13 @@ - - void - FormatterToXML::writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength) -+ const XalanDOMChar* theString, -+ size_type theStringLength) - { - assert(theString != 0); - -- XalanDOMString::size_type i = 0; -- XalanDOMString::size_type firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < theStringLength) - { -@@ -1423,14 +1423,14 @@ - - void - FormatterToXML::writeNormalizedChars( -- const XalanDOMChar ch[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length, -- bool isCData) -+ const XalanDOMChar ch[], -+ size_type start, -+ size_type length, -+ bool isCData) - { -- XalanDOMString::size_type end = start + length; -+ size_type end = start + length; - -- for(XalanDOMString::size_type i = start; i < end; i++) -+ for(size_type i = start; i < end; ++i) - { - const XalanDOMChar c = ch[i]; - -@@ -1595,7 +1595,7 @@ - void - FormatterToXML::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - #if 1 - // We need to do normalization, which is slower, -@@ -1678,7 +1678,7 @@ - void - FormatterToXML::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - if(m_nextIsRaw == true) - { -@@ -1839,10 +1839,10 @@ - - void - FormatterToXML::accumNormalizedPIData( -- const XalanDOMChar* theData, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theData, -+ size_type theLength) - { -- for (XalanDOMString::size_type i = 0; i < theLength; ++i) -+ for (size_type i = 0; i < theLength; ++i) - { - accumContent(theData[i]); - } -Index: src/xalanc/XMLSupport/XalanUTF16Writer.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanUTF16Writer.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanUTF16Writer.hpp (working copy) -@@ -56,10 +56,10 @@ - - size_type - writeCDATAChar( -- const XalanDOMChar chars[], -- size_type start, -- size_type /*length*/, -- bool& /* outsideCDATA */) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type /*length*/, -+ bool& /* outsideCDATA */) - { - assert( chars != 0 ); - -@@ -69,28 +69,34 @@ - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writeNameChar(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writeNameChar( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writePIChars(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writePIChars( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writeCommentChars(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writeCommentChars( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } -Index: src/xalanc/XMLSupport/FormatterToXML.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToXML.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToXML.hpp (working copy) -@@ -146,12 +146,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -159,7 +159,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -176,7 +176,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual Writer* - getWriter() const; -@@ -294,8 +294,8 @@ - - typedef void (FormatterToXML::*AccumArrayFunctionType)( - const XalanDOMChar[], -- XalanDOMString::size_type, -- XalanDOMString::size_type); -+ size_type, -+ size_type); - - typedef void (FormatterToXML::*FlushFunctionType)(); - -@@ -374,9 +374,9 @@ - */ - void - accumName( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - assert(m_accumNameArrayFunction != 0); - -@@ -392,9 +392,9 @@ - */ - void - accumContent( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - assert(m_accumContentArrayFunction != 0); - -@@ -434,13 +434,13 @@ - /** - * Escape and accum a character. - */ -- XalanDOMString::size_type -+ size_type - accumDefaultEscape( -- XalanDOMChar ch, -- XalanDOMString::size_type i, -- const XalanDOMChar chars[], -- XalanDOMString::size_type len, -- bool escLF); -+ XalanDOMChar ch, -+ size_type i, -+ const XalanDOMChar chars[], -+ size_type len, -+ bool escLF); - - /** - * Handle one of the default entities, return false if it -@@ -513,10 +513,10 @@ - */ - virtual void - writeNormalizedChars( -- const XalanDOMChar ch[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length, -- bool isCData); -+ const XalanDOMChar ch[], -+ size_type start, -+ size_type length, -+ bool isCData); - - /** - * Write a number into the buffer as an entity -@@ -534,8 +534,8 @@ - */ - virtual void - writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength); -+ const XalanDOMChar* theString, -+ size_type theStringLength); - - /** - * Write the data for a comment -@@ -853,9 +853,9 @@ - */ - void - accumNameArray( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length); - - /** - * Append an array of wide character to the buffer. -@@ -868,9 +868,9 @@ - */ - void - accumContentArray( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length); - - /** - * Append an array of wide character to the buffer. -@@ -883,9 +883,9 @@ - */ - void - accumArrayUTF( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length); - - /** - * Append an array of wide character to the output. -@@ -898,9 +898,9 @@ - */ - void - accumArrayUTFDirect( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length); - - /** - * Append a string to the buffer. -@@ -974,8 +974,8 @@ - */ - void - accumNormalizedPIData( -- const XalanDOMChar* theData, -- XalanDOMString::size_type theLength); -+ const XalanDOMChar* theData, -+ size_type theLength); - - - // Data members... -@@ -1018,7 +1018,7 @@ - */ - const XalanDOMString m_attrSpecialChars; - -- typedef XalanDOMString::size_type size_type; -+ //typedef XalanDOMString::size_type size_type; - - /** - * The string "<!DOCTYPE ". -Index: src/xalanc/Utils/MsgCreator/NLSHandler.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/NLSHandler.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/NLSHandler.hpp (working copy) -@@ -20,8 +20,15 @@ - #include "ICUResHandler.hpp" - - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - XERCES_CPP_NAMESPACE_USE - -+ -+ - class NLSHandler : public ICUResHandler - { - public: -@@ -44,7 +51,7 @@ - - void - characters( const XMLCh* const chars -- , const unsigned int length); -+ , const XMLSize_t length); - void - startDocument(); - -@@ -72,6 +79,8 @@ - - - --#endif //NLSHANDLER_MSGCREATOR_1357924680 -+XALAN_CPP_NAMESPACE_END - - -+ -+#endif //NLSHANDLER_MSGCREATOR_1357924680 -Index: src/xalanc/Utils/MsgCreator/InMemHandler.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/InMemHandler.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/InMemHandler.cpp (working copy) -@@ -26,6 +26,11 @@ - #include "InMemData.hpp" - - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - // ----------------------------------------------------------------------- - // Constructors - // ----------------------------------------------------------------------- -@@ -68,7 +73,7 @@ - - - void InMemHandler::characters( const XMLCh* const chars -- , const unsigned int length) -+ , const XalanSize_t length) - { - - if ( m_startCollectingCharacters == true ) -@@ -99,15 +104,15 @@ - - } - --void InMemHandler::endElement(const XMLCh* const , -- const XMLCh* const localname, -- const XMLCh* const ) -+void InMemHandler::endElement(const XMLCh* const /* uri */, -+ const XMLCh* const /* localname */, -+ const XMLCh* const qname) - { - if ( m_startCollectingCharacters == false) - return; - - -- if(!XMLString::compareString(localname,s_targetXMLCh)) -+ if(!XMLString::compareString(qname,s_targetXMLCh)) - { - m_startCollectingCharacters = false; - -@@ -121,13 +126,13 @@ - const Attributes& attributes) - { - -- if(!XMLString::compareString(localname,s_transUnitXMLCh)) -+ if(!XMLString::compareString(qname,s_transUnitXMLCh)) - { - // this is an elemente, SAX2Handler class is responsible to handle: - // creating Index file, commom for all localization styles - SAX2Handler::startElement(uri, localname, qname, attributes); - } -- else if(!XMLString::compareString(localname,s_targetXMLCh)) -+ else if(!XMLString::compareString(qname,s_targetXMLCh)) - { - - -@@ -203,3 +208,7 @@ - printToDataFile( szEndDataFile ); - - } -+ -+ -+ -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/MsgCreator.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/MsgCreator.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/MsgCreator.cpp (working copy) -@@ -263,7 +263,9 @@ - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); - #endif -- -+ -+ XALAN_CPP_NAMESPACE_USE -+ - CmdLineParams theParams; - - int iReturnValue = 0; -Index: src/xalanc/Utils/MsgCreator/InMemHandler.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/InMemHandler.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/InMemHandler.hpp (working copy) -@@ -20,8 +20,14 @@ - #include "SAX2Handler.hpp" - - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - XERCES_CPP_NAMESPACE_USE - -+ - class InMemHandler : public SAX2Handler - { - public: -@@ -54,7 +60,7 @@ - - virtual void - characters( const XMLCh* const chars -- , const unsigned int length); -+ , const XalanSize_t length); - - - -@@ -96,4 +102,10 @@ - - }; - -+ -+ -+XALAN_CPP_NAMESPACE_END -+ -+ -+ - #endif /// INMEMHANDLER_MSGCREATOR_1357924680 -Index: src/xalanc/Utils/MsgCreator/SAX2Handler.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (working copy) -@@ -29,11 +29,12 @@ - #include "MsgCreator.hpp" - - -+XALAN_CPP_NAMESPACE_BEGIN - -+ - static const char* INDEX_FILE_NAME="LocalMsgIndex.hpp"; - - -- - // --------------------------------------------------------------------------- - // SAX2Handler: Constructors and Destructor - // --------------------------------------------------------------------------- -@@ -92,12 +93,12 @@ - - - --void SAX2Handler::startElement(const XMLCh* const , -- const XMLCh* const localname, -- const XMLCh* const , -+void SAX2Handler::startElement(const XMLCh* const /* uri */, -+ const XMLCh* const /* localname */, -+ const XMLCh* const qname, - const Attributes& attributes) - { -- if(!XMLString::compareString(localname,s_transUnitXMLCh)) -+ if(!XMLString::compareString(qname,s_transUnitXMLCh)) - { - unsigned int len = attributes.getLength(); - -@@ -192,3 +193,5 @@ - } - - -+ -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/SAX2Handler.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/SAX2Handler.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/SAX2Handler.hpp (working copy) -@@ -23,6 +23,10 @@ - #include <xercesc/util/XMLUniDefs.hpp> - - -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - XERCES_CPP_NAMESPACE_USE - - -@@ -210,6 +214,9 @@ - }; - - --#endif //SAX2HANDLER_MSGCREATOR_1357924680 - -+XALAN_CPP_NAMESPACE_END - -+ -+ -+#endif //SAX2HANDLER_MSGCREATOR_1357924680 -Index: src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp (working copy) -@@ -24,6 +24,9 @@ - #include <cstdio> - - -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ - static XalanFileOutputStream::HandleType - openFile(const char* theFileName) - { -@@ -105,7 +108,7 @@ - void - XalanFileOutputStream::writeData( - const char* theBuffer, -- unsigned int theBufferLength) -+ XalanSize_t theBufferLength) - { - #if defined(WIN32) - DWORD theBytesWritten; -@@ -204,13 +207,13 @@ - } - - --void XalanFileOutputStream::write(const UTF16Ch* theString, unsigned int theLength) -+void XalanFileOutputStream::write(const UTF16Ch* theString, XalanSize_t theLength) - { - assert ( theString != 0 ); - writeData((const char*)theString,theLength * sizeof(UTF16Ch) ); - } - --void XalanFileOutputStream::write(const char* theString, unsigned int theLength) -+void XalanFileOutputStream::write(const char* theString, XalanSize_t theLength) - { - assert ( theString != 0 ); - -@@ -221,7 +224,7 @@ - XMLString::release(&theUTFString); - } - --void XalanFileOutputStream::writeAsASCII(const UTF16Ch* theString, unsigned int theLengts) -+void XalanFileOutputStream::writeAsASCII(const UTF16Ch* theString, XalanSize_t theLengts) - { - char* szString = XMLString::transcode(theString); - writeData( szString, theLengts ); -@@ -229,7 +232,7 @@ - - } - --void XalanFileOutputStream::writeAsASCII(const char* theString, unsigned int theLengts) -+void XalanFileOutputStream::writeAsASCII(const char* theString, XalanSize_t theLengts) - { - writeData( theString, theLengts ); - } -@@ -244,3 +247,7 @@ - { - write(s_UTF16ByteOrderMark,1); - } -+ -+ -+ -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp (working copy) -@@ -20,6 +20,7 @@ - #define XALANOUTPUTFILE_1357924680 - - #include <xercesc/util/XMLUniDefs.hpp> -+#include "xalanc/Include/PlatformDefinitions.hpp" - - - #if defined(WIN32) -@@ -32,10 +33,11 @@ - - - --XERCES_CPP_NAMESPACE_USE -+XALAN_CPP_NAMESPACE_BEGIN - - - -+XERCES_CPP_NAMESPACE_USE - - // Class responcible for printing into file with UTF16 - -@@ -111,15 +113,15 @@ - - - void -- write(const UTF16Ch* theString, unsigned int theLength); -+ write(const UTF16Ch* theString, XalanSize_t theLength); - void -- write(const char* theString, unsigned int theLength); -+ write(const char* theString, XalanSize_t theLength); - - void -- writeAsASCII(const char* theString, unsigned int theLengts); -+ writeAsASCII(const char* theString, XalanSize_t theLengts); - - void -- writeAsASCII(const UTF16Ch* theString, unsigned int theLengts); -+ writeAsASCII(const UTF16Ch* theString, XalanSize_t theLengts); - void - writeUTFprefix(); - protected: -@@ -127,7 +129,7 @@ - void - writeData( - const char* theBuffer, -- unsigned int theBufferLength); -+ XalanSize_t theBufferLength); - - void - doFlush(); -@@ -151,6 +153,7 @@ - }; - - --#endif //XALANOUTPUTFILE_1357924680 -+XALAN_CPP_NAMESPACE_END - - -+#endif //XALANOUTPUTFILE_1357924680 -Index: src/xalanc/Utils/MsgCreator/ICUResHandler.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/ICUResHandler.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/ICUResHandler.cpp (working copy) -@@ -28,7 +28,10 @@ - - - -+XALAN_CPP_NAMESPACE_BEGIN - -+ -+ - // ----------------------------------------------------------------------- - // Constructors - // ----------------------------------------------------------------------- -@@ -58,7 +61,7 @@ - // change tham with \", \{ and \} - - void ICUResHandler::characters( const XMLCh* const chars -- , const unsigned int length) -+ , const XalanSize_t length) - { - - if ( m_startCollectingCharacters == true ) -@@ -100,15 +103,15 @@ - - } - --void ICUResHandler::endElement(const XMLCh* const , -- const XMLCh* const localname, -- const XMLCh* const ) -+void ICUResHandler::endElement(const XMLCh* const /* uri */, -+ const XMLCh* const /* localname */, -+ const XMLCh* const qname) - { - if ( m_startCollectingCharacters == false) - return; - - -- if(!XMLString::compareString(localname,s_targetXMLCh)) -+ if(!XMLString::compareString(qname,s_targetXMLCh)) - { - m_startCollectingCharacters = false; - -@@ -122,13 +125,13 @@ - const Attributes& attributes) - { - -- if(!XMLString::compareString(localname,s_transUnitXMLCh)) -+ if(!XMLString::compareString(qname,s_transUnitXMLCh)) - { - // this is an elemente, SAX2Handler class is responsible to handle: - // creating Index file, commom for all localization styles - SAX2Handler::startElement(uri, localname, qname, attributes); - } -- else if(!XMLString::compareString(localname,s_targetXMLCh)) -+ else if(!XMLString::compareString(qname,s_targetXMLCh)) - { - if ( m_locale != 0 ) - { -@@ -196,4 +199,4 @@ - } - - -- -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/NLSHandler.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/NLSHandler.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/NLSHandler.cpp (working copy) -@@ -22,6 +22,11 @@ - - #include <cstdio> - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - // ----------------------------------------------------------------------- - // Constructors - // ----------------------------------------------------------------------- -@@ -48,7 +53,7 @@ - } - - void NLSHandler::characters( const XMLCh* const chars -- , const unsigned int length) -+ , const XalanSize_t length) - { - - if ( m_startCollectingCharacters == true ) -@@ -128,3 +133,7 @@ - m_fStream.writeAsASCII("^\n",2); - } - } -+ -+ -+ -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/ICUResHandler.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/ICUResHandler.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/ICUResHandler.hpp (working copy) -@@ -20,8 +20,15 @@ - #include "SAX2Handler.hpp" - - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - XERCES_CPP_NAMESPACE_USE - -+ -+ - class ICUResHandler : public SAX2Handler - { - public: -@@ -52,7 +59,7 @@ - - virtual void - characters( const XMLCh* const chars -- , const unsigned int length); -+ , const XMLSize_t length); - - protected: - virtual void -@@ -84,5 +91,8 @@ - operator==(const ICUResHandler&) const; - }; - --#endif // ICURESHANDLER_MSGCREATOR_1357924680 - -+XALAN_CPP_NAMESPACE_END -+ -+ -+#endif // ICURESHANDLER_MSGCREATOR_1357924680 -Index: src/xalanc/XalanDOM/XalanDOMString.hpp -=================================================================== ---- src/xalanc/XalanDOM/XalanDOMString.hpp (revision 706129) -+++ src/xalanc/XalanDOM/XalanDOMString.hpp (working copy) -@@ -50,7 +50,7 @@ - typedef XalanDOMChar& reference; - typedef const XalanDOMChar& const_reference; - -- typedef unsigned int size_type; -+ typedef XalanSize_t size_type; - - typedef XalanDOMCharVectorType::iterator iterator; - typedef XalanDOMCharVectorType::const_iterator const_iterator; -@@ -60,7 +60,7 @@ - #if defined(XALAN_INLINE_INITIALIZATION) - static const size_type npos = ~0u; - #else -- enum { npos = -1 }; -+ enum { npos = ~0u }; - #endif - - XalanDOMString(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR ); -Index: src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp -=================================================================== ---- src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp (revision 706129) -+++ src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp (working copy) -@@ -96,6 +96,9 @@ - virtual void - deallocate(void* pointer); - -+ virtual MemoryManager* -+ getExceptionMemoryManager(); -+ - bool - getAssertErrors() const - { -Index: src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp -=================================================================== ---- src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp (revision 706129) -+++ src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp (working copy) -@@ -157,6 +157,14 @@ - - - -+MemoryManager* -+XalanDiagnosticMemoryManager::getExceptionMemoryManager() -+{ -+ return &m_memoryManager; -+} -+ -+ -+ - void - XalanDiagnosticMemoryManager::dumpStatistics( - StreamType* theStream, -Index: src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp -=================================================================== ---- src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp (revision 706129) -+++ src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp (working copy) -@@ -74,7 +74,8 @@ - public: - - typedef XalanVector<XalanSourceTreeElement*> ElementStackType; -- typedef XalanVector<XalanNode*> LastChildStackType; -+ typedef XalanVector<XalanNode*> LastChildStackType; -+ typedef XalanSize_t size_type; - - enum { eDefaultStackSize = 50, eDefaultTextBufferSize = 100 }; - -@@ -94,7 +95,7 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - endDocument(); -@@ -108,7 +109,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -165,7 +166,7 @@ - virtual void - comment( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - endCDATA(); -@@ -225,8 +226,8 @@ - - void - doCharacters( -- const XMLCh* chars, -- XalanDOMString::size_type length); -+ const XMLCh* chars, -+ size_type length); - - // Data members... - -Index: src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp -=================================================================== ---- src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp (revision 706129) -+++ src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp (working copy) -@@ -259,7 +259,7 @@ - void - FormatterToSourceTree::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if (m_documentFragment != 0) - { -@@ -283,7 +283,7 @@ - void - FormatterToSourceTree::charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_document != 0); - -@@ -306,7 +306,7 @@ - void - FormatterToSourceTree::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_document != 0); - -@@ -381,7 +381,7 @@ - void - FormatterToSourceTree::cdata( - const XMLCh* const /* ch */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -402,8 +402,8 @@ - - void - FormatterToSourceTree::doCharacters( -- const XMLCh* chars, -- XalanDOMString::size_type length) -+ const XMLCh* chars, -+ size_type length) - { - if (m_currentElement != 0) - { -Index: src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp -=================================================================== ---- src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp (revision 706129) -+++ src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp (working copy) -@@ -141,7 +141,7 @@ - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - comment(const XMLCh* const data); -@@ -149,7 +149,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -174,12 +174,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -203,8 +203,8 @@ - - void - doCharacters( -- const XalanDOMChar* chars, -- XalanDOMString::size_type length); -+ const XalanDOMChar* chars, -+ size_type length); - - void - doProcessingInstruction( -Index: src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp -=================================================================== ---- src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp (revision 706129) -+++ src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp (working copy) -@@ -65,7 +65,7 @@ - void - XalanSourceTreeContentHandler::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_inDTD == false); - -@@ -194,7 +194,7 @@ - void - XalanSourceTreeContentHandler::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_inDTD == false); - -@@ -370,7 +370,7 @@ - void - XalanSourceTreeContentHandler::comment( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_document != 0); - -@@ -499,8 +499,8 @@ - - void - XalanSourceTreeContentHandler::doCharacters( -- const XMLCh* chars, -- XalanDOMString::size_type length) -+ const XMLCh* chars, -+ size_type length) - { - assert(m_inDTD == false); - -Index: src/xalanc/DOMSupport/DOMSupportDefault.cpp -=================================================================== ---- src/xalanc/DOMSupport/DOMSupportDefault.cpp (revision 706129) -+++ src/xalanc/DOMSupport/DOMSupportDefault.cpp (working copy) -@@ -90,18 +90,14 @@ - - if (theNode != 0 && theNode->getNodeType() == XalanNode::ENTITY_NODE) - { -- const XalanEntity* theEntity = -+ const XalanEntity* const theEntity = - #if defined(XALAN_OLD_STYLE_CASTS) - (const XalanEntity*)theNode; - #else - static_cast<const XalanEntity*>(theNode); - #endif - -- const XalanDOMString theNotationName( -- theEntity->getNotationName(), -- theMemoryManager); -- -- if(isEmpty(theNotationName) == false) // then it's unparsed -+ if(length(theEntity->getNotationName()) != 0) // then it's unparsed - { - // The draft says: "The XSLT processor may use the public - // identifier to generate a URI for the entity instead of the URI -@@ -114,7 +110,7 @@ - // So I'm falling a bit short here. - theURI = theEntity->getSystemId(); - -- if(isEmpty(theURI) == true) -+ if(theURI.length() == 0) - { - theURI = theEntity->getPublicId(); - } -Index: src/xalanc/DOMSupport/DOMServices.hpp -=================================================================== ---- src/xalanc/DOMSupport/DOMServices.hpp (revision 706129) -+++ src/xalanc/DOMSupport/DOMServices.hpp (working copy) -@@ -203,7 +203,7 @@ - append(data, text.getData()); - } - -- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int); -+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type); - - /** - * Sends the data for a node to a FormatterListener -Index: Tests/Conf/conf.cpp -=================================================================== ---- Tests/Conf/conf.cpp (revision 706129) -+++ Tests/Conf/conf.cpp (working copy) -@@ -207,7 +207,12 @@ - - XercesDOMParser theParser(0, &mgr); - -+#if XERCES_VERSION_MAJOR < 3 - theParser.setDoValidation(true); -+#else -+ theParser.setValidationScheme(XercesDOMParser::Val_Auto); -+#endif -+ - theParser.setDoNamespaces(true); - - theParser.parse(xmlInput); -@@ -308,7 +313,9 @@ - // - const XalanDOMString& currentDir = dirs[j]; - -- if (length(h.args.sub) == 0 || equals(currentDir, h.args.sub) == true) -+ if ((length(h.args.sub) == 0 || -+ equals(currentDir, h.args.sub) == true) && -+ currentDir[0] != XalanUnicode::charFullStop) - { - // Check that output directory is there. - // -Index: samples/SimpleTransform/XalanMemoryManagerImpl.hpp -=================================================================== ---- samples/SimpleTransform/XalanMemoryManagerImpl.hpp (revision 706129) -+++ samples/SimpleTransform/XalanMemoryManagerImpl.hpp (working copy) -@@ -96,7 +96,13 @@ - - } - -- virtual -+ MemoryManager* -+ getExceptionMemoryManager() -+ { -+ return this; -+ } -+ -+ virtual - ~XalanMemoryManagerImpl() - { - if( 0 == HeapDestroy(m_heapHandle) ) diff --git a/xalan-c.spec b/xalan-c.spec index 13398a3..b937b0c 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -1,85 +1,124 @@ Name: xalan-c Version: 1.11.0 -Release: 19%{?dist} -Summary: Xalan XSLT processor for C +Release: 20%{?dist} +Summary: Xalan XSLT processor for C/C++ License: ASL 2.0 -URL: http://xml.apache.org/xalan-c/ -Source0: http://www.us.apache.org/dist/xalan/xalan-c/sources/xalan_c-1.11-src.tar.gz +URL: https://xalan.apache.org/%{name}/ +%global tag Xalan-C_%(echo '%{version}' | tr . _) +%global tar_name %{tag} +%global release_url https://github.com/apache/%{name}/archive/ +Source0: %{release_url}/%{tar_name}.tar.gz Patch0: xalan-c-1.10.0-escaping.patch +BuildRequires: make +BuildRequires: gnulib-devel +BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: xerces-c-devel +%global so_version %(echo %{version} | cut -d . -f -2 | tr -d .) + %description -Xalan is an XSLT processor for transforming XML documents into HTML, text, or -other XML document types. +The Apache Xalan-C++ Project provides a library and a command line program to +transform XML documents using a stylesheet that conforms to XSLT 1.0 standards. + +Xalan is a project of the Apache Software Foundation. %package devel -Summary: Header files, libraries and development documentation for %{name} -Requires: %{name} = %{version}-%{release} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -This package contains the header files, static libraries and development -documentation for %{name}. If you like to develop programs using %{name}, -you will need to install %{name}-devel. +The %{name}-devel package contains libraries and header files for developing +applications that use %{name}. %package doc -Summary: Documentation for Xalan XSLT processor for C +Summary: Documentation for %{name} +BuildRequires: doxygen +# Explicit BR required for EPEL8: +BuildRequires: graphviz %description doc Documentation for %{name}. %prep -%setup -q -n xalan-c-1.11/c -%patch0 -p2 -b .escaping -find -type d -name CVS -print0 | xargs -0 rm -rf -chmod 644 NOTICE +%autosetup -n %{name}-%{tar_name} -p2 + +# https://github.com/apache/xalan-c/pull/35 +chmod a-x NOTICE -# Update config.guess for new architectures -cp /usr/lib/rpm/config.guess config.guess +# Update config.guess/config.sub for new architectures (aarch64) +cp -vp \ + %{_datadir}/gnulib/build-aux/config.guess \ + %{_datadir}/gnulib/build-aux/config.sub \ + ./ %build export XALANCROOT="${PWD}" export XERCESROOT=%{_includedir}/xercesc/ COMMONARGS="-plinux -cgcc -xg++ -minmem" -%ifarch alpha %{power64} s390x sparc64 x86_64 aarch64 -./runConfigure ${COMMONARGS} -b64 -P %{_prefix} -C --libdir="%{_libdir}" -z '%{optflags}' -%else -./runConfigure ${COMMONARGS} -b32 -P %{_prefix} -C --libdir="%{_libdir}" -z '%{optflags}' -%endif -# _smp_mflags do not work -make +./runConfigure ${COMMONARGS} -b%{__isa_bits} -P %{_prefix} -C --libdir="%{_libdir}" -z '%{optflags}' +# Parallel build does not work +%global _smp_mflags %{nil} +%make_build all tests +pushd xdocs +./make-apiDocs.sh +popd +mv -v build/docs/xalan-c build/docs/html %install export XALANCROOT="${PWD}" export XERCESROOT=%{_includedir}/xercesc/ -make install DESTDIR=%{buildroot} +%make_install +# Required for EPEL: %ldconfig_scriptlets +%check +LD_LIBRARY_PATH=$PWD/lib; export LD_LIBRARY_PATH +./bin/testXPath +# ./bin/ThreadTest crashes; how inauspicious! + + %files -%doc LICENSE KEYS NOTICE +%license LICENSE %{_bindir}/Xalan -%{_libdir}/libxalan*.so.* +%{_libdir}/libxalanMsg.so.%{so_version} +%{_libdir}/libxalanMsg.so.%{so_version}.* +%{_libdir}/libxalan-c.so.%{so_version} +%{_libdir}/libxalan-c.so.%{so_version}.* %files devel -%{_libdir}/libxalan*.so +%{_libdir}/libxalanMsg.so +%{_libdir}/libxalan-c.so %{_includedir}/xalanc/ %files doc -%doc readme.html xdocs samples +%license LICENSE +%doc KEYS +%doc NOTICE +%doc README +%doc readme.html +%doc samples +%doc build/docs/html %changelog +* Wed Dec 9 2020 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.11.0-20 +- Build API documentation with Doxygen +- Update summaries and descriptions from upstream +- Enable at least the XPath tests +- Drop unused old tarball and patches from source RPM + * Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.11.0-19 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild commit 487394949e66ad81b2d3e15d7b0a9735d8372553 Author: Benjamin Beasley <code(a)musicinmybrain.net> Date: Wed Dec 9 12:15:59 2020 -0500 add rpmlintrc diff --git a/xalan-c.rpmlintrc b/xalan-c.rpmlintrc new file mode 100644 index 0000000..b0edde4 --- /dev/null +++ b/xalan-c.rpmlintrc @@ -0,0 +1,2 @@ +# These are not real spelling errors... +addFilter(r'spelling-error .* en_US (stylesheet) ') commit 181c5825b25f104777e4ad127d45a1feeaed98d7 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Sat Aug 1 09:40:44 2020 +0000 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/xalan-c.spec b/xalan-c.spec index e5fd89e..13398a3 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -1,6 +1,6 @@ Name: xalan-c Version: 1.11.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Xalan XSLT processor for C License: ASL 2.0 @@ -80,6 +80,10 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.11.0-19 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.11.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild commit b2e17dbd8319e1033a53fd91d7ea2417fd83273a Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Wed Jul 29 14:25:41 2020 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/xalan-c.spec b/xalan-c.spec index 958368d..e5fd89e 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -1,6 +1,6 @@ Name: xalan-c Version: 1.11.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Xalan XSLT processor for C License: ASL 2.0 @@ -80,6 +80,9 @@ make install DESTDIR=%{buildroot} %changelog +* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.11.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.11.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

3 years, 4 months

1
0
0 / 0

Architecture specific change in rpms/geos.git

by githook-noreply＠fedoraproject.org

The package rpms/geos.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/geos.git/commit/?id=f2c3d2f7fa076.... Change: -%ifarch armv7hl aarch64 s390x ppc64le Thanks. Full change: ============ commit f2c3d2f7fa076b2512254ff8bb19391e56e97b8b Author: Sandro Mani <manisandro(a)gmail.com> Date: Thu Dec 10 13:38:33 2020 +0100 Update to 3.9.0 diff --git a/.gitignore b/.gitignore index 2512c0d..dfeec89 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /geos-3.8.0.tar.bz2 /check_doxygen_errors.cmake /geos-3.8.1.tar.bz2 +/geos-3.9.0.tar.bz2 diff --git a/geos.spec b/geos.spec index fa757be..fb24251 100644 --- a/geos.spec +++ b/geos.spec @@ -1,6 +1,6 @@ Name: geos -Version: 3.8.1 -Release: 3%{?dist} +Version: 3.9.0 +Release: 1%{?dist} Summary: GEOS is a C++ port of the Java Topology Suite License: LGPLv2 @@ -11,13 +11,6 @@ Source1: http://git.osgeo.org/gitea/geos/geos/raw/tag/%{version}/doc/check # Honour libsuffix Patch1: geos_libsuffix.patch -# Install libgeos.so symlink (some packages still use the C++ API) -Patch2: geos_libgeos.patch -# remove ttmath in favour of DD -# backported from upstream: https://git.osgeo.org/gitea/geos/geos/commit/bed36f15 -# simplified to drop the rm diffs for easier rebasing -# fixes https://bugzilla.redhat.com/show_bug.cgi?id=1841335 -Patch3: geos_remove_ttmath.patch BuildRequires: cmake BuildRequires: doxygen @@ -53,16 +46,13 @@ use GEOS. %autosetup -p1 cp -a %{SOURCE1} doc/check_doxygen_errors.cmake -# Goes together with Patch3: -rm -r include/geos/algorithm/ttmath - %build %cmake \ -%ifarch armv7hl aarch64 s390x - -DDISABLE_GEOS_INLINE=ON \ +%ifarch armv7hl + -DDISABLE_GEOS_INLINE=ON \ %endif - -DBUILD_DOCUMENTATION=ON + -DBUILD_DOCUMENTATION=ON %cmake_build @@ -72,11 +62,7 @@ make docs -C %{__cmake_builddir} %check -%ifarch armv7hl aarch64 s390x ppc64le -%ctest || : -%else %ctest -%endif %ldconfig_scriptlets @@ -85,7 +71,7 @@ make docs -C %{__cmake_builddir} %files %doc AUTHORS NEWS README.md %license COPYING -%{_libdir}/libgeos.so.%{version} +%{_libdir}/libgeos.so.3.9.0 %{_libdir}/libgeos_c.so.1* %files devel @@ -96,9 +82,13 @@ make docs -C %{__cmake_builddir} %{_libdir}/libgeos_c.so %{_libdir}/libgeos.so %{_libdir}/cmake/GEOS/ +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Dec 10 2020 Sandro Mani <manisandro(a)gmail.com> - 3.9.0-1 +- Update to 3.9.0 + * Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/geos_libgeos.patch b/geos_libgeos.patch deleted file mode 100644 index e85cf61..0000000 --- a/geos_libgeos.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN --no-dereference geos-3.8.1/CMakeLists.txt geos-3.8.1-new/CMakeLists.txt ---- geos-3.8.1/CMakeLists.txt 2020-03-11 14:56:49.830174310 +0100 -+++ geos-3.8.1-new/CMakeLists.txt 2020-03-11 14:56:49.832174317 +0100 -@@ -281,7 +281,7 @@ configure_file(cmake/geos-config.cmake - - install(TARGETS geos geos_cxx_flags - EXPORT geos-targets -- LIBRARY DESTINATION lib${LIB_SUFFIX} NAMELINK_SKIP -+ LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - RUNTIME DESTINATION bin - INCLUDES DESTINATION include diff --git a/geos_libsuffix.patch b/geos_libsuffix.patch index b9206cc..604e5fc 100644 --- a/geos_libsuffix.patch +++ b/geos_libsuffix.patch @@ -1,13 +1,13 @@ -diff -rupN --no-dereference geos-3.8.1/CMakeLists.txt geos-3.8.1-new/CMakeLists.txt ---- geos-3.8.1/CMakeLists.txt 2020-01-05 17:44:53.000000000 +0100 -+++ geos-3.8.1-new/CMakeLists.txt 2020-03-11 14:56:49.760174088 +0100 -@@ -281,16 +281,16 @@ configure_file(cmake/geos-config.cmake +diff -rupN --no-dereference geos-3.9.0/CMakeLists.txt geos-3.9.0-new/CMakeLists.txt +--- geos-3.9.0/CMakeLists.txt 2020-12-09 01:07:19.000000000 +0100 ++++ geos-3.9.0-new/CMakeLists.txt 2020-12-10 12:23:21.466732306 +0100 +@@ -300,16 +300,16 @@ configure_file(cmake/geos-config.cmake install(TARGETS geos geos_cxx_flags EXPORT geos-targets -- LIBRARY DESTINATION lib NAMELINK_SKIP +- LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib${LIB_SUFFIX} NAMELINK_SKIP ++ LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX} RUNTIME DESTINATION bin INCLUDES DESTINATION include @@ -22,7 +22,7 @@ diff -rupN --no-dereference geos-3.8.1/CMakeLists.txt geos-3.8.1-new/CMakeLists. RUNTIME DESTINATION bin INCLUDES DESTINATION include ) -@@ -298,12 +298,12 @@ install(TARGETS geos_c +@@ -317,12 +317,12 @@ install(TARGETS geos_c install(EXPORT geos-targets FILE geos-targets.cmake NAMESPACE GEOS:: @@ -37,44 +37,27 @@ diff -rupN --no-dereference geos-3.8.1/CMakeLists.txt geos-3.8.1-new/CMakeLists. install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/geos" "${CMAKE_CURRENT_BINARY_DIR}/include/geos" -diff -rupN --no-dereference geos-3.8.1/tools/geos-config.cmake geos-3.8.1-new/tools/geos-config.cmake ---- geos-3.8.1/tools/geos-config.cmake 2019-10-29 23:44:33.000000000 +0100 -+++ geos-3.8.1-new/tools/geos-config.cmake 2020-03-11 14:56:49.760174088 +0100 -@@ -2,7 +2,7 @@ +diff -rupN --no-dereference geos-3.9.0/tools/CMakeLists.txt geos-3.9.0-new/tools/CMakeLists.txt +--- geos-3.9.0/tools/CMakeLists.txt 2020-11-30 20:08:53.000000000 +0100 ++++ geos-3.9.0-new/tools/CMakeLists.txt 2020-12-10 12:23:21.466732306 +0100 +@@ -36,7 +36,7 @@ if(NOT MSVC) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/geos.pc +- DESTINATION lib/pkgconfig) ++ DESTINATION lib${LIB_SUFFIX}/pkgconfig) + + endif() + +diff -rupN --no-dereference geos-3.9.0/tools/geos-config.cmake geos-3.9.0-new/tools/geos-config.cmake +--- geos-3.9.0/tools/geos-config.cmake 2020-11-30 20:08:53.000000000 +0100 ++++ geos-3.9.0-new/tools/geos-config.cmake 2020-12-10 12:23:21.466732306 +0100 +@@ -1,7 +1,7 @@ + #!/bin/sh - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@/bin --libdir=@CMAKE_INSTALL_PREFIX@/lib -+libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@@LIB_SUFFIX@ + prefix=@ESCAPED_INSTALL_PREFIX@ +-libdir=${prefix}/lib ++libdir=${prefix}/lib@LIB_SUFFIX usage() { -@@ -44,22 +44,22 @@ case $1 in - echo -I@CMAKE_INSTALL_PREFIX@/include - ;; - --libs) -- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos-@GEOS_VERSION_MAJOR@ -+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos-@GEOS_VERSION_MAJOR@ - ;; - --clibs) -- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos_c -+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos_c - ;; - --cclibs) -- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos -+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos - ;; - --static-clibs) -- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos_c -lgeos -lm -+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos_c -lgeos -lm - ;; - --static-cclibs) -- echo -L@CMAKE_INSTALL_PREFIX@/lib -lgeos -lm -+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ -lgeos -lm - ;; - --ldflags) -- echo -L@CMAKE_INSTALL_PREFIX@/lib -+ echo -L@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ - ;; - --includes) - echo @CMAKE_INSTALL_PREFIX@/include diff --git a/geos_remove_ttmath.patch b/geos_remove_ttmath.patch deleted file mode 100644 index d52dfbb..0000000 --- a/geos_remove_ttmath.patch +++ /dev/null @@ -1,1414 +0,0 @@ -From 1111070c0a68d0a15d1488415392658a75662be4 Mon Sep 17 00:00:00 2001 -From: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Thu, 16 Apr 2020 15:31:11 -0700 -Subject: [PATCH] Squashed commit of the following: - -commit ab1b004af900354f907f9a5d31ec514c2547ada4 -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Thu Apr 16 14:40:23 2020 -0700 - - remove ttmath in favour of DD - -commit 472c1f9a12df1a4b9628f61c93594ee162382db4 -Merge: 8ccf3bf8 312c085b -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Thu Apr 16 13:24:39 2020 -0700 - - Merge branch 'master' of https://git.osgeo.org/gitea/geos/geos into master-dd - -commit 8ccf3bf874a2887b40afbaca57ee67b59b5eb40b -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Thu Apr 16 13:10:25 2020 -0700 - - add informational comment - -commit 8fd12e02f060f8e35d36a162d81d1ef94da1b784 -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Thu Apr 16 12:15:00 2020 -0700 - - add in all JTS unit tests for doubledouble calculations - -commit e24af3ba8ce7eca76840164c2edd5e066bbebe28 -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Wed Apr 15 13:47:56 2020 -0700 - - autotools build - -commit cb5942a13c5113ae42108e0422fed9a34a465abf -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Wed Apr 15 13:31:28 2020 -0700 - - fix doxygen complaint? - -commit 469037a4ca75b0f4df3638256c0fff2b61d37796 -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Wed Apr 15 12:47:14 2020 -0700 - - change name of ifdef guard - -commit 00559ec59b56a0ec6a0481b54f0ab597324d9439 -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Wed Apr 15 12:40:50 2020 -0700 - - allow DD to swap in for ttmath - -commit 75e70f7f28e751f26cc3db5b4964a86f3bae518f -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Wed Apr 15 11:28:15 2020 -0700 - - clean build of all DD functionality from JTS - -commit e42e9bc0ea3fd35bddc892fbe51b3de5677d8e57 -Author: Paul Ramsey <pramsey(a)cleverelephant.ca> -Date: Tue Apr 14 17:27:45 2020 -0700 - - DD wip ---- - .codecov.yml | 1 - - Makefile.am | 1 - - configure.ac | 3 +- - doc/Doxyfile.in | 1 - - include/geos/Makefile.am | 1 + - include/geos/algorithm/CGAlgorithmsDD.h | 16 +- - include/geos/algorithm/Makefile.am | 3 +- - include/geos/algorithm/RayCrossingCounterDD.h | 1 - - include/geos/algorithm/ttmath/COPYRIGHT | 28 - - include/geos/algorithm/ttmath/Makefile.am | 24 - - include/geos/algorithm/ttmath/README | 23 - - include/geos/algorithm/ttmath/ttmath.h | 2880 -------- - include/geos/algorithm/ttmath/ttmathbig.h | 6093 ----------------- - include/geos/algorithm/ttmath/ttmathdec.h | 419 -- - include/geos/algorithm/ttmath/ttmathint.h | 1923 ------ - include/geos/algorithm/ttmath/ttmathmisc.h | 250 - - include/geos/algorithm/ttmath/ttmathobjects.h | 812 --- - include/geos/algorithm/ttmath/ttmathparser.h | 2777 -------- - include/geos/algorithm/ttmath/ttmaththreads.h | 252 - - include/geos/algorithm/ttmath/ttmathtypes.h | 718 -- - include/geos/algorithm/ttmath/ttmathuint.h | 4189 ------------ - .../geos/algorithm/ttmath/ttmathuint_noasm.h | 1038 --- - .../geos/algorithm/ttmath/ttmathuint_x86.h | 1620 ----- - .../geos/algorithm/ttmath/ttmathuint_x86_64.h | 1177 ---- - .../ttmath/ttmathuint_x86_64_msvc.asm | 551 -- - include/geos/math/DD.h | 204 + - include/geos/math/Makefile.am | 11 + - src/Makefile.am | 2 + - src/algorithm/CGAlgorithmsDD.cpp | 7 +- - src/algorithm/InteriorPointArea.cpp | 1 - - src/geom/LineString.cpp | 2 +- - src/math/DD.cpp | 403 ++ - src/math/Makefile.am | 13 + - tests/unit/Makefile.am | 1 + - tests/unit/math/DDTest.cpp | 414 ++ - 35 files changed, 1059 insertions(+), 24800 deletions(-) - delete mode 100644 include/geos/algorithm/ttmath/COPYRIGHT - delete mode 100644 include/geos/algorithm/ttmath/Makefile.am - delete mode 100644 include/geos/algorithm/ttmath/README - delete mode 100644 include/geos/algorithm/ttmath/ttmath.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathbig.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathdec.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathint.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathmisc.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathobjects.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathparser.h - delete mode 100644 include/geos/algorithm/ttmath/ttmaththreads.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathtypes.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathuint.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathuint_noasm.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathuint_x86.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathuint_x86_64.h - delete mode 100644 include/geos/algorithm/ttmath/ttmathuint_x86_64_msvc.asm - create mode 100644 include/geos/math/DD.h - create mode 100644 include/geos/math/Makefile.am - create mode 100644 src/math/DD.cpp - create mode 100644 src/math/Makefile.am - create mode 100644 tests/unit/math/DDTest.cpp - -diff --git a/Makefile.am b/Makefile.am -index dbc74514..f064d45d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -73,5 +73,4 @@ valgrindcheck: - check-local: - ! find $(srcdir) -name '*.cpp' -o -name '*.h' | \ - grep -v tests/xmltester/tinyxml | \ -- grep -v include/geos/algorithm/ttmath | \ - xargs grep -n '[[:space:]]$$' -diff --git a/configure.ac b/configure.ac -index 86778874..80d72e36 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -421,7 +421,6 @@ AC_OUTPUT([ - include/geos/algorithm/Makefile - include/geos/algorithm/locate/Makefile - include/geos/algorithm/distance/Makefile -- include/geos/algorithm/ttmath/Makefile - include/geos/geom/Makefile - include/geos/geom/prep/Makefile - include/geos/geom/util/Makefile -@@ -436,6 +435,7 @@ AC_OUTPUT([ - include/geos/index/sweepline/Makefile - include/geos/io/Makefile - include/geos/linearref/Makefile -+ include/geos/math/Makefile - include/geos/noding/Makefile - include/geos/noding/snapround/Makefile - include/geos/operation/Makefile -@@ -468,6 +468,7 @@ AC_OUTPUT([ - src/index/sweepline/Makefile - src/io/Makefile - src/linearref/Makefile -+ src/math/Makefile - src/noding/Makefile - src/noding/snapround/Makefile - src/operation/Makefile -diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in -index c8415081..03d9e5f7 100644 ---- a/doc/Doxyfile.in -+++ b/doc/Doxyfile.in -@@ -853,7 +853,6 @@ EXCLUDE_PATTERNS = */examples/* \ - */test/* \ - */bigtest/* \ - */io/markup/* \ -- */ttmath/* \ - config.h \ - acconfig.h \ - CoordinateList.cpp \ -diff --git a/include/geos/Makefile.am b/include/geos/Makefile.am -index cc55c4ac..04e85f8f 100644 ---- a/include/geos/Makefile.am -+++ b/include/geos/Makefile.am -@@ -8,6 +8,7 @@ SUBDIRS = \ - index \ - io \ - linearref \ -+ math \ - noding \ - operation \ - planargraph \ -diff --git a/include/geos/algorithm/CGAlgorithmsDD.h b/include/geos/algorithm/CGAlgorithmsDD.h -index f596466c..583532c1 100644 ---- a/include/geos/algorithm/CGAlgorithmsDD.h -+++ b/include/geos/algorithm/CGAlgorithmsDD.h -@@ -19,17 +19,7 @@ - #ifndef GEOS_ALGORITHM_CGALGORITHMDD_H - #define GEOS_ALGORITHM_CGALGORITHMDD_H - #include <geos/export.h> --#include <geos/algorithm/ttmath/ttmath.h> -- --/// \file CGAlgorithmsDD.h -- --/// \brief Close to DoubleDouble equivalent used by JTS --/// --/// Usage: `ttmath::Big<exponent, mantissa>` --typedef ttmath::Big<TTMATH_BITS(32), TTMATH_BITS(128)> DD; --//typedef ttmath::Big<TTMATH_BITS(64), TTMATH_BITS(128)> DD; --//typedef ttmath::Big<TTMATH_BITS(32), TTMATH_BITS(256)> DD; --//typedef ttmath::Big<TTMATH_BITS(64), TTMATH_BITS(256)> DD; -+#include <geos/math/DD.h> - - // Forward declarations - namespace geos { -@@ -39,6 +29,8 @@ class CoordinateSequence; - } - } - -+using namespace geos::math; -+ - namespace geos { - namespace algorithm { // geos::algorithm - -@@ -139,7 +131,7 @@ public: - * The circumcentre does not necessarily lie within the triangle. For example, - * the circumcentre of an obtuse isosceles triangle lies outside the triangle. - * -- * This method uses @ref DD extended-precision arithmetic to provide more accurate -+ * This method uses @ref geos::math::DD extended-precision arithmetic to provide more accurate - * results than [circumcentre(Coordinate, Coordinate, Coordinate)] - * (@ref geos::geom::Triangle::circumcentre(const Coordinate& p0, const Coordinate& p1, const Coordinate& p2)). - * -diff --git a/include/geos/algorithm/Makefile.am b/include/geos/algorithm/Makefile.am -index 717e63d8..dbd5a619 100644 ---- a/include/geos/algorithm/Makefile.am -+++ b/include/geos/algorithm/Makefile.am -@@ -3,8 +3,7 @@ - # - SUBDIRS = \ - locate \ -- distance \ -- ttmath -+ distance - - EXTRA_DIST = - -diff --git a/include/geos/algorithm/RayCrossingCounterDD.h b/include/geos/algorithm/RayCrossingCounterDD.h -index 2328ab3e..d7ba41e3 100644 ---- a/include/geos/algorithm/RayCrossingCounterDD.h -+++ b/include/geos/algorithm/RayCrossingCounterDD.h -@@ -22,7 +22,6 @@ - - #include <geos/export.h> - #include <geos/geom/Location.h> --#include <geos/algorithm/ttmath/ttmath.h> - - #include <vector> - -diff --git a/include/geos/math/DD.h b/include/geos/math/DD.h -new file mode 100644 -index 00000000..7bcbb183 ---- /dev/null -+++ b/include/geos/math/DD.h -@@ -0,0 +1,204 @@ -+/********************************************************************** -+ * -+ * GEOS - Geometry Engine Open Source -+ * http://geos.osgeo.org -+ * -+ * Copyright (C) 2020 Crunchy Data -+ * -+ * This is free software; you can redistribute and/or modify it under -+ * the terms of the GNU Lesser General Public Licence as published -+ * by the Free Software Foundation. -+ * See the COPYING file for more information. -+ * -+ **********************************************************************/ -+ -+/** -+ * Implements extended-precision floating-point numbers -+ * which maintain 106 bits (approximately 30 decimal digits) of precision. -+ * -+ * A DoubleDouble uses a representation containing two double-precision values. -+ * A number x is represented as a pair of doubles, x.hi and x.lo, -+ * such that the number represented by x is x.hi + x.lo, where -+ * <pre> -+ * |x.lo| <= 0.5*ulp(x.hi) -+ * </pre> -+ * and ulp(y) means "unit in the last place of y". -+ * The basic arithmetic operations are implemented using -+ * convenient properties of IEEE-754 floating-point arithmetic. -+ * -+ * The range of values which can be represented is the same as in IEEE-754. -+ * The precision of the representable numbers -+ * is twice as great as IEEE-754 double precision. -+ * -+ * The correctness of the arithmetic algorithms relies on operations -+ * being performed with standard IEEE-754 double precision and rounding. -+ * This is the Java standard arithmetic model, but for performance reasons -+ * Java implementations are not -+ * constrained to using this standard by default. -+ * Some processors (notably the Intel Pentium architecture) perform -+ * floating point operations in (non-IEEE-754-standard) extended-precision. -+ * A JVM implementation may choose to use the non-standard extended-precision -+ * as its default arithmetic mode. -+ * To prevent this from happening, this code uses the -+ * Java <tt>strictfp</tt> modifier, -+ * which forces all operations to take place in the standard IEEE-754 rounding model. -+ * -+ * The API provides both a set of value-oriented operations -+ * and a set of mutating operations. -+ * Value-oriented operations treat DoubleDouble values as -+ * immutable; operations on them return new objects carrying the result -+ * of the operation. This provides a simple and safe semantics for -+ * writing DoubleDouble expressions. However, there is a performance -+ * penalty for the object allocations required. -+ * The mutable interface updates object values in-place. -+ * It provides optimum memory performance, but requires -+ * care to ensure that aliasing errors are not created -+ * and constant values are not changed. -+ * -+ * For example, the following code example constructs three DD instances: -+ * two to hold the input values and one to hold the result of the addition. -+ * <pre> -+ * DD a = new DD(2.0); -+ * DD b = new DD(3.0); -+ * DD c = a.add(b); -+ * </pre> -+ * In contrast, the following approach uses only one object: -+ * <pre> -+ * DD a = new DD(2.0); -+ * a.selfAdd(3.0); -+ * </pre> -+ * -+ * This implementation uses algorithms originally designed variously by -+ * Knuth, Kahan, Dekker, and Linnainmaa. -+ * Douglas Priest developed the first C implementation of these techniques. -+ * Other more recent C++ implementation are due to Keith M. Briggs and David Bailey et al. -+ * -+ * <h3>References</h3> -+ * <ul> -+ * <li>Priest, D., Algorithms for Arbitrary Precision Floating Point Arithmetic, -+ * in P. Kornerup and D. Matula, Eds., Proc. 10th Symposium on Computer Arithmetic, -+ * IEEE Computer Society Press, Los Alamitos, Calif., 1991. -+ * <li>Yozo Hida, Xiaoye S. Li and David H. Bailey, -+ * Quad-Double Arithmetic: Algorithms, Implementation, and Application, -+ * manuscript, Oct 2000; Lawrence Berkeley National Laboratory Report BNL-46996. -+ * <li>David Bailey, High Precision Software Directory; -+ * <tt>http://crd.lbl.gov/~dhbailey/mpdist/index.html</tt> -+ * </ul> -+ * -+ * -+ * @author Martin Davis -+ * -+ */ -+ -+#ifndef GEOS_MATH_DD_H -+#define GEOS_MATH_DD_H -+ -+#include <cmath> -+ -+namespace geos { -+namespace math { // geos.math -+ -+/** -+ * \class DD -+ * -+ * \brief -+ * Wrapper for DoubleDouble higher precision mathematics -+ * operations. -+ */ -+class GEOS_DLL DD { -+ private: -+ static constexpr double SPLIT = 134217729.0; // 2^27+1, for IEEE double -+ double hi; -+ double lo; -+ -+ int magnitude(double x) const; -+ int signum() const; -+ DD rint() const; -+ -+ -+ public: -+ DD(double p_hi, double p_lo) : hi(p_hi), lo(p_lo) {}; -+ DD(double x) : hi(x), lo(0.0) {}; -+ DD(const DD &dd) : hi(dd.hi), lo(dd.lo) {}; -+ DD() : hi(0.0), lo(0.0) {}; -+ -+ bool operator==(const DD &rhs) const -+ { -+ return hi == rhs.hi && lo == rhs.lo; -+ } -+ -+ bool operator!=(const DD &rhs) const -+ { -+ return hi != rhs.hi || lo != rhs.lo; -+ } -+ -+ bool operator<(const DD &rhs) const -+ { -+ return (hi < rhs.hi) || (hi == rhs.hi && lo < rhs.lo); -+ } -+ -+ bool operator<=(const DD &rhs) const -+ { -+ return (hi < rhs.hi) || (hi == rhs.hi && lo <= rhs.lo); -+ } -+ -+ bool operator>(const DD &rhs) const -+ { -+ return (hi > rhs.hi) || (hi == rhs.hi && lo > rhs.lo); -+ } -+ -+ bool operator>=(const DD &rhs) const -+ { -+ return (hi > rhs.hi) || (hi == rhs.hi && lo >= rhs.lo); -+ } -+ -+ friend DD operator+ (const DD &lhs, const DD &rhs); -+ friend DD operator+ (const DD &lhs, double rhs); -+ friend DD operator- (const DD &lhs, const DD &rhs); -+ friend DD operator- (const DD &lhs, double rhs); -+ friend DD operator* (const DD &lhs, const DD &rhs); -+ friend DD operator* (const DD &lhs, double rhs); -+ friend DD operator/ (const DD &lhs, const DD &rhs); -+ friend DD operator/ (const DD &lhs, double rhs); -+ -+ static DD determinant(const DD &x1, const DD &y1, const DD &x2, const DD &y2); -+ static DD determinant(double x1, double y1, double x2, double y2); -+ static DD abs(const DD &d); -+ static DD pow(const DD &d, int exp); -+ static DD trunc(const DD &d); -+ -+ bool isNaN() const; -+ bool isNegative() const; -+ bool isPositive() const; -+ bool isZero() const; -+ double doubleValue() const; -+ double ToDouble() const { return doubleValue(); } -+ int intValue() const; -+ DD negate() const; -+ DD reciprocal() const; -+ DD floor() const; -+ DD ceil() const; -+ -+ void selfAdd(const DD &d); -+ void selfAdd(double p_hi, double p_lo); -+ void selfAdd(double y); -+ -+ void selfSubtract(const DD &d); -+ void selfSubtract(double p_hi, double p_lo); -+ void selfSubtract(double y); -+ -+ void selfMultiply(double p_hi, double p_lo); -+ void selfMultiply(const DD &d); -+ void selfMultiply(double y); -+ -+ void selfDivide(double p_hi, double p_lo); -+ void selfDivide(const DD &d); -+ void selfDivide(double y); -+}; -+ -+ -+} // namespace geos::math -+} // namespace geos -+ -+ -+#endif // GEOS_MATH_DD_H -diff --git a/include/geos/math/Makefile.am b/include/geos/math/Makefile.am -new file mode 100644 -index 00000000..5396b951 ---- /dev/null -+++ b/include/geos/math/Makefile.am -@@ -0,0 +1,11 @@ -+# -+# This file is part of project GEOS (http://trac.osgeo.org/geos/) -+# -+SUBDIRS = -+ -+EXTRA_DIST = -+ -+geosdir = $(includedir)/geos/math -+ -+geos_HEADERS = \ -+ DD.h -diff --git a/src/Makefile.am b/src/Makefile.am -index 1bba8e87..ea465248 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -7,6 +7,7 @@ SUBDIRS = \ - index \ - io \ - linearref \ -+ math \ - noding \ - operation \ - planargraph \ -@@ -39,6 +40,7 @@ libgeos_la_LIBADD = \ - index/libindex.la \ - io/libio.la \ - linearref/liblinearref.la \ -+ math/libmath.la \ - noding/libnoding.la \ - operation/liboperation.la \ - planargraph/libplanargraph.la \ -diff --git a/src/algorithm/CGAlgorithmsDD.cpp b/src/algorithm/CGAlgorithmsDD.cpp -index c25c1f28..c484c1f6 100644 ---- a/src/algorithm/CGAlgorithmsDD.cpp -+++ b/src/algorithm/CGAlgorithmsDD.cpp -@@ -35,7 +35,7 @@ namespace { - double constexpr DP_SAFE_EPSILON = 1e-15; - - inline int --OrientationDD(DD const& dd) -+OrientationDD(const DD &dd) - { - static DD const zero(0.0); - if(dd < zero) { -@@ -49,10 +49,7 @@ OrientationDD(DD const& dd) - return CGAlgorithmsDD::STRAIGHT; - } - --// inline std::string ToStringDD(DD const& dd) --// { --// return dd.ToString(); --// } -+ - } - - namespace geos { -diff --git a/src/algorithm/InteriorPointArea.cpp b/src/algorithm/InteriorPointArea.cpp -index 1ddddac9..61c36fd0 100644 ---- a/src/algorithm/InteriorPointArea.cpp -+++ b/src/algorithm/InteriorPointArea.cpp -@@ -200,7 +200,6 @@ private: - // edge intersects scan line, so add a crossing - double xInt = intersection(p0, p1, scanY); - crossings.push_back(xInt); -- //checkIntersectionDD(p0, p1, scanY, xInt); - } - - void findBestMidpoint(vector<double>& crossings) -diff --git a/src/geom/LineString.cpp b/src/geom/LineString.cpp -index 65f86a0d..ac5d7fe6 100644 ---- a/src/geom/LineString.cpp -+++ b/src/geom/LineString.cpp -@@ -45,7 +45,7 @@ using namespace geos::algorithm; - namespace geos { - namespace geom { // geos::geom - --LineString::~LineString(){}; -+LineString::~LineString(){} - - /*protected*/ - LineString::LineString(const LineString& ls) -diff --git a/src/math/DD.cpp b/src/math/DD.cpp -new file mode 100644 -index 00000000..673e9217 ---- /dev/null -+++ b/src/math/DD.cpp -@@ -0,0 +1,403 @@ -+/********************************************************************** -+ * -+ * GEOS - Geometry Engine Open Source -+ * http://geos.osgeo.org -+ * -+ * Copyright (C) 2020 Crunchy Data -+ * -+ * This is free software; you can redistribute and/or modify it under -+ * the terms of the GNU Lesser General Public Licence as published -+ * by the Free Software Foundation. -+ * See the COPYING file for more information. -+ * -+ **********************************************************************/ -+ -+#include <cmath> -+ -+#include <geos/profiler.h> -+#include <geos/math/DD.h> -+ -+namespace geos { -+namespace math { // geos.util -+ -+ -+/* private */ -+int -+DD::magnitude(double x) const -+{ -+ double xAbs = std::fabs(x); -+ double xLog10 = std::log(xAbs) / std::log(10); -+ int xMag = (int) std::floor(xLog10); -+ /** -+ * Since log computation is inexact, there may be an off-by-one error -+ * in the computed magnitude. -+ * Following tests that magnitude is correct, and adjusts it if not -+ */ -+ double xApprox = std::pow(10, xMag); -+ if (xApprox * 10 <= xAbs) -+ xMag += 1; -+ -+ return xMag; -+} -+ -+/* public */ -+bool DD::isNaN() const -+{ -+ return std::isnan(hi); -+} -+/* public */ -+bool DD::isNegative() const -+{ -+ return hi < 0.0 || (hi == 0.0 && lo < 0.0); -+} -+/* public */ -+bool DD::isPositive() const -+{ -+ return hi > 0.0 || (hi == 0.0 && lo > 0.0); -+} -+/* public */ -+bool DD::isZero() const -+{ -+ return hi == 0.0 && lo == 0.0; -+} -+ -+/* public */ -+double DD::doubleValue() const -+{ -+ return hi + lo; -+} -+ -+/* public */ -+int DD::intValue() const -+{ -+ return (int) hi; -+} -+ -+/* public */ -+void DD::selfAdd(const DD &y) -+{ -+ return selfAdd(y.hi, y.lo); -+} -+ -+/* public */ -+void DD::selfAdd(double yhi, double ylo) -+{ -+ double H, h, T, t, S, s, e, f; -+ S = hi + yhi; -+ T = lo + ylo; -+ e = S - hi; -+ f = T - lo; -+ s = S-e; -+ t = T-f; -+ s = (yhi-e)+(hi-s); -+ t = (ylo-f)+(lo-t); -+ e = s+T; H = S+e; h = e+(S-H); e = t+h; -+ -+ double zhi = H + e; -+ double zlo = e + (H - zhi); -+ hi = zhi; -+ lo = zlo; -+ return; -+} -+ -+/* public */ -+void DD::selfAdd(double y) -+{ -+ double H, h, S, s, e, f; -+ S = hi + y; -+ e = S - hi; -+ s = S - e; -+ s = (y - e) + (hi - s); -+ f = s + lo; -+ H = S + f; -+ h = f + (S - H); -+ hi = H + h; -+ lo = h + (H - hi); -+ return; -+} -+ -+/* public */ -+DD operator+(const DD &lhs, const DD &rhs) -+{ -+ DD rv(lhs.hi, lhs.lo); -+ rv.selfAdd(rhs); -+ return rv; -+} -+ -+/* public */ -+DD operator+(const DD &lhs, double rhs) -+{ -+ DD rv(lhs.hi, lhs.lo); -+ rv.selfAdd(rhs); -+ return rv; -+} -+ -+/* public */ -+void DD::selfSubtract(const DD &d) -+{ -+ return selfAdd(-1*d.hi, -1*d.lo); -+} -+ -+/* public */ -+void DD::selfSubtract(double p_hi, double p_lo) -+{ -+ return selfAdd(-1*p_hi, -1*p_lo); -+} -+ -+/* public */ -+void DD::selfSubtract(double y) -+{ -+ return selfAdd(-1*y, 0.0); -+} -+ -+/* public */ -+DD operator-(const DD &lhs, const DD &rhs) -+{ -+ DD rv(lhs.hi, lhs.lo); -+ rv.selfSubtract(rhs); -+ return rv; -+} -+ -+/* public */ -+DD operator-(const DD &lhs, double rhs) -+{ -+ DD rv(lhs.hi, lhs.lo); -+ rv.selfSubtract(rhs); -+ return rv; -+} -+ -+/* public */ -+void DD::selfMultiply(double yhi, double ylo) -+{ -+ double hx, tx, hy, ty, C, c; -+ C = SPLIT * hi; hx = C-hi; c = SPLIT * yhi; -+ hx = C-hx; tx = hi-hx; hy = c-yhi; -+ C = hi*yhi; hy = c-hy; ty = yhi-hy; -+ c = ((((hx*hy-C)+hx*ty)+tx*hy)+tx*ty)+(hi*ylo+lo*yhi); -+ double zhi = C+c; hx = C-zhi; -+ double zlo = c+hx; -+ hi = zhi; -+ lo = zlo; -+ return; -+} -+ -+/* public */ -+void DD::selfMultiply(DD const &d) -+{ -+ return selfMultiply(d.hi, d.lo); -+} -+ -+/* public */ -+void DD::selfMultiply(double y) -+{ -+ return selfMultiply(y, 0.0); -+} -+ -+/* public */ -+DD operator*(const DD &lhs, const DD &rhs) -+{ -+ DD rv(lhs.hi, lhs.lo); -+ rv.selfMultiply(rhs); -+ return rv; -+} -+ -+/* public */ -+DD operator*(const DD &lhs, double rhs) -+{ -+ DD rv(lhs.hi, lhs.lo); -+ rv.selfMultiply(rhs); -+ return rv; -+} -+ -+ -+/* public */ -+void DD::selfDivide(double yhi, double ylo) -+{ -+ double hc, tc, hy, ty, C, c, U, u; -+ C = hi/yhi; c = SPLIT*C; hc =c-C; -+ u = SPLIT*yhi; hc = c-hc; -+ tc = C-hc; hy = u-yhi; U = C * yhi; -+ hy = u-hy; ty = yhi-hy; -+ u = (((hc*hy-U)+hc*ty)+tc*hy)+tc*ty; -+ c = ((((hi-U)-u)+lo)-C*ylo)/yhi; -+ u = C+c; -+ hi = u; -+ lo = (C-u)+c; -+ return; -+} -+ -+/* public */ -+void DD::selfDivide(const DD &d) -+{ -+ return selfDivide(d.hi, d.lo); -+} -+ -+/* public */ -+void DD::selfDivide(double y) -+{ -+ return selfDivide(y, 0.0); -+} -+ -+/* public */ -+DD operator/(const DD &lhs, const DD &rhs) -+{ -+ DD rv(lhs.hi, lhs.lo); -+ rv.selfDivide(rhs); -+ return rv; -+} -+ -+/* public */ -+DD operator/(const DD &lhs, double rhs) -+{ -+ DD rv(lhs.hi, lhs.lo); -+ rv.selfDivide(rhs); -+ return rv; -+} -+ -+/* public */ -+DD DD::negate() const -+{ -+ DD rv(hi, lo); -+ if (rv.isNaN()) -+ { -+ return rv; -+ } -+ rv.hi = -hi; -+ rv.lo = -lo; -+ return rv; -+} -+ -+/* public static */ -+DD DD::reciprocal() const -+{ -+ double hc, tc, hy, ty, C, c, U, u; -+ C = 1.0/hi; -+ c = SPLIT*C; -+ hc = c-C; -+ u = SPLIT*hi; -+ hc = c-hc; tc = C-hc; hy = u-hi; U = C*hi; hy = u-hy; ty = hi-hy; -+ u = (((hc*hy-U)+hc*ty)+tc*hy)+tc*ty; -+ c = ((((1.0-U)-u))-C*lo)/hi; -+ double zhi = C+c; -+ double zlo = (C-zhi)+c; -+ return DD(zhi, zlo); -+} -+ -+DD DD::floor() const -+{ -+ DD rv(hi, lo); -+ if (isNaN()) return rv; -+ double fhi = std::floor(hi); -+ double flo = 0.0; -+ // Hi is already integral. Floor the low word -+ if (fhi == hi) { -+ flo = std::floor(lo); -+ } -+ // do we need to renormalize here? -+ rv.hi = fhi; -+ rv.lo = flo; -+ return rv; -+} -+ -+DD DD::ceil() const -+{ -+ DD rv(hi, lo); -+ if (isNaN()) return rv; -+ double fhi = std::ceil(hi); -+ double flo = 0.0; -+ // Hi is already integral. Ceil the low word -+ if (fhi == hi) { -+ flo = std::ceil(lo); -+ // do we need to renormalize here? -+ } -+ rv.hi = fhi; -+ rv.lo = flo; -+ return rv; -+} -+ -+int DD::signum() const -+{ -+ if (hi > 0) return 1; -+ if (hi < 0) return -1; -+ if (lo > 0) return 1; -+ if (lo < 0) return -1; -+ return 0; -+} -+ -+DD DD::rint() const -+{ -+ DD rv(hi, lo); -+ if (isNaN()) return rv; -+ return (rv + 0.5).floor(); -+} -+ -+/* public static */ -+DD DD::trunc(const DD &d) -+{ -+ DD rv(d); -+ if (rv.isNaN()) return rv; -+ if (rv.isPositive()) -+ return rv.floor(); -+ return rv.ceil(); -+} -+ -+/* public static */ -+DD DD::abs(const DD &d) -+{ -+ DD rv(d); -+ if (rv.isNaN()) return rv; -+ if (rv.isNegative()) -+ return rv.negate(); -+ -+ return rv; -+} -+ -+/* public static */ -+DD DD::determinant(const DD &x1, const DD &y1, const DD &x2, const DD &y2) -+{ -+ return (x1 * y2) - (y1 * x2); -+} -+ -+/* public static */ -+DD DD::determinant(double x1, double y1, double x2, double y2) -+{ -+ return determinant(DD(x1), DD(y1), DD(x2), DD(y2) ); -+} -+ -+/** -+* Computes the value of this number raised to an integral power. -+* Follows semantics of Java Math.pow as closely as possible. -+*/ -+/* public static */ -+DD DD::pow(const DD &d, int exp) -+{ -+ if (exp == 0.0) -+ return DD(1.0); -+ -+ DD r(d); -+ DD s(1.0); -+ int n = std::abs(exp); -+ -+ if (n > 1) { -+ /* Use binary exponentiation */ -+ while (n > 0) { -+ if (n % 2 == 1) { -+ s.selfMultiply(r); -+ } -+ n /= 2; -+ if (n > 0) -+ r = r*r; -+ } -+ } else { -+ s = r; -+ } -+ -+ /* Compute the reciprocal if n is negative. */ -+ if (exp < 0) -+ return s.reciprocal(); -+ return s; -+} -+ -+ -+} -+} -diff --git a/src/math/Makefile.am b/src/math/Makefile.am -new file mode 100644 -index 00000000..c30e97ea ---- /dev/null -+++ b/src/math/Makefile.am -@@ -0,0 +1,13 @@ -+# -+# This file is part of project GEOS (http://trac.osgeo.org/geos/) -+# -+SUBDIRS = -+ -+noinst_LTLIBRARIES = libmath.la -+ -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ -+libmath_la_SOURCES = \ -+ DD.cpp -+ -+libmath_la_LIBADD = -diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am -index 88c4816f..3c836fc8 100644 ---- a/tests/unit/Makefile.am -+++ b/tests/unit/Makefile.am -@@ -151,6 +151,7 @@ geos_unit_SOURCES = \ - io/WKTWriterTest.cpp \ - io/WriterTest.cpp \ - linearref/LengthIndexedLineTest.cpp \ -+ math/DDTest.cpp \ - noding/BasicSegmentStringTest.cpp \ - noding/NodedSegmentStringTest.cpp \ - noding/OrientedCoordinateArrayTest.cpp \ -diff --git a/tests/unit/math/DDTest.cpp b/tests/unit/math/DDTest.cpp -new file mode 100644 -index 00000000..00a29b8f ---- /dev/null -+++ b/tests/unit/math/DDTest.cpp -@@ -0,0 +1,414 @@ -+// -+// Test Suite for geos::util::UniqueCoordinateArrayFilter class. -+ -+// geos -+ -+#include <geos/profiler.h> -+#include <geos/math/DD.h> -+ -+// tut -+#include <tut/tut.hpp> -+#include <utility.h> -+ -+// std -+#include <memory> -+#include <string> -+ -+using namespace geos::math; -+ -+namespace tut { -+// -+// Test Group -+// -+ -+// Common data used in test cases. -+struct test_dd_data { -+ -+ double eps; -+ DD pi; -+ DD e; -+ -+ -+ void ensure_dd_equals(const char *str, const DD &d1, const DD &d2, double tolerance) -+ { -+ DD delta = DD::abs(d1 - d2); -+ double diff = delta.doubleValue(); -+ ensure(str, diff <= tolerance); -+ } -+ -+ void checkTrunc(const DD &x, const DD &expected) -+ { -+ DD trunc = DD::trunc(x); -+ ensure("checkTrunc", trunc == expected); -+ } -+ -+ void checkDeterminant(double x1, double y1, double x2, double y2, double expected, double errBound) -+ { -+ DD det = DD::determinant(x1, y1, x2, y2); -+ //ensure_equals("1", Angle::angle(Coordinate(10, 0)), 0.0, TOL); -+ ensure_dd_equals("checkDeterminant", det, DD(expected), errBound); -+ } -+ -+ void checkDeterminantDD(double x1, double y1, double x2, double y2, double expected, double errBound) -+ { -+ DD det = DD::determinant(DD(x1), DD(y1), DD(x2), DD(y2)); -+ ensure_dd_equals("checkDeterminantDD", det, DD(expected), errBound); -+ } -+ -+ void checkAddMult2(const DD &dd) -+ { -+ DD sum = dd + dd; -+ DD prod = dd * DD(2.0); -+ ensure_dd_equals("checkAddMult2", sum, prod, 0.0); -+ } -+ -+ void checkMultiplyDivide(const DD &a, const DD &b, double errBound) -+ { -+ DD a2 = (a * b) / b; -+ ensure_dd_equals("checkMultiplyDivide", a, a2, errBound); -+ } -+ -+ void checkDivideMultiply(const DD &a, const DD &b, double errBound) -+ { -+ DD a2 = (a / b) * b; -+ ensure_dd_equals("checkDivideMultiply", a, a2, errBound); -+ } -+ -+ /** -+ * Computes (a+b)^2 in two different ways and compares the result. -+ * For correct results, a and b should be integers. -+ */ -+ void checkBinomialSquare(double a, double b) -+ { -+ // binomial square -+ DD add(a); -+ DD bdd(b); -+ DD aPlusb = add + bdd; -+ DD abSq = aPlusb * aPlusb; -+ -+ // expansion -+ DD a2dd = add * add; -+ DD b2dd = bdd * bdd; -+ DD ab = add * bdd; -+ DD sum = b2dd + ab + ab; -+ DD diff = abSq - a2dd; -+ DD delta = diff - sum; -+ -+ ensure("isSame", diff == sum); -+ ensure("isDeltaZero", delta.isZero()); -+ } -+ -+ void checkBinomial2(double a, double b) -+ { -+ // binomial product -+ DD add(a); -+ DD bdd(b); -+ DD aPlusb = add + bdd; -+ DD aSubb = add - bdd; -+ DD abProd = aPlusb * aSubb; -+ -+ // expansion -+ DD a2dd = add * add; -+ DD b2dd = bdd * bdd; -+ -+ // this should equal b^2 -+ DD diff = (abProd - a2dd).negate(); -+ DD delta = diff - b2dd; -+ -+ ensure("isSame", diff == b2dd); -+ ensure("isDeltaZero", delta.isZero()); -+ } -+ -+ void checkReciprocal(double x, double errBound) -+ { -+ DD xdd(x); -+ DD rr = xdd.reciprocal().reciprocal(); -+ double err = (xdd - rr).doubleValue(); -+ ensure("checkReciprocal", err <= errBound); -+ } -+ -+ DD slowPow(const DD &x, int exp) -+ { -+ if (exp == 0) -+ return DD(1.0); -+ -+ int n = std::abs(exp); -+ // MD - could use binary exponentiation for better precision & speed -+ DD pow(x); -+ for (int i = 1; i < n; i++) { -+ pow = pow * x; -+ } -+ if (exp < 0) { -+ return pow.reciprocal(); -+ } -+ return pow; -+ } -+ -+ void checkPow(double x, int exp, double errBound) -+ { -+ DD xdd(x); -+ DD pow = DD::pow(xdd, exp); -+ DD pow2 = slowPow(xdd, exp); -+ double err = (pow - pow2).doubleValue(); -+ ensure("checkPow", err <= errBound); -+ } -+ -+ -+ DD arctan(DD x) -+ { -+ DD t = x; -+ DD t2 = t*t; -+ DD at(0.0); -+ DD two(2.0); -+ int k = 0; -+ DD d(1.0); -+ int sign = 1; -+ while (t.doubleValue() > eps) { -+ k++; -+ if (sign < 0) -+ at = at - (t / d); -+ else -+ at = at + (t / d); -+ -+ d = d + two; -+ t = t * t2; -+ sign = -sign; -+ } -+ return at; -+ } -+ -+ /** -+ * Uses Taylor series to compute e -+ * -+ * e = 1 + 1 + 1/2! + 1/3! + 1/4! + ... -+ */ -+ DD computeEByTaylorSeries() -+ { -+ DD s(2.0); -+ DD t(1.0); -+ double n = 1.0; -+ int i = 0; -+ while(t.doubleValue() > eps) -+ { -+ i++; -+ n += 1.0; -+ t = t / DD(n); -+ s = s + t; -+ } -+ return s; -+ } -+ -+ /** -+ * Uses Machin's arctangent formula to compute Pi: -+ * -+ * Pi / 4 = 4 arctan(1/5) - arctan(1/239) -+ */ -+ -+ DD computePiByMachin() -+ { -+ DD t1 = DD(1.0) / DD(5.0); -+ DD t2 = DD(1.0) / DD(239.0); -+ DD pi4 = (DD(4.0) * arctan(t1)) - arctan(t2); -+ DD pi = DD(4.0) * pi4; -+ return pi; -+ } -+ -+ test_dd_data(): -+ eps(1.23259516440783e-32), /* = 2^-106 */ -+ pi(DD(3.141592653589793116e+00, 1.224646799147353207e-16)), -+ e(DD(2.718281828459045091e+00, 1.445646891729250158e-16)) -+ {} -+ -+}; -+ -+typedef test_group<test_dd_data> group; -+typedef group::object object; -+ -+group test_dd_group("geos::math::DD"); -+ -+// -+// Test Cases -+// -+ -+// Test PI calculation -+template<> -+template<> -+void object::test<1> -+() -+{ -+ DD testPi = computePiByMachin(); -+ double err = std::abs((testPi - pi).doubleValue()); -+ // std::cout << "Difference from PI = " << err << std::endl; -+ ensure("Test PI calculation", err < 8*eps); -+} -+ -+// Test E calculation -+template<> -+template<> -+void object::test<2> -+() -+{ -+ DD testE = computeEByTaylorSeries(); -+ double err = std::abs((testE - e).doubleValue()); -+ // std::cout << "Difference from E = " << err << std::endl; -+ ensure("Test E calculation", err < eps); -+} -+ -+ -+// Test NaN -+template<> -+template<> -+void object::test<3> -+() -+{ -+ DD nan = DD(1.0) / DD(0.0); -+ ensure("isNan", nan.isNaN()); -+ ensure("isNan", (DD(1.0) * nan).isNaN()); -+} -+ -+// testAddMult2 -+template<> -+template<> -+void object::test<4> -+() -+{ -+ checkAddMult2(DD(3.0)); -+ checkAddMult2(DD(pi)); -+} -+ -+ -+// testMultiplyDivide -+template<> -+template<> -+void object::test<5> -+() -+{ -+ checkMultiplyDivide(DD(pi), DD(e), 1e-30); -+ checkMultiplyDivide(DD(DD(2.0)*pi), DD(e), 1e-30); -+ checkMultiplyDivide(DD(DD(0.5)*pi), DD(e), 1e-30); -+ checkMultiplyDivide(DD(39.4), DD(10), 1e-30); -+} -+ -+ -+// testDivideMultiply -+template<> -+template<> -+void object::test<6> -+() -+{ -+ checkDivideMultiply(DD(pi), DD(e), 1e-30); -+ checkDivideMultiply(DD(39.4), DD(10), 1e-30); -+} -+ -+ -+// testTrunc -+template<> -+template<> -+void object::test<7> -+() -+{ -+ checkTrunc(DD(1e16) - DD(1), DD(1e16) - DD(1)); -+ // the appropriate error bound is determined empirically -+ checkTrunc(DD(pi), DD(3)); -+ checkTrunc(DD(999.999), DD(999)); -+ -+ checkTrunc(DD(e).negate(), DD(-2)); -+ checkTrunc(DD(-999.999), DD(-999)); -+} -+ -+// testPow -+template<> -+template<> -+void object::test<8> -+() -+{ -+ checkPow(0, 3, 16 * eps); -+ checkPow(0, 3, 16 * eps); -+ checkPow(14, 3, 16 * eps); -+ checkPow(3, -5, 16 * eps); -+ checkPow(-3, 5, 16 * eps); -+ checkPow(-3, -5, 16 * eps); -+ checkPow(0.12345, -5, 1e5 * eps); -+} -+ -+ -+// testReciprocal -+template<> -+template<> -+void object::test<9> -+() -+{ -+ checkReciprocal(3.0, 0); -+ checkReciprocal(99.0, 1e-29); -+ checkReciprocal(999.0, 0); -+ checkReciprocal(314159269.0, 0); -+} -+ -+// testDeterminant -+template<> -+template<> -+void object::test<10> -+() -+{ -+ checkDeterminant(3, 8, 4, 6, -14, 0); -+ checkDeterminantDD(3, 8, 4, 6, -14, 0); -+} -+ -+// testDeterminantRobust -+template<> -+template<> -+void object::test<11> -+() -+{ -+ checkDeterminant(1.0e9, 1.0e9 - 1, 1.0e9 - 1, 1.0e9 - 2, -1, 0); -+ checkDeterminantDD(1.0e9, 1.0e9 - 1, 1.0e9 - 1, 1.0e9 - 2, -1, 0); -+} -+ -+ -+// testBinom -+template<> -+template<> -+void object::test<12> -+() -+{ -+ checkBinomialSquare(100.0, 1.0); -+ checkBinomialSquare(1000.0, 1.0); -+ checkBinomialSquare(10000.0, 1.0); -+ checkBinomialSquare(100000.0, 1.0); -+ checkBinomialSquare(1000000.0, 1.0); -+ checkBinomialSquare(1e8, 1.0); -+ checkBinomialSquare(1e10, 1.0); -+ checkBinomialSquare(1e14, 1.0); -+ // Following call will fail, because it requires 32 digits of precision -+ // checkBinomialSquare(1e16, 1.0); -+ -+ checkBinomialSquare(1e14, 291.0); -+ checkBinomialSquare(5e14, 291.0); -+ checkBinomialSquare(5e14, 345291.0); -+} -+ -+// testBinom2 -+template<> -+template<> -+void object::test<13> -+() -+{ -+ checkBinomial2(100.0, 1.0); -+ checkBinomial2(1000.0, 1.0); -+ checkBinomial2(10000.0, 1.0); -+ checkBinomial2(100000.0, 1.0); -+ checkBinomial2(1000000.0, 1.0); -+ checkBinomial2(1e8, 1.0); -+ checkBinomial2(1e10, 1.0); -+ checkBinomial2(1e14, 1.0); -+ -+ checkBinomial2(1e14, 291.0); -+ -+ checkBinomial2(5e14, 291.0); -+ checkBinomial2(5e14, 345291.0); -+} -+ -+ -+ -+} // namespace tut -+ --- -2.26.2 - diff --git a/sources b/sources index 7840291..d3b4939 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (check_doxygen_errors.cmake) = 4764415b279cd7583f8ec2e0150ab2e87f12f7b9c6249ee03bf3a368c12f698c586a6b116ae892395b7d46d620f96d2a1ac6aa16ce4bbf4dc2cdedca9f12e07f -SHA512 (geos-3.8.1.tar.bz2) = 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056 +SHA512 (geos-3.9.0.tar.bz2) = 518be112b2e05063d97c09d0e568b784e6c65b0a7be1368cefbd481b3f4ac2d8fc89611e6e205a95f4d1740ab4f47b3929fb4c801bcf9a9e9b6ae86a54e62933

3 years, 4 months

1
0
0 / 0

[Report] Packages Restricting Arches

by root

List of packages currently excluding arches (2576) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - 90-Second-Portraits ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - GoldenCheetah ExclusiveArch: %{qt5_qtwebengine_arches} - GtkAda ExclusiveArch: %{GPRbuild_arches} - GtkAda3 ExclusiveArch: %{GPRbuild_arches} - OpenImageIO ExclusiveArch: x86_64 ppc64le - PragmARC ExclusiveArch: %{GPRbuild_arches} - R-V8 ExclusiveArch: %{nodejs_arches} - RdRand ExclusiveArch: %{ix86} x86_64 - RediSearch ExclusiveArch: x86_64 - SLOF ExclusiveArch: ppc64le - YafaRay ExclusiveArch: %{ix86} x86_64 - aboot ExclusiveArch: alpha - accel-config ExclusiveArch: %{ix86} x86_64 - acpid ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 - ahven ExclusiveArch: %{GPRbuild_arches} - algobox ExclusiveArch: %{qt5_qtwebengine_arches} - alleyoop ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64 - american-fuzzy-lop ExclusiveArch: %{ix86} x86_64 - anet ExclusiveArch: %{GPRbuild_arches} - anki ExclusiveArch: %{qt5_qtwebengine_arches} noarch - apmd ExclusiveArch: %{ix86} - appstream-generator ExclusiveArch: x86_64 %{ix86} %{arm} - arduino ExclusiveArch: %{go_arches} - arduino-builder ExclusiveArch: %{go_arches} - arm-trusted-firmware ExclusiveArch: aarch64 - aunit ExclusiveArch: %GPRbuild_arches - avgtime ExclusiveArch: %{ldc_arches} - aws ExclusiveArch: %GPRbuild_arches - banshee-community-extensions ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x - bareftp ExclusiveArch: %{mono_arches} - bcal ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x - bcc ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl - bcm283x-firmware ExclusiveArch: %{arm} aarch64 - berusky2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} - biosdevname ExclusiveArch: %{ix86} x86_64 - blender ExclusiveArch: x86_64 aarch64 ppc64le - bless ExclusiveArch: %mono_arches - boo ExclusiveArch: %{mono_arches} - bpftrace ExclusiveArch: x86_64 %{power64} aarch64 s390x - calamares ExclusiveArch: %{ix86} x86_64 - calibre ExclusiveArch: %{qt5_qtwebengine_arches} - ccdciel ExclusiveArch: %{fpc_arches} - cdcollect ExclusiveArch: %{mono_arches} - ceph ExclusiveArch: x86_64 aarch64 ppc64le s390x - chromium ExclusiveArch: x86_64 i686 ExclusiveArch: x86_64 i686 aarch64 - cjdns ExclusiveArch: %{nodejs_arches} - clevis-pin-tpm2 ExclusiveArch: %{rust_arches} - cmospwd ExclusiveArch: %{ix86} x86_64 - cmrt ExclusiveArch: %{ix86} x86_64 ia64 - coffee-script ExclusiveArch: %{nodejs_arches} noarch - colorful ExclusiveArch: %{fpc_arches} - cpu-x ExclusiveArch: i686 x86_64 - cpuid ExclusiveArch: %{ix86} x86_64 - cqrlog ExclusiveArch: %{fpc_arches} - crash ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - cri-tools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - criu ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - cryptlib ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le - cryptobone ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64 - daq ExclusiveArch: x86_64 aarch64 - darktable ExclusiveArch: x86_64 aarch64 ppc64le ExclusiveArch: x86_64 ppc64le - dbus-parsec ExclusiveArch: %{rust_arches} - dbus-sharp ExclusiveArch: %mono_arches - dbus-sharp-glib ExclusiveArch: %mono_arches - dbxtool ExclusiveArch: i386 x86_64 aarch64 - deepin-daemon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-desktop-schemas ExclusiveArch: %{go_arches} - discord-irc ExclusiveArch: %{nodejs_arches} noarch - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dolphin-emu ExclusiveArch: x86_64 aarch64 - dotnet-build-reference-packages ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64 - dotnet3.1 ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64 - doublecmd ExclusiveArch: %{ix86} x86_64 - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dssi-vst ExclusiveArch: %{ix86} x86_64 - dyninst ExclusiveArch: %{ix86} x86_64 ppc64le aarch64 - e3 ExclusiveArch: %{ix86} x86_64 - edac-utils ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - edb ExclusiveArch: %{ix86} x86_64 - edk2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: x86_64 aarch64 - efibootmgr ExclusiveArch: %{efi} - efivar ExclusiveArch: %{efi} - elasticdump ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - elk ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - emacs-slime ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - embree ExclusiveArch: x86_64 - enki ExclusiveArch: %{qt5_qtwebengine_arches} noarch - envytools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - eric ExclusiveArch: %{qt5_qtwebengine_arches} noarch - extlinux-bootloader ExclusiveArch: %{arm} aarch64 - fcitx-libpinyin ExclusiveArch: %{qt5_qtwebengine_arches} - fedora-developer-portal ExclusiveArch: x86_64 i686 aarch64 # only chromium architectures - fedora-dockerfiles ExclusiveArch: %{go_arches} - fes ExclusiveArch: %{ix86} x86_64 - flannel ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - florist ExclusiveArch: %{GPRbuild_arches} - fpc ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le - frescobaldi ExclusiveArch: %{qt5_qtwebengine_arches} - frysk ExclusiveArch: %{ix86} x86_64 ppc64 - fwts ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64} - ga ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - gbrainy ExclusiveArch: %mono_arches - gdata-sharp ExclusiveArch: %mono_arches - gdb-exploitable ExclusiveArch: x86_64 i386 ExclusiveArch: x86_64 noarch - gearhead1 ExclusiveArch: %{fpc_arches} - gela-asis ExclusiveArch: %GPRbuild_arches - ghdl ExclusiveArch: %{GNAT_arches} - ghostwriter ExclusiveArch: %{qt5_qtwebengine_arches} - gio-sharp ExclusiveArch: %mono_arches - gir-to-d ExclusiveArch: %{ldc_arches} - git-octopus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - giver ExclusiveArch: %{mono_arches} - gkeyfile-sharp ExclusiveArch: %mono_arches - glibc32 ExclusiveArch: x86_64 - glibd ExclusiveArch: %{ldc_arches} - gmqcc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - gnatcoll ExclusiveArch: %{GPRbuild_arches} - gnatcoll-bindings ExclusiveArch: %{GPRbuild_arches} - gnatcoll-db ExclusiveArch: %{GPRbuild_arches} - gnome-boxes ExclusiveArch: x86_64 - gnome-desktop-sharp ExclusiveArch: %mono_arches - gnome-do ExclusiveArch: %mono_arches - gnome-guitar ExclusiveArch: %{mono_arches} - gnome-keyring-sharp ExclusiveArch: %mono_arches - gnome-rdp ExclusiveArch: %{mono_arches} - gnome-sharp ExclusiveArch: %mono_arches - gnome-subtitles ExclusiveArch: %mono_arches - gnu-efi ExclusiveArch: %{efi} - go-bindata ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - go-compilers ExclusiveArch: %{go_arches} - go-rpm-macros ExclusiveArch: %{golang_arches} %{gccgo_arches} - godep ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang ExclusiveArch: %{golang_arches} - gomtree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gotun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: x86_64 - goverlay ExclusiveArch: %{fpc_arches} - gprbuild ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch} - gprolog ExclusiveArch: x86_64 %{ix86} ppc alpha - grafana ExclusiveArch: %{grafana_arches} - grafana-pcp ExclusiveArch: %{grafanapcp_arches} - gtk-sharp-beans ExclusiveArch: %mono_arches - gtk-sharp2 ExclusiveArch: %mono_arches - gtk-sharp3 ExclusiveArch: %{mono_arches} - gtkd ExclusiveArch: %{ldc_arches} - gudev-sharp ExclusiveArch: %mono_arches - hedgewars ExclusiveArch: %{fpc_arches} - hsakmt ExclusiveArch: x86_64 aarch64 - hyena ExclusiveArch: %{mono_arches} - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 - i3status-rs ExclusiveArch: %{rust_arches} - icaro ExclusiveArch: %{ix86} x86_64 noarch - imvirt ExclusiveArch: %{ix86} x86_64 ia64 - indistarter ExclusiveArch: %{fpc_arches} - infinipath-psm ExclusiveArch: x86_64 - intel-cmt-cat ExclusiveArch: x86_64 i686 i586 ExclusiveArch: x86_64 i686 i586 - intel-gmmlib ExclusiveArch: x86_64 i686 - intel-ipsec-mb ExclusiveArch: x86_64 ExclusiveArch: x86_64 - intel-mediasdk ExclusiveArch: x86_64 - intel-undervolt ExclusiveArch: i386 x86_64 - ioport ExclusiveArch: %{ix86} x86_64 - ipmctl ExclusiveArch: x86_64 - ipw2100-firmware ExclusiveArch: noarch i386 x86_64 - ipw2200-firmware ExclusiveArch: noarch i386 x86_64 - ispc ExclusiveArch: x86_64 aarch64 - iucode-tool ExclusiveArch: %{ix86} x86_64 - iyfct ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - java-1.8.0-openjdk-aarch32 ExclusiveArch: %{arm} - keepass ExclusiveArch: %{mono_arches} - kernel ExclusiveArch: x86_64 s390x %{arm} aarch64 ppc64le ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le - kf5-akonadi-search ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-audiocd-kio ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kalarmcal ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kblog ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kcalendarcore ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kcalendarutils ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kitinerary ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-kmailtransport ExclusiveArch: x86_64 %{arm} - kf5-ktnef ExclusiveArch: x86_64 ppc64le aarch64 %{arm} - kf5-libkdcraw ExclusiveArch: x86_64 ppc64le %{arm} - kicad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - kiwix-desktop ExclusiveArch: %{qt5_qtwebengine_arches} - knot-resolver ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - knotes ExclusiveArch: x86_64 %{arm} - kompose ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x - kubernetes ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm} - lazarus ExclusiveArch: %{fpc_arches} - lazpaint ExclusiveArch: %{fpc_arches} - ldc ExclusiveArch: %{ldc_arches} - libbsr ExclusiveArch: %{power64} - libclc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - libcxl ExclusiveArch: %{power64} - libdfp ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64 - libguestfs ExclusiveArch: %{kernel_arches} - libica ExclusiveArch: s390 s390x - libipt ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - libnxz ExclusiveArch: ppc64le - libocxl ExclusiveArch: ppc64le - libpmemobj-cpp ExclusiveArch: x86_64 - libpsm2 ExclusiveArch: x86_64 - libquentier ExclusiveArch: %{qt5_qtwebengine_arches} - libretro-desmume2015 ExclusiveArch: i686 x86_64 - librtas ExclusiveArch: %{power64} - libservicelog ExclusiveArch: ppc %{power64} - libsmbios ExclusiveArch: x86_64 %{ix86} - libunwind ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 - libva-intel-hybrid-driver ExclusiveArch: %{ix86} x86_64 ia64 - libvma ExclusiveArch: x86_64 ppc64le ppc64 aarch64 - libvmi ExclusiveArch: x86_64 - libvpd ExclusiveArch: %{power64} - libxsmm ExclusiveArch: x86_64 - libzfcphbaapi ExclusiveArch: s390 s390x - lightdm ExclusiveArch: x86_64 ppc64le - log4net ExclusiveArch: %mono_arches - lrmi ExclusiveArch: %{ix86} - lsvpd ExclusiveArch: %{power64} - luajit ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 s390x ppc64le - luxcorerender ExclusiveArch: x86_64 - mactel-boot ExclusiveArch: x86_64 - manifest-tool ExclusiveArch: x86_64 aarch64 ppc64le s390x - mantle ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - matreshka ExclusiveArch: %GPRbuild_arches - maxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - mbpfan ExclusiveArch: x86_64 - mcelog ExclusiveArch: i686 x86_64 - mediaconch ExclusiveArch: %{qt5_qtwebengine_arches} - mellowplayer ExclusiveArch: %{qt5_qtwebengine_arches} - memkind ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 - memtest86+ ExclusiveArch: %{ix86} x86_64 - mesos ExclusiveArch: x86_64 - microcode_ctl ExclusiveArch: %{ix86} x86_64 - micropython ExclusiveArch: %{arm} %{ix86} x86_64 - mine_detector ExclusiveArch: %{GPRbuild_arches} - minetest ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mingw-wine-gecko ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - mirrorlist-server ExclusiveArch: %{rust_arches} - mkbootdisk ExclusiveArch: %{ix86} sparc sparc64 x86_64 - mocha ExclusiveArch: %{nodejs_arches} noarch - mod_mono ExclusiveArch: %mono_arches - module-build-service ExclusiveArch: %{ix86} x86_64 noarch - mokutil ExclusiveArch: %{ix86} x86_64 aarch64 - mono ExclusiveArch: %mono_arches - mono-addins ExclusiveArch: %mono_arches - mono-basic ExclusiveArch: %{mono_arches} - mono-bouncycastle ExclusiveArch: %mono_arches - mono-cecil ExclusiveArch: %mono_arches - mono-cecil-flowanalysis ExclusiveArch: %mono_arches - mono-reflection ExclusiveArch: %mono_arches - mono-tools ExclusiveArch: %mono_arches - mono-zeroconf ExclusiveArch: %mono_arches - monobristol ExclusiveArch: %{mono_arches} - monodevelop ExclusiveArch: %mono_arches - monodevelop-debugger-gdb ExclusiveArch: %{mono_arches} - monosim ExclusiveArch: %mono_arches - mrrescue ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - msr-tools ExclusiveArch: %{ix86} x86_64 - mustache-d ExclusiveArch: %{ldc_arches} - mysql-connector-net ExclusiveArch: %{mono_arches} - nant ExclusiveArch: %mono_arches - nbc ExclusiveArch: %{fpc_arches} - nbdkit ExclusiveArch: x86_64 - ndesk-dbus ExclusiveArch: %{mono_arches} - ndesk-dbus-glib ExclusiveArch: %{mono_arches} - newsflash ExclusiveArch: %{rust_arches} - newtonsoft-json ExclusiveArch: %{mono_arches} - nim ExclusiveArch: %{nim_arches} - nispor ExclusiveArch: %{rust_arches} - nodejs ExclusiveArch: %{nodejs_arches} - nodejs-Base64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-dynamic-import ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn-jsx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-object-spread ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-align-text ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblack ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgcyan ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bggreen ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgmagenta ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgred ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgwhite ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgyellow ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-black ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-blue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bold ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-cyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-dim ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-escapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-gray ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-green ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-grey ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-hidden ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-inverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-italic ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-magenta ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-red ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-reset ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-strikethrough ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-styles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-underline ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-white ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-wrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-yellow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansicolors ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansistyles ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-append-field ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-are-we-there-yet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-argparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-argsparser ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-exclude ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-union ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-buffer-from-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-find ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-find-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-foreach ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-ify ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-unique ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arraybuffer-dot-slice ExclusiveArch: %{nodejs_arches} noarch - nodejs-arraybuffer-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-asap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ascli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-asn1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-assert-plus ExclusiveArch: %{nodejs_arches} noarch - nodejs-assume ExclusiveArch: %{nodejs_arches} noarch - nodejs-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-async-arrays ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-limiter ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-some ExclusiveArch: %{nodejs_arches} noarch - nodejs-asynckit ExclusiveArch: %{nodejs_arches} noarch - nodejs-atob ExclusiveArch: %{nodejs_arches} noarch - nodejs-auto-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-autoresolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-plugin-syntax-async-functions ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-plugin-syntax-async-generators ExclusiveArch: %{nodejs_arches} noarch - nodejs-babylon ExclusiveArch: %{nodejs_arches} noarch - nodejs-backbone ExclusiveArch: %{nodejs_arches} noarch - nodejs-backoff ExclusiveArch: %{nodejs_arches} noarch - nodejs-balanced-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-plugins ExclusiveArch: %{nodejs_arches} noarch - nodejs-base32-encode ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64id ExclusiveArch: %{nodejs_arches} noarch - nodejs-bash-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth ExclusiveArch: %{nodejs_arches} noarch - nodejs-beeper ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-better-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-than-before ExclusiveArch: %{nodejs_arches} noarch - nodejs-bignumber-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-bind-obj-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-bit-mask ExclusiveArch: %{nodejs_arches} noarch - nodejs-blob ExclusiveArch: %{nodejs_arches} noarch - nodejs-block-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-boolbase ExclusiveArch: %{nodejs_arches} noarch - nodejs-boom ExclusiveArch: %{nodejs_arches} noarch - nodejs-brace-expansion ExclusiveArch: %{nodejs_arches} noarch - nodejs-braces ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-browser-stdout ExclusiveArch: %{nodejs_arches} noarch - nodejs-bson ExclusiveArch: %{nodejs_arches} noarch - nodejs-buble ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buf-compare ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-builtin-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-builtins ExclusiveArch: %{nodejs_arches} noarch - nodejs-bundle-dependencies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-burrito ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-busboy ExclusiveArch: %{nodejs_arches} noarch - nodejs-byline ExclusiveArch: %{nodejs_arches} noarch - nodejs-caching-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-call-me-maybe ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-callback-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsites ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-carrier ExclusiveArch: %{nodejs_arches} noarch - nodejs-caseless ExclusiveArch: %{nodejs_arches} noarch - nodejs-center-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-as-promised ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-json-schema ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-oauth2orize-grant ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-spies-next ExclusiveArch: %{nodejs_arches} noarch - nodejs-chainer ExclusiveArch: %{nodejs_arches} noarch - nodejs-chalk ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-char-spinner ExclusiveArch: %{nodejs_arches} noarch - nodejs-character-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-chardet ExclusiveArch: %{nodejs_arches} noarch - nodejs-charenc ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-charm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-check-env ExclusiveArch: %{nodejs_arches} noarch - nodejs-check-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-ci-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-circular-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-clap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-class-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-clean-yaml-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clear-require ExclusiveArch: %{nodejs_arches} noarch - nodejs-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-spinner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-cliui ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-stats ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-co-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-co-with-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-code-point-at ExclusiveArch: %{nodejs_arches} noarch - nodejs-codemirror ExclusiveArch: %{nodejs_arches} noarch - nodejs-coffee-coverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-collection-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-color-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-colour ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-columnify ExclusiveArch: %{nodejs_arches} noarch - nodejs-combined-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-commander ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-common-path-prefix ExclusiveArch: %{nodejs_arches} noarch - nodejs-commondir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compare-func ExclusiveArch: %{nodejs_arches} noarch - nodejs-compare-versions ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-inherit ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-map ExclusiveArch: %{nodejs_arches} noarch - nodejs-connect-livereload ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-console-group ExclusiveArch: %{nodejs_arches} noarch - nodejs-consolemd ExclusiveArch: %{nodejs_arches} noarch - nodejs-content-disposition ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-preset-loader ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-filter ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-hex ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-copy-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-core-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crc ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crypt ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cryptiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-csrf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-what ExclusiveArch: %{nodejs_arches} noarch - nodejs-csso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-generate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-spectrum ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ctype ExclusiveArch: %{nodejs_arches} noarch - nodejs-currently-unhandled ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cycle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cyclist ExclusiveArch: %{nodejs_arches} noarch - nodejs-d ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dargs ExclusiveArch: %{nodejs_arches} noarch - nodejs-data-uri-to-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dateformat ExclusiveArch: %{nodejs_arches} noarch - nodejs-death ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-debug-fabulous ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-decamelize ExclusiveArch: %{nodejs_arches} noarch - nodejs-decamelize-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-decimal-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-dedent ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-default-require-extensions ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defaults ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-delayed-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-delegates ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-depd ExclusiveArch: %{nodejs_arches} noarch - nodejs-deprecated ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-newline ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-dezalgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-dicer ExclusiveArch: %{nodejs_arches} noarch - nodejs-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dirty-chai ExclusiveArch: %{nodejs_arches} noarch - nodejs-discord-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-docopt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dot-prop ExclusiveArch: %{nodejs_arches} noarch - nodejs-dotfile-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-duplexer2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-duration ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-echomd ExclusiveArch: %{nodejs_arches} noarch - nodejs-ee-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-ejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-emojione ExclusiveArch: %{nodejs_arches} noarch - nodejs-empty-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-es5-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es5-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-iterator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-promisify ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escape-html ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-regexp-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escape-string-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-espurify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse-fb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estree-walker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-event-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-events-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-everything-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-brackets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-tilde ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extended-emitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fancy-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fast-levenshtein ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fastfall ExclusiveArch: %{nodejs_arches} noarch - nodejs-figures ExclusiveArch: %{nodejs_arches} noarch - nodejs-file-sync-cmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-filename-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fill-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-first-chunk-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flagged-respawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flush-write-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fmix ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-dot-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-in ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-for-own ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-foreground-child ExclusiveArch: %{nodejs_arches} noarch - nodejs-forever-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-form-data ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-formatio ExclusiveArch: %{nodejs_arches} noarch - nodejs-forwarded ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fragment-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-cached ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fs-temp ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-write-stream-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-function-loop ExclusiveArch: %{nodejs_arches} noarch - nodejs-gaze ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-generic-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-username-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob-base ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-expand ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-parent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-to-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-global-modules ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glogg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gonzales-pe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-graceful-readlink ExclusiveArch: %{nodejs_arches} noarch - nodejs-growl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-banner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-nodeunit ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-sed ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-simple-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-flag ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-yarn ExclusiveArch: %{nodejs_arches} noarch - nodejs-hawk ExclusiveArch: %{nodejs_arches} noarch - nodejs-heap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hex-to-array-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-hoek ExclusiveArch: %{nodejs_arches} noarch - nodejs-homedir-polyfill ExclusiveArch: %{nodejs_arches} noarch - nodejs-hook-std ExclusiveArch: %{nodejs_arches} noarch - nodejs-hosted-git-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-deceiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-iferr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ignore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-immutable ExclusiveArch: %{nodejs_arches} noarch - nodejs-imul ExclusiveArch: %{nodejs_arches} noarch - nodejs-imurmurhash ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-indent-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-inflight ExclusiveArch: %{nodejs_arches} noarch - nodejs-info-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-int64-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-intercept-require ExclusiveArch: %{nodejs_arches} noarch - nodejs-interpret ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-invert-kv ExclusiveArch: %{nodejs_arches} noarch - nodejs-ipaddr-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-irc-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-irc-formatting ExclusiveArch: %{nodejs_arches} noarch - nodejs-irc-upd ExclusiveArch: %{nodejs_arches} noarch - nodejs-irregular-plurals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-accessor-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-boolean-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-builtin-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-data-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-dotfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-equal-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-extendable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-finite ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-fullwidth-code-point ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-generator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-negated-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-number ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-number-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-odd ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-path-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-in-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-inside ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-plain-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-plain-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-primitive ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-registered ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-relative ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-subset ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-text-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-unc-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-valid-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-valid-instance ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-windows ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isarray ExclusiveArch: %{nodejs_arches} noarch - nodejs-isexe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isodate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-istanbul-lib-coverage ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-hook ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-report ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-reports ExclusiveArch: %{nodejs_arches} noarch - nodejs-jade ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jest-mock ExclusiveArch: %{nodejs_arches} noarch - nodejs-js-base64 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-tokens ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jschardet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stable-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stringify-safe ExclusiveArch: %{nodejs_arches} noarch - nodejs-json3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonpointer-dot-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonselect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keep-alive-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-keygrip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-kind-of ExclusiveArch: %{nodejs_arches} noarch - nodejs-lazy-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lcid ExclusiveArch: %{nodejs_arches} noarch - nodejs-leche ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-left-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-levn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-line-numbers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-line-reader ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linkify-it ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-locate-character ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-driver ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-ok ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-lolex ExclusiveArch: %{nodejs_arches} noarch - nodejs-long ExclusiveArch: %{nodejs_arches} noarch - nodejs-longest ExclusiveArch: %{nodejs_arches} noarch - nodejs-loud-rejection ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lru-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-magic-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-make-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-makedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-makeerror ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-markdown ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-matched ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-max-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5 ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-hex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-o-matic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mdn-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-mdurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-media-typer ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoizee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-metascript ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mime-db ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimalistic-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minipass ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-modify-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb-core ExclusiveArch: %{nodejs_arches} noarch - nodejs-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-multipipe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-murmur-32 ExclusiveArch: %{nodejs_arches} noarch - nodejs-mustache ExclusiveArch: %{nodejs_arches} noarch - nodejs-mutate-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-mysql ExclusiveArch: %{nodejs_arches} noarch - nodejs-mz ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nanomsg ExclusiveArch: %{nodejs_arches} - nodejs-nanoseconds ExclusiveArch: %{nodejs_arches} noarch - nodejs-needle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-negative-zero ExclusiveArch: %{nodejs_arches} noarch - nodejs-net-browserify-alt ExclusiveArch: %{nodejs_arches} noarch - nodejs-next-tick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-node-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-uuid ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nodemon ExclusiveArch: %{nodejs_arches} noarch - nodejs-nomnom ExclusiveArch: %{nodejs_arches} noarch - nodejs-noncharacters ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt-usage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-normalize-git-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-cache-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-install-checks ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-package-arg ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-run-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-nth-check ExclusiveArch: %{nodejs_arches} noarch - nodejs-number-is-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth2orize ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-dot-omit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-observable-to-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-obuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-finished ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-headers ExclusiveArch: %{nodejs_arches} noarch - nodejs-once ExclusiveArch: %{nodejs_arches} noarch - nodejs-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-option-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-optionator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-optjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-orchestrator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ordered-read-streams ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-os-homedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-locale ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-output-file-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-own-or ExclusiveArch: %{nodejs_arches} noarch - nodejs-own-or-env ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-finally ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-try ExclusiveArch: %{nodejs_arches} noarch - nodejs-package-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-packaging ExclusiveArch: %{nodejs_arches} noarch - nodejs-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pad-left ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parallel-transform ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-github-repo-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parse-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-passwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-parsejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseqs ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseuri ExclusiveArch: %{nodejs_arches} noarch - nodejs-pascalcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-http-bearer ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-array ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-dirname ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-absolute ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-inside ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-key ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-parse ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-to-regexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pathval ExclusiveArch: %{nodejs_arches} noarch - nodejs-pbkdf2-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkginfo ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-platform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-plur ExclusiveArch: %{nodejs_arches} noarch - nodejs-posix-character-classes ExclusiveArch: %{nodejs_arches} noarch - nodejs-precond ExclusiveArch: %{nodejs_arches} noarch - nodejs-prelude-ls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-preserve ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-hrtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-pretty-time ExclusiveArch: %{nodejs_arches} noarch - nodejs-prism-media ExclusiveArch: %{nodejs_arches} noarch - nodejs-proclaim ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress ExclusiveArch: %{nodejs_arches} noarch - nodejs-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promises-aplus-tests ExclusiveArch: %{nodejs_arches} noarch - nodejs-propagate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-propget ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy-addr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pruddy-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-pseudomap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pump ExclusiveArch: %{nodejs_arches} noarch - nodejs-pumpify ExclusiveArch: %{nodejs_arches} noarch - nodejs-qs ExclusiveArch: %{nodejs_arches} noarch - nodejs-qtdatastream ExclusiveArch: %{nodejs_arches} noarch - nodejs-quick-lru ExclusiveArch: %{nodejs_arches} noarch - nodejs-rainbowsocks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-random-bytes ExclusiveArch: %{nodejs_arches} noarch - nodejs-random-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-randomatic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-re-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-cmd-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-readdir-enhanced ExclusiveArch: %{nodejs_arches} noarch - nodejs-readdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-realize-package-specifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-regex-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regex-not ExclusiveArch: %{nodejs_arches} noarch - nodejs-remove-trailing-separator ExclusiveArch: %{nodejs_arches} noarch - nodejs-repeat-element ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeat-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeating ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace-require-self ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-require-inject ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-main-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-relative ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-uncached ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-cwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-pkg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-reusify ExclusiveArch: %{nodejs_arches} noarch - nodejs-rhea ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-right-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-rimraf ExclusiveArch: %{nodejs_arches} noarch - nodejs-rndm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rollup-plugin-buble ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-pluginutils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-runforcover ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safe-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-safe-json-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safecb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-samsam ExclusiveArch: %{nodejs_arches} noarch - nodejs-seedrandom ExclusiveArch: %{nodejs_arches} noarch - nodejs-semver ExclusiveArch: %{nodejs_arches} noarch - nodejs-sentiment ExclusiveArch: %{nodejs_arches} noarch - nodejs-sequencify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serialize-error ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-server-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-blocking ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-getter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-set-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-setprototypeof ExclusiveArch: %{nodejs_arches} noarch - nodejs-sha ExclusiveArch: %{nodejs_arches} noarch - nodejs-shallow-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-command ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-shelljs ExclusiveArch: %{nodejs_arches} noarch - nodejs-sift ExclusiveArch: %{nodejs_arches} noarch - nodejs-signal-exit ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-asyncify ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-fmt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon-chai ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sinon-restore ExclusiveArch: %{nodejs_arches} noarch - nodejs-slash ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-slide ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-snapdragon-capture ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture-set ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-snekfetch ExclusiveArch: %{nodejs_arches} noarch - nodejs-sntp ExclusiveArch: %{nodejs_arches} noarch - nodejs-sorted-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-fixtures ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-sparkles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-spawn-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-exceptions ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-license-ids ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-split-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-split2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-ssri ExclusiveArch: %{nodejs_arches} noarch - nodejs-stable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-trace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-utils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-static-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-consume ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-pair ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-replace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-streamsearch ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamtest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-repeat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-width ExclusiveArch: %{nodejs_arches} noarch - nodejs-string_decoder ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringmap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-ansi ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-bom-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-color ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-eof ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-json-comments ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-success-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-supervisor ExclusiveArch: %{nodejs_arches} noarch - nodejs-suspend ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-symbol-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap-out ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tape ExclusiveArch: %{nodejs_arches} noarch - nodejs-tapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-tempfile ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-liferay ExclusiveArch: %{nodejs_arches} noarch - nodejs-terst ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testdata-w3c-json-form ExclusiveArch: %{nodejs_arches} noarch - nodejs-testutil ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-extensions ExclusiveArch: %{nodejs_arches} noarch - nodejs-thenify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thenify-all ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-through2-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thunkify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tildify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-time-diff ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-stamp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-timekeeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-timers-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tippex ExclusiveArch: %{nodejs_arches} noarch - nodejs-tlds ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-object-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-regex-range ExclusiveArch: %{nodejs_arches} noarch - nodejs-toidentifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-touch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tracejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-transformers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-traverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-treeify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tressa ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-trim-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim-off-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trivial-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-try-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-try-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-tryor ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tsame ExclusiveArch: %{nodejs_arches} noarch - nodejs-tslib ExclusiveArch: %{nodejs_arches} noarch - nodejs-tsscmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tunnel-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-tv4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-tweetnacl ExclusiveArch: %{nodejs_arches} noarch - nodejs-tweetnacl-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-check ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-type-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-name ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-uc-dot-micro ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid-safe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ultron ExclusiveArch: %{nodejs_arches} noarch - nodejs-umask ExclusiveArch: %{nodejs_arches} noarch - nodejs-unc-path-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unicode-length ExclusiveArch: %{nodejs_arches} noarch - nodejs-union-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-unique-filename ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-slug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-unpipe ExclusiveArch: %{nodejs_arches} noarch - nodejs-unset-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-urix ExclusiveArch: %{nodejs_arches} noarch - nodejs-use ExclusiveArch: %{nodejs_arches} noarch - nodejs-user-home ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-inspect ExclusiveArch: %{nodejs_arches} noarch - nodejs-uuid ExclusiveArch: %{nodejs_arches} noarch - nodejs-vali-date ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-validate-npm-package-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-vlq ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-walker ExclusiveArch: %{nodejs_arches} noarch - nodejs-ware ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-warning-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-watershed ExclusiveArch: %{nodejs_arches} noarch - nodejs-wbuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-wcwidth ExclusiveArch: %{nodejs_arches} noarch - nodejs-when ExclusiveArch: %{nodejs_arches} noarch - nodejs-whet-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-win-spawn ExclusiveArch: %{nodejs_arches} noarch - nodejs-window-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wolfy87-eventemitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-woothee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wordwrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrap-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-wrap-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrappy ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-file-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-ws ExclusiveArch: %{nodejs_arches} noarch - nodejs-xdg-basedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlhttprequest ExclusiveArch: %{nodejs_arches} noarch - nodejs-y18n ExclusiveArch: %{nodejs_arches} noarch - nodejs-yallist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yapool ExclusiveArch: %{nodejs_arches} noarch - nodejs-yargs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yargs-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-yeast ExclusiveArch: %{nodejs_arches} noarch - nodejs-yn ExclusiveArch: %{nodejs_arches} noarch - nodejs-zeropad ExclusiveArch: %{nodejs_arches} noarch - nodeunit ExclusiveArch: %{nodejs_arches} noarch - notify-sharp ExclusiveArch: %{mono_arches} - notify-sharp3 ExclusiveArch: %{mono_arches} - nuget ExclusiveArch: %{mono_arches} - numatop ExclusiveArch: x86_64 ppc64le - nunit ExclusiveArch: %{mono_arches} - nunit2 ExclusiveArch: %{mono_arches} - nvml ExclusiveArch: x86_64 ppc64le - nwchem ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - obs-service-rust2rpm ExclusiveArch: %{rust_arches} noarch - oci-kvm-hook ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-seccomp-bpf-hook ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl - oci-umount ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - oidn ExclusiveArch: x86_64 - olpc-kbdshim ExclusiveArch: %{ix86} %{arm} - olpc-netutils ExclusiveArch: %{ix86} %{arm} - olpc-utils ExclusiveArch: %{ix86} %{arm} - onednn ExclusiveArch: x86_64 aarch64 ppc64le - onedrive ExclusiveArch: %{ldc_arches} - opae ExclusiveArch: x86_64 - opal-prd ExclusiveArch: ppc64le - open-vm-tools ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 - openblas ExclusiveArch: %{openblas_arches} - openjfx ExclusiveArch: x86_64 - openjfx8 ExclusiveArch: x86_64 - openlibm ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64} - openni ExclusiveArch: %{ix86} x86_64 %{arm} - openni-primesense ExclusiveArch: %{ix86} x86_64 %{arm} - openshadinglanguage ExclusiveArch: x86_64 aarch64 ppc64le s390x - openssl-ibmca ExclusiveArch: s390 s390x - origin ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - orion ExclusiveArch: %{qt5_qtwebengine_arches} - orthorobot ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - paflib ExclusiveArch: ppc %{power64} - parsec ExclusiveArch: %{rust_arches} - parsec-tool ExclusiveArch: %{rust_arches} - pcc ExclusiveArch: %{ix86} x86_64 - pcmciautils ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} - pdfmod ExclusiveArch: %mono_arches - perl-Dumbbench ExclusiveArch: %{ix86} x86_64 noarch - perl-Parse-DMIDecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - pesign ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm} - pesign-test-app ExclusiveArch: x86_64 - pinta ExclusiveArch: %mono_arches - pioneer ExclusiveArch: %{ix86} x86_64 - pmdk-convert ExclusiveArch: x86_64 - pmemkv ExclusiveArch: x86_64 - poppler-sharp ExclusiveArch: %mono_arches - popub ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - powerpc-utils ExclusiveArch: ppc %{power64} - ppc64-diag ExclusiveArch: ppc %{power64} - psi-plus ExclusiveArch: %{qt5_qtwebengine_arches} - pveclib ExclusiveArch: ppc %{power64} - pvs-sbcl ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - pyqtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - python-etcd ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - python-healpy ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-javabridge ExclusiveArch: i686 x86_64 - python-openoffice ExclusiveArch: noarch x86_64 - python-pymoc ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-rpi-gpio ExclusiveArch: %{arm} aarch64 - q4wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - qcint ExclusiveArch: x86_64 - qclib ExclusiveArch: s390 s390x - qemu-sanity-check ExclusiveArch: %{kernel_arches} - qevercloud ExclusiveArch: %{qt5_qtwebengine_arches} - qmapshack ExclusiveArch: %{qt5_qtwebengine_arches} - qt4pas ExclusiveArch: %{fpc_arches} - qt5-qtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - quantum-espresso ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} - quentier ExclusiveArch: %{qt5_qtwebengine_arches} - rear ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 - redhat-lsb ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - reg ExclusiveArch: x86_64 - renderdoc ExclusiveArch: x86_64 - reptyr ExclusiveArch: %{ix86} x86_64 %{arm} - rescene ExclusiveArch: %{mono_arches} - restsharp ExclusiveArch: %{mono_arches} - rhythmbox-alternative-toolbar ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le - rmd ExclusiveArch: %{ix86} x86_64 - rocm-runtime ExclusiveArch: x86_64 aarch64 - rocminfo ExclusiveArch: x86_64 aarch64 - rpm-ostree ExclusiveArch: %{rust_arches} - rr ExclusiveArch: %{ix86} x86_64 - rssguard ExclusiveArch: %{qt5_qtwebengine_arches} - rubygem-childprocess ExclusiveArch: %{ix86} x86_64 noarch - runc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x - rust ExclusiveArch: %{rust_arches} - rust-ab_glyph_rasterizer ExclusiveArch: %{rust_arches} - rust-abomonation ExclusiveArch: %{rust_arches} - rust-actix ExclusiveArch: %{rust_arches} - rust-actix-codec ExclusiveArch: %{rust_arches} - rust-actix-connect ExclusiveArch: %{rust_arches} - rust-actix-files ExclusiveArch: %{rust_arches} - rust-actix-http ExclusiveArch: %{rust_arches} - rust-actix-macros ExclusiveArch: %{rust_arches} - rust-actix-router ExclusiveArch: %{rust_arches} - rust-actix-rt ExclusiveArch: %{rust_arches} - rust-actix-server ExclusiveArch: %{rust_arches} - rust-actix-server-config ExclusiveArch: %{rust_arches} - rust-actix-service ExclusiveArch: %{rust_arches} - rust-actix-testing ExclusiveArch: %{rust_arches} - rust-actix-threadpool ExclusiveArch: %{rust_arches} - rust-actix-tls ExclusiveArch: %{rust_arches} - rust-actix-utils ExclusiveArch: %{rust_arches} - rust-actix-web ExclusiveArch: %{rust_arches} - rust-actix-web-codegen ExclusiveArch: %{rust_arches} - rust-actix_derive ExclusiveArch: %{rust_arches} - rust-addr2line ExclusiveArch: %{rust_arches} - rust-adler ExclusiveArch: %{rust_arches} - rust-adler32 ExclusiveArch: %{rust_arches} - rust-aead ExclusiveArch: %{rust_arches} - rust-aes ExclusiveArch: %{rust_arches} - rust-aes-gcm ExclusiveArch: %{rust_arches} - rust-aes-soft ExclusiveArch: %{rust_arches} - rust-afterburn ExclusiveArch: %{rust_arches} - rust-ahash ExclusiveArch: %{rust_arches} - rust-aho-corasick ExclusiveArch: %{rust_arches} - rust-alacritty ExclusiveArch: %{rust_arches} - rust-alacritty_terminal ExclusiveArch: %{rust_arches} - rust-alga ExclusiveArch: %{rust_arches} - rust-alga_derive ExclusiveArch: %{rust_arches} - rust-alloc-no-stdlib ExclusiveArch: %{rust_arches} - rust-alloc-stdlib ExclusiveArch: %{rust_arches} - rust-alphanumeric-sort ExclusiveArch: %{rust_arches} - rust-ammonia ExclusiveArch: %{rust_arches} - rust-andrew ExclusiveArch: %{rust_arches} - rust-ansi_colours ExclusiveArch: %{rust_arches} - rust-ansi_term ExclusiveArch: %{rust_arches} - rust-ansi_term0.11 ExclusiveArch: %{rust_arches} - rust-antidote ExclusiveArch: %{rust_arches} - rust-anyhow ExclusiveArch: %{rust_arches} - rust-anymap ExclusiveArch: %{rust_arches} - rust-aom-sys ExclusiveArch: %{rust_arches} - rust-app_dirs ExclusiveArch: %{rust_arches} - rust-approx ExclusiveArch: %{rust_arches} - rust-arbitrary ExclusiveArch: %{rust_arches} - rust-arc-swap ExclusiveArch: %{rust_arches} - rust-arg_enum_proc_macro ExclusiveArch: %{rust_arches} - rust-argparse ExclusiveArch: %{rust_arches} - rust-array-init ExclusiveArch: %{rust_arches} - rust-arraydeque ExclusiveArch: %{rust_arches} - rust-arrayref ExclusiveArch: %{rust_arches} - rust-arrayvec ExclusiveArch: %{rust_arches} - rust-article_scraper ExclusiveArch: %{rust_arches} - rust-ascii ExclusiveArch: %{rust_arches} - rust-askalono ExclusiveArch: %{rust_arches} - rust-askalono-cli ExclusiveArch: %{rust_arches} - rust-askama ExclusiveArch: %{rust_arches} - rust-askama_derive ExclusiveArch: %{rust_arches} - rust-askama_escape ExclusiveArch: %{rust_arches} - rust-askama_shared ExclusiveArch: %{rust_arches} - rust-assert-json-diff ExclusiveArch: %{rust_arches} - rust-assert_cli ExclusiveArch: %{rust_arches} - rust-assert_cmd ExclusiveArch: %{rust_arches} - rust-assert_fs ExclusiveArch: %{rust_arches} - rust-assert_matches ExclusiveArch: %{rust_arches} - rust-async-attributes ExclusiveArch: %{rust_arches} - rust-async-compression ExclusiveArch: %{rust_arches} - rust-async-task ExclusiveArch: %{rust_arches} - rust-async-trait ExclusiveArch: %{rust_arches} - rust-asyncgit ExclusiveArch: %{rust_arches} - rust-atk ExclusiveArch: %{rust_arches} - rust-atk-sys ExclusiveArch: %{rust_arches} - rust-atom ExclusiveArch: %{rust_arches} - rust-atomicwrites ExclusiveArch: %{rust_arches} - rust-attohttpc ExclusiveArch: %{rust_arches} - rust-atty ExclusiveArch: %{rust_arches} - rust-autocfg ExclusiveArch: %{rust_arches} - rust-average ExclusiveArch: %{rust_arches} - rust-awc ExclusiveArch: %{rust_arches} - rust-backtrace ExclusiveArch: %{rust_arches} - rust-backtrace-sys ExclusiveArch: %{rust_arches} - rust-base100 ExclusiveArch: %{rust_arches} - rust-base64 ExclusiveArch: %{rust_arches} - rust-base64-0.10 ExclusiveArch: %{rust_arches} - rust-base64-0.11 ExclusiveArch: %{rust_arches} - rust-base64_0.12 ExclusiveArch: %{rust_arches} - rust-bat ExclusiveArch: %{rust_arches} - rust-battery ExclusiveArch: %{rust_arches} - rust-bencher ExclusiveArch: %{rust_arches} - rust-better-panic ExclusiveArch: %{rust_arches} - rust-bincode ExclusiveArch: %{rust_arches} - rust-bincode0.8 ExclusiveArch: %{rust_arches} - rust-bindgen ExclusiveArch: %{rust_arches} - rust-binfarce ExclusiveArch: %{rust_arches} - rust-biscuit ExclusiveArch: %{rust_arches} - rust-bit-set ExclusiveArch: %{rust_arches} - rust-bit-vec ExclusiveArch: %{rust_arches} - rust-bitfield ExclusiveArch: %{rust_arches} - rust-bitflags ExclusiveArch: %{rust_arches} - rust-bitmaps ExclusiveArch: %{rust_arches} - rust-bitstream-io ExclusiveArch: %{rust_arches} - rust-blake2 ExclusiveArch: %{rust_arches} - rust-blobby ExclusiveArch: %{rust_arches} - rust-blobby0.1 ExclusiveArch: %{rust_arches} - rust-block-buffer ExclusiveArch: %{rust_arches} - rust-block-buffer0.7 ExclusiveArch: %{rust_arches} - rust-block-cipher ExclusiveArch: %{rust_arches} - rust-block-cipher-trait ExclusiveArch: %{rust_arches} - rust-block-modes ExclusiveArch: %{rust_arches} - rust-block-padding ExclusiveArch: %{rust_arches} - rust-blsctl ExclusiveArch: %{rust_arches} - rust-bodhi ExclusiveArch: %{rust_arches} - rust-bodhi-cli ExclusiveArch: %{rust_arches} - rust-bootupd ExclusiveArch: x86_64 aarch64 - rust-box_drawing ExclusiveArch: %{rust_arches} - rust-brev ExclusiveArch: %{rust_arches} - rust-brotli ExclusiveArch: %{rust_arches} - rust-brotli-decompressor ExclusiveArch: %{rust_arches} - rust-brotli-sys ExclusiveArch: %{rust_arches} - rust-brotli2 ExclusiveArch: %{rust_arches} - rust-bstr ExclusiveArch: %{rust_arches} - rust-buf-min ExclusiveArch: %{rust_arches} - rust-buf_redux ExclusiveArch: %{rust_arches} - rust-bufstream ExclusiveArch: %{rust_arches} - rust-build_const ExclusiveArch: %{rust_arches} - rust-bumpalo ExclusiveArch: %{rust_arches} - rust-byte-tools ExclusiveArch: %{rust_arches} - rust-byte-unit ExclusiveArch: %{rust_arches} - rust-bytecount ExclusiveArch: %{rust_arches} - rust-bytelines ExclusiveArch: %{rust_arches} - rust-bytemuck ExclusiveArch: %{rust_arches} - rust-byteorder ExclusiveArch: %{rust_arches} - rust-bytes ExclusiveArch: %{rust_arches} - rust-bytes0.3 ExclusiveArch: %{rust_arches} - rust-bytes0.4 ExclusiveArch: %{rust_arches} - rust-bytes0.5 ExclusiveArch: %{rust_arches} - rust-bytesize ExclusiveArch: %{rust_arches} - rust-bytestring ExclusiveArch: %{rust_arches} - rust-bzip2 ExclusiveArch: %{rust_arches} - rust-bzip2-sys ExclusiveArch: %{rust_arches} - rust-c2-chacha ExclusiveArch: %{rust_arches} - rust-c_vec ExclusiveArch: %{rust_arches} - rust-cairo-rs ExclusiveArch: %{rust_arches} - rust-cairo-sys-rs ExclusiveArch: %{rust_arches} - rust-calloop ExclusiveArch: %{rust_arches} - rust-caps ExclusiveArch: %{rust_arches} - rust-cargo ExclusiveArch: %{rust_arches} - rust-cargo-bloat ExclusiveArch: %{rust_arches} - rust-cargo-c ExclusiveArch: %{rust_arches} - rust-cargo-husky ExclusiveArch: %{rust_arches} - rust-cargo-insta ExclusiveArch: %{rust_arches} - rust-cargo-platform ExclusiveArch: %{rust_arches} - rust-cargo-readme ExclusiveArch: %{rust_arches} - rust-cargo_metadata ExclusiveArch: %{rust_arches} - rust-cassowary ExclusiveArch: %{rust_arches} - rust-cast ExclusiveArch: %{rust_arches} - rust-cbindgen ExclusiveArch: %{rust_arches} - rust-cc ExclusiveArch: %{rust_arches} - rust-cedarwood ExclusiveArch: %{rust_arches} - rust-cexpr ExclusiveArch: %{rust_arches} - rust-cfg-if ExclusiveArch: %{rust_arches} - rust-cfg-if0.1 ExclusiveArch: %{rust_arches} - rust-chainerror ExclusiveArch: %{rust_arches} - rust-charset ExclusiveArch: %{rust_arches} - rust-chbs ExclusiveArch: %{rust_arches} - rust-checked_int_cast ExclusiveArch: %{rust_arches} - rust-choosier ExclusiveArch: %{rust_arches} - rust-chrono ExclusiveArch: %{rust_arches} - rust-chrono-humanize ExclusiveArch: %{rust_arches} - rust-chrono-tz ExclusiveArch: %{rust_arches} - rust-chunked_transfer ExclusiveArch: %{rust_arches} - rust-cipher ExclusiveArch: %{rust_arches} - rust-clang-sys ExclusiveArch: %{rust_arches} - rust-clap ExclusiveArch: %{rust_arches} - rust-clicolors-control ExclusiveArch: %{rust_arches} - rust-cmake ExclusiveArch: %{rust_arches} - rust-color-backtrace ExclusiveArch: %{rust_arches} - rust-color_quant ExclusiveArch: %{rust_arches} - rust-colored ExclusiveArch: %{rust_arches} - rust-colored1 ExclusiveArch: %{rust_arches} - rust-colored_json ExclusiveArch: %{rust_arches} - rust-compiletest_rs ExclusiveArch: %{rust_arches} - rust-comrak ExclusiveArch: %{rust_arches} - rust-config ExclusiveArch: %{rust_arches} - rust-console ExclusiveArch: %{rust_arches} - rust-console0.11 ExclusiveArch: %{rust_arches} - rust-console0.12 ExclusiveArch: %{rust_arches} - rust-console0.9 ExclusiveArch: %{rust_arches} - rust-const-random ExclusiveArch: %{rust_arches} - rust-const-random-macro ExclusiveArch: %{rust_arches} - rust-const_fn ExclusiveArch: %{rust_arches} - rust-content_inspector ExclusiveArch: %{rust_arches} - rust-conv ExclusiveArch: %{rust_arches} - rust-cookie ExclusiveArch: %{rust_arches} - rust-cookie_store ExclusiveArch: %{rust_arches} - rust-copydeps ExclusiveArch: %{rust_arches} - rust-copyless ExclusiveArch: %{rust_arches} - rust-copypasta ExclusiveArch: %{rust_arches} - rust-coreos-installer ExclusiveArch: %{rust_arches} - rust-cpio ExclusiveArch: %{rust_arches} - rust-cpp_demangle ExclusiveArch: %{rust_arches} - rust-cpuid-bool ExclusiveArch: %{rust_arches} - rust-crates-io ExclusiveArch: %{rust_arches} - rust-crc ExclusiveArch: %{rust_arches} - rust-crc-any ExclusiveArch: %{rust_arches} - rust-crc-core ExclusiveArch: %{rust_arches} - rust-crc32fast ExclusiveArch: %{rust_arches} - rust-criterion ExclusiveArch: %{rust_arches} - rust-criterion-plot ExclusiveArch: %{rust_arches} - rust-crossbeam ExclusiveArch: %{rust_arches} - rust-crossbeam-channel ExclusiveArch: %{rust_arches} - rust-crossbeam-channel0.4 ExclusiveArch: %{rust_arches} - rust-crossbeam-deque ExclusiveArch: %{rust_arches} - rust-crossbeam-deque0.7 ExclusiveArch: %{rust_arches} - rust-crossbeam-epoch ExclusiveArch: %{rust_arches} - rust-crossbeam-epoch0.8 ExclusiveArch: %{rust_arches} - rust-crossbeam-queue ExclusiveArch: %{rust_arches} - rust-crossbeam-queue0.2 ExclusiveArch: %{rust_arches} - rust-crossbeam-utils ExclusiveArch: %{rust_arches} - rust-crossbeam-utils0.7 ExclusiveArch: %{rust_arches} - rust-crossbeam0.7 ExclusiveArch: %{rust_arches} - rust-crossfont ExclusiveArch: %{rust_arches} - rust-crossterm ExclusiveArch: %{rust_arches} - rust-crossterm0.17 ExclusiveArch: %{rust_arches} - rust-crypto-hash ExclusiveArch: %{rust_arches} - rust-crypto-mac ExclusiveArch: %{rust_arches} - rust-crypto-mac0.8 ExclusiveArch: %{rust_arches} - rust-cryptovec ExclusiveArch: %{rust_arches} - rust-cssparser ExclusiveArch: %{rust_arches} - rust-cssparser-macros ExclusiveArch: %{rust_arches} - rust-csv ExclusiveArch: %{rust_arches} - rust-csv-core ExclusiveArch: %{rust_arches} - rust-ctr ExclusiveArch: %{rust_arches} - rust-ctrlc ExclusiveArch: %{rust_arches} - rust-curl ExclusiveArch: %{rust_arches} - rust-curl-sys ExclusiveArch: %{rust_arches} - rust-custom_derive ExclusiveArch: %{rust_arches} - rust-darling ExclusiveArch: %{rust_arches} - rust-darling_core ExclusiveArch: %{rust_arches} - rust-darling_macro ExclusiveArch: %{rust_arches} - rust-dashmap ExclusiveArch: %{rust_arches} - rust-data-encoding ExclusiveArch: %{rust_arches} - rust-data-url ExclusiveArch: %{rust_arches} - rust-datetime ExclusiveArch: %{rust_arches} - rust-dav1d-sys ExclusiveArch: %{rust_arches} - rust-dbus ExclusiveArch: %{rust_arches} - rust-dbus-codegen ExclusiveArch: %{rust_arches} - rust-dbus-crossroads ExclusiveArch: %{rust_arches} - rust-dbus0.2 ExclusiveArch: %{rust_arches} - rust-dbus0.6 ExclusiveArch: %{rust_arches} - rust-dbus0.8 ExclusiveArch: %{rust_arches} - rust-debug-helper ExclusiveArch: %{rust_arches} - rust-decimal ExclusiveArch: %{rust_arches} - rust-deflate ExclusiveArch: %{rust_arches} - rust-defmac ExclusiveArch: %{rust_arches} - rust-delta_e ExclusiveArch: %{rust_arches} - rust-derivative ExclusiveArch: %{rust_arches} - rust-derive_arbitrary ExclusiveArch: %{rust_arches} - rust-derive_builder ExclusiveArch: %{rust_arches} - rust-derive_builder_core ExclusiveArch: %{rust_arches} - rust-derive_more ExclusiveArch: %{rust_arches} - rust-des ExclusiveArch: %{rust_arches} - rust-desed ExclusiveArch: %{rust_arches} - rust-deunicode ExclusiveArch: %{rust_arches} - rust-devicemapper ExclusiveArch: %{rust_arches} - rust-dialoguer ExclusiveArch: %{rust_arches} - rust-diesel ExclusiveArch: %{rust_arches} - rust-diesel_derives ExclusiveArch: %{rust_arches} - rust-diesel_migrations ExclusiveArch: %{rust_arches} - rust-diff ExclusiveArch: %{rust_arches} - rust-difference ExclusiveArch: %{rust_arches} - rust-digest ExclusiveArch: %{rust_arches} - rust-digest0.8 ExclusiveArch: %{rust_arches} - rust-directories ExclusiveArch: %{rust_arches} - rust-dirs ExclusiveArch: %{rust_arches} - rust-dirs-sys ExclusiveArch: %{rust_arches} - rust-dirs2 ExclusiveArch: %{rust_arches} - rust-diskonaut ExclusiveArch: %{rust_arches} - rust-dissimilar ExclusiveArch: %{rust_arches} - rust-dlib ExclusiveArch: %{rust_arches} - rust-dlv-list ExclusiveArch: %{rust_arches} - rust-dns-lookup ExclusiveArch: %{rust_arches} - rust-dns-parser ExclusiveArch: %{rust_arches} - rust-doc-comment ExclusiveArch: %{rust_arches} - rust-docmatic ExclusiveArch: %{rust_arches} - rust-docopt ExclusiveArch: %{rust_arches} - rust-dotenv ExclusiveArch: %{rust_arches} - rust-downcast-rs ExclusiveArch: %{rust_arches} - rust-dtoa ExclusiveArch: %{rust_arches} - rust-dtoa-short ExclusiveArch: %{rust_arches} - rust-dua-cli ExclusiveArch: %{rust_arches} - rust-duct ExclusiveArch: %{rust_arches} - rust-dunce ExclusiveArch: %{rust_arches} - rust-dutree ExclusiveArch: %{rust_arches} - rust-edit-distance ExclusiveArch: %{rust_arches} - rust-either ExclusiveArch: %{rust_arches} - rust-elasticlunr-rs ExclusiveArch: %{rust_arches} - rust-encode_unicode ExclusiveArch: %{rust_arches} - rust-encoding ExclusiveArch: %{rust_arches} - rust-encoding-index-japanese ExclusiveArch: %{rust_arches} - rust-encoding-index-korean ExclusiveArch: %{rust_arches} - rust-encoding-index-simpchinese ExclusiveArch: %{rust_arches} - rust-encoding-index-singlebyte ExclusiveArch: %{rust_arches} - rust-encoding-index-tradchinese ExclusiveArch: %{rust_arches} - rust-encoding_index_tests ExclusiveArch: %{rust_arches} - rust-encoding_rs ExclusiveArch: %{rust_arches} - rust-encoding_rs_io ExclusiveArch: %{rust_arches} - rust-entities ExclusiveArch: %{rust_arches} - rust-enum-as-inner ExclusiveArch: %{rust_arches} - rust-enum_primitive ExclusiveArch: %{rust_arches} - rust-enumflags2 ExclusiveArch: %{rust_arches} - rust-enumflags2_derive ExclusiveArch: %{rust_arches} - rust-env_logger ExclusiveArch: %{rust_arches} - rust-env_logger0.4 ExclusiveArch: %{rust_arches} - rust-env_logger0.5 ExclusiveArch: %{rust_arches} - rust-env_logger0.6 ExclusiveArch: %{rust_arches} - rust-env_logger0.7 ExclusiveArch: %{rust_arches} - rust-environment ExclusiveArch: %{rust_arches} - rust-envsubst ExclusiveArch: %{rust_arches} - rust-erased-serde ExclusiveArch: %{rust_arches} - rust-err-derive ExclusiveArch: %{rust_arches} - rust-errln ExclusiveArch: %{rust_arches} - rust-errno ExclusiveArch: %{rust_arches} - rust-error-chain ExclusiveArch: %{rust_arches} - rust-escaper ExclusiveArch: %{rust_arches} - rust-escargot ExclusiveArch: %{rust_arches} - rust-euclid ExclusiveArch: %{rust_arches} - rust-exa ExclusiveArch: %{rust_arches} - rust-expat-sys ExclusiveArch: %{rust_arches} - rust-extend ExclusiveArch: %{rust_arches} - rust-extprim ExclusiveArch: %{rust_arches} - rust-extprim_literals_macros ExclusiveArch: %{rust_arches} - rust-fail ExclusiveArch: %{rust_arches} - rust-failure ExclusiveArch: %{rust_arches} - rust-failure-tools ExclusiveArch: %{rust_arches} - rust-failure_derive ExclusiveArch: %{rust_arches} - rust-fake ExclusiveArch: %{rust_arches} - rust-fake-simd ExclusiveArch: %{rust_arches} - rust-fake_clock ExclusiveArch: %{rust_arches} - rust-fallible-iterator ExclusiveArch: %{rust_arches} - rust-fastrand ExclusiveArch: %{rust_arches} - rust-fd-find ExclusiveArch: %{rust_arches} - rust-fdlimit ExclusiveArch: %{rust_arches} - rust-fedora ExclusiveArch: %{rust_arches} - rust-fedora-coreos-pinger ExclusiveArch: %{rust_arches} - rust-fedora-update-feedback ExclusiveArch: %{rust_arches} - rust-feed-rs ExclusiveArch: %{rust_arches} - rust-feedbin_api ExclusiveArch: %{rust_arches} - rust-feedly_api ExclusiveArch: %{rust_arches} - rust-fern ExclusiveArch: %{rust_arches} - rust-fever_api ExclusiveArch: %{rust_arches} - rust-ffsend ExclusiveArch: %{rust_arches} - rust-ffsend-api ExclusiveArch: %{rust_arches} - rust-filesize ExclusiveArch: %{rust_arches} - rust-filetime ExclusiveArch: %{rust_arches} - rust-findshlibs ExclusiveArch: %{rust_arches} - rust-fixedbitset ExclusiveArch: %{rust_arches} - rust-flame ExclusiveArch: %{rust_arches} - rust-flate2 ExclusiveArch: %{rust_arches} - rust-float-cmp ExclusiveArch: %{rust_arches} - rust-float-cmp0.6 ExclusiveArch: %{rust_arches} - rust-float-ord ExclusiveArch: %{rust_arches} - rust-flume ExclusiveArch: %{rust_arches} - rust-fnv ExclusiveArch: %{rust_arches} - rust-font-kit ExclusiveArch: %{rust_arches} - rust-foreign-types ExclusiveArch: %{rust_arches} - rust-foreign-types-macros ExclusiveArch: %{rust_arches} - rust-foreign-types-shared ExclusiveArch: %{rust_arches} - rust-foreign-types-shared0.1 ExclusiveArch: %{rust_arches} - rust-foreign-types0.3 ExclusiveArch: %{rust_arches} - rust-form_urlencoded ExclusiveArch: %{rust_arches} - rust-fragile ExclusiveArch: %{rust_arches} - rust-freetype ExclusiveArch: %{rust_arches} - rust-freetype-rs ExclusiveArch: %{rust_arches} - rust-freetype-sys ExclusiveArch: %{rust_arches} - rust-fs2 ExclusiveArch: %{rust_arches} - rust-fs_extra ExclusiveArch: %{rust_arches} - rust-fuse ExclusiveArch: %{rust_arches} - rust-futf ExclusiveArch: %{rust_arches} - rust-futures ExclusiveArch: %{rust_arches} - rust-futures-channel ExclusiveArch: %{rust_arches} - rust-futures-core ExclusiveArch: %{rust_arches} - rust-futures-cpupool ExclusiveArch: %{rust_arches} - rust-futures-executor ExclusiveArch: %{rust_arches} - rust-futures-io ExclusiveArch: %{rust_arches} - rust-futures-macro ExclusiveArch: %{rust_arches} - rust-futures-sink ExclusiveArch: %{rust_arches} - rust-futures-task ExclusiveArch: %{rust_arches} - rust-futures-timer ExclusiveArch: %{rust_arches} - rust-futures-util ExclusiveArch: %{rust_arches} - rust-futures0.1 ExclusiveArch: %{rust_arches} - rust-fuzzy-matcher ExclusiveArch: %{rust_arches} - rust-fxhash ExclusiveArch: %{rust_arches} - rust-gcsf ExclusiveArch: %{rust_arches} - rust-gdk ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf-sys ExclusiveArch: %{rust_arches} - rust-gdk-sys ExclusiveArch: %{rust_arches} - rust-generic-array ExclusiveArch: %{rust_arches} - rust-generic-array0.12 ExclusiveArch: %{rust_arches} - rust-getch ExclusiveArch: %{rust_arches} - rust-gethostname ExclusiveArch: %{rust_arches} - rust-getopts ExclusiveArch: %{rust_arches} - rust-getrandom ExclusiveArch: %{rust_arches} - rust-getrandom0.1 ExclusiveArch: %{rust_arches} - rust-gettext-rs ExclusiveArch: %{rust_arches} - rust-gettext-sys ExclusiveArch: %{rust_arches} - rust-ghash ExclusiveArch: %{rust_arches} - rust-gif ExclusiveArch: %{rust_arches} - rust-gif0.10 ExclusiveArch: %{rust_arches} - rust-gimli ExclusiveArch: %{rust_arches} - rust-gio ExclusiveArch: %{rust_arches} - rust-gio-sys ExclusiveArch: %{rust_arches} - rust-gir-format-check ExclusiveArch: %{rust_arches} - rust-git-delta ExclusiveArch: %{rust_arches} - rust-git2 ExclusiveArch: %{rust_arches} - rust-git2-curl ExclusiveArch: %{rust_arches} - rust-gitui ExclusiveArch: %{rust_arches} - rust-gl_generator ExclusiveArch: %{rust_arches} - rust-glib ExclusiveArch: %{rust_arches} - rust-glib-macros ExclusiveArch: %{rust_arches} - rust-glib-sys ExclusiveArch: %{rust_arches} - rust-glob ExclusiveArch: %{rust_arches} - rust-globset ExclusiveArch: %{rust_arches} - rust-globwalk ExclusiveArch: %{rust_arches} - rust-glutin ExclusiveArch: %{rust_arches} - rust-glutin_egl_sys ExclusiveArch: %{rust_arches} - rust-glutin_glx_sys ExclusiveArch: %{rust_arches} - rust-gobject-sys ExclusiveArch: %{rust_arches} - rust-goblin ExclusiveArch: %{rust_arches} - rust-google-drive3-fork ExclusiveArch: %{rust_arches} - rust-gptman ExclusiveArch: %{rust_arches} - rust-grep ExclusiveArch: %{rust_arches} - rust-grep-cli ExclusiveArch: %{rust_arches} - rust-grep-matcher ExclusiveArch: %{rust_arches} - rust-grep-pcre2 ExclusiveArch: %{rust_arches} - rust-grep-printer ExclusiveArch: %{rust_arches} - rust-grep-regex ExclusiveArch: %{rust_arches} - rust-grep-searcher ExclusiveArch: %{rust_arches} - rust-groupable ExclusiveArch: %{rust_arches} - rust-gspell ExclusiveArch: %{rust_arches} - rust-gspell-sys ExclusiveArch: %{rust_arches} - rust-gstreamer ExclusiveArch: %{rust_arches} - rust-gstreamer-audio ExclusiveArch: %{rust_arches} - rust-gstreamer-audio-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-base ExclusiveArch: %{rust_arches} - rust-gstreamer-base-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-editing-services ExclusiveArch: %{rust_arches} - rust-gstreamer-editing-services-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-pbutils ExclusiveArch: %{rust_arches} - rust-gstreamer-pbutils-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-player ExclusiveArch: %{rust_arches} - rust-gstreamer-player-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-video ExclusiveArch: %{rust_arches} - rust-gstreamer-video-sys ExclusiveArch: %{rust_arches} - rust-gtk ExclusiveArch: %{rust_arches} - rust-gtk-macros ExclusiveArch: %{rust_arches} - rust-gtk-rs-lgpl-docs ExclusiveArch: %{rust_arches} - rust-gtk-source-sys ExclusiveArch: %{rust_arches} - rust-gtk-sys ExclusiveArch: %{rust_arches} - rust-gzip-header ExclusiveArch: %{rust_arches} - rust-h2 ExclusiveArch: %{rust_arches} - rust-half ExclusiveArch: %{rust_arches} - rust-hamcrest ExclusiveArch: %{rust_arches} - rust-handlebars ExclusiveArch: %{rust_arches} - rust-hashbrown ExclusiveArch: %{rust_arches} - rust-headers ExclusiveArch: %{rust_arches} - rust-headers-core ExclusiveArch: %{rust_arches} - rust-headers-derive ExclusiveArch: %{rust_arches} - rust-heapsize ExclusiveArch: %{rust_arches} - rust-heck ExclusiveArch: %{rust_arches} - rust-hex ExclusiveArch: %{rust_arches} - rust-hex-literal ExclusiveArch: %{rust_arches} - rust-hex-literal-impl ExclusiveArch: %{rust_arches} - rust-hex-literal0.2 ExclusiveArch: %{rust_arches} - rust-hexyl ExclusiveArch: %{rust_arches} - rust-hkdf ExclusiveArch: %{rust_arches} - rust-hmac ExclusiveArch: %{rust_arches} - rust-home ExclusiveArch: %{rust_arches} - rust-horrorshow ExclusiveArch: %{rust_arches} - rust-hostname ExclusiveArch: %{rust_arches} - rust-hostname-validator ExclusiveArch: %{rust_arches} - rust-html2pango ExclusiveArch: %{rust_arches} - rust-html5ever ExclusiveArch: %{rust_arches} - rust-http ExclusiveArch: %{rust_arches} - rust-http-body ExclusiveArch: %{rust_arches} - rust-http0.1 ExclusiveArch: %{rust_arches} - rust-httparse ExclusiveArch: %{rust_arches} - rust-httpdate ExclusiveArch: %{rust_arches} - rust-humansize ExclusiveArch: %{rust_arches} - rust-humantime ExclusiveArch: %{rust_arches} - rust-humantime1 ExclusiveArch: %{rust_arches} - rust-hyper ExclusiveArch: %{rust_arches} - rust-hyper-native-tls ExclusiveArch: %{rust_arches} - rust-hyper-staticfile ExclusiveArch: %{rust_arches} - rust-hyper-tls ExclusiveArch: %{rust_arches} - rust-hyper0.10 ExclusiveArch: %{rust_arches} - rust-hyperfine ExclusiveArch: %{rust_arches} - rust-i3ipc ExclusiveArch: %{rust_arches} - rust-id_tree ExclusiveArch: %{rust_arches} - rust-ident_case ExclusiveArch: %{rust_arches} - rust-idna ExclusiveArch: %{rust_arches} - rust-idna0.1 ExclusiveArch: %{rust_arches} - rust-ignore ExclusiveArch: %{rust_arches} - rust-im-rc ExclusiveArch: %{rust_arches} - rust-image ExclusiveArch: %{rust_arches} - rust-imgref ExclusiveArch: %{rust_arches} - rust-indexmap ExclusiveArch: %{rust_arches} - rust-indicatif ExclusiveArch: %{rust_arches} - rust-inflate ExclusiveArch: %{rust_arches} - rust-inotify ExclusiveArch: %{rust_arches} - rust-inotify-sys ExclusiveArch: %{rust_arches} - rust-input_buffer ExclusiveArch: %{rust_arches} - rust-insta ExclusiveArch: %{rust_arches} - rust-instant ExclusiveArch: %{rust_arches} - rust-interpolate_name ExclusiveArch: %{rust_arches} - rust-intervaltree ExclusiveArch: %{rust_arches} - rust-invalidstring ExclusiveArch: %{rust_arches} - rust-iovec ExclusiveArch: %{rust_arches} - rust-ipnet ExclusiveArch: %{rust_arches} - rust-ipnetwork ExclusiveArch: %{rust_arches} - rust-iron ExclusiveArch: %{rust_arches} - rust-isahc ExclusiveArch: %{rust_arches} - rust-iso8601 ExclusiveArch: %{rust_arches} - rust-iter-read ExclusiveArch: %{rust_arches} - rust-itertools ExclusiveArch: %{rust_arches} - rust-itertools-num ExclusiveArch: %{rust_arches} - rust-itertools0.8 ExclusiveArch: %{rust_arches} - rust-itoa ExclusiveArch: %{rust_arches} - rust-ivf ExclusiveArch: %{rust_arches} - rust-javascriptcore-rs ExclusiveArch: %{rust_arches} - rust-javascriptcore-rs-sys ExclusiveArch: %{rust_arches} - rust-jetscii ExclusiveArch: %{rust_arches} - rust-jieba-rs ExclusiveArch: %{rust_arches} - rust-jobserver ExclusiveArch: %{rust_arches} - rust-jpeg-decoder ExclusiveArch: %{rust_arches} - rust-jql ExclusiveArch: %{rust_arches} - rust-js-sys ExclusiveArch: %{rust_arches} - rust-json ExclusiveArch: %{rust_arches} - rust-jwalk ExclusiveArch: %{rust_arches} - rust-keccak ExclusiveArch: %{rust_arches} - rust-khronos_api ExclusiveArch: %{rust_arches} - rust-kstring ExclusiveArch: %{rust_arches} - rust-kv-log-macro ExclusiveArch: %{rust_arches} - rust-lab ExclusiveArch: %{rust_arches} - rust-language-tags ExclusiveArch: %{rust_arches} - rust-lazy-init ExclusiveArch: %{rust_arches} - rust-lazy_static ExclusiveArch: %{rust_arches} - rust-lazycell ExclusiveArch: %{rust_arches} - rust-letter-avatar ExclusiveArch: %{rust_arches} - rust-lexical-core ExclusiveArch: %{rust_arches} - rust-libc ExclusiveArch: %{rust_arches} - rust-libcryptsetup-rs ExclusiveArch: %{rust_arches} - rust-libcryptsetup-rs-sys ExclusiveArch: %{rust_arches} - rust-libdbus-sys ExclusiveArch: %{rust_arches} - rust-libflate ExclusiveArch: %{rust_arches} - rust-libflate_lz77 ExclusiveArch: %{rust_arches} - rust-libgit2-sys ExclusiveArch: %{rust_arches} - rust-libhandy ExclusiveArch: %{rust_arches} - rust-libhandy-sys ExclusiveArch: %{rust_arches} - rust-libloading ExclusiveArch: %{rust_arches} - rust-libm ExclusiveArch: %{rust_arches} - rust-libmount ExclusiveArch: %{rust_arches} - rust-liboverdrop ExclusiveArch: %{rust_arches} - rust-libpulse-binding ExclusiveArch: %{rust_arches} - rust-libpulse-sys ExclusiveArch: %{rust_arches} - rust-libslirp ExclusiveArch: %{rust_arches} - rust-libslirp-sys ExclusiveArch: %{rust_arches} - rust-libsqlite3-sys ExclusiveArch: %{rust_arches} - rust-libssh2-sys ExclusiveArch: %{rust_arches} - rust-libsystemd ExclusiveArch: %{rust_arches} - rust-libudev ExclusiveArch: %{rust_arches} - rust-libudev-sys ExclusiveArch: %{rust_arches} - rust-libxml ExclusiveArch: %{rust_arches} - rust-libz-sys ExclusiveArch: %{rust_arches} - rust-line-wrap ExclusiveArch: %{rust_arches} - rust-line_drawing ExclusiveArch: %{rust_arches} - rust-linked-hash-map ExclusiveArch: %{rust_arches} - rust-linkify ExclusiveArch: %{rust_arches} - rust-lipsum ExclusiveArch: %{rust_arches} - rust-liquid ExclusiveArch: %{rust_arches} - rust-liquid-core ExclusiveArch: %{rust_arches} - rust-liquid-derive ExclusiveArch: %{rust_arches} - rust-liquid-lib ExclusiveArch: %{rust_arches} - rust-listenfd ExclusiveArch: %{rust_arches} - rust-lmdb ExclusiveArch: %{rust_arches} - rust-lmdb-sys ExclusiveArch: %{rust_arches} - rust-locale ExclusiveArch: %{rust_arches} - rust-locale_config ExclusiveArch: %{rust_arches} - rust-lock_api ExclusiveArch: %{rust_arches} - rust-lockfree ExclusiveArch: %{rust_arches} - rust-log ExclusiveArch: %{rust_arches} - rust-log-mdc ExclusiveArch: %{rust_arches} - rust-log-panics ExclusiveArch: %{rust_arches} - rust-log0.3 ExclusiveArch: %{rust_arches} - rust-log4rs ExclusiveArch: %{rust_arches} - rust-loggerv ExclusiveArch: %{rust_arches} - rust-loopdev ExclusiveArch: %{rust_arches} - rust-lru-cache ExclusiveArch: %{rust_arches} - rust-lru_time_cache ExclusiveArch: %{rust_arches} - rust-lscolors ExclusiveArch: %{rust_arches} - rust-lsd ExclusiveArch: %{rust_arches} - rust-lzma-sys ExclusiveArch: %{rust_arches} - rust-lzw ExclusiveArch: %{rust_arches} - rust-mac ExclusiveArch: %{rust_arches} - rust-macro-attr ExclusiveArch: %{rust_arches} - rust-magic-crypt ExclusiveArch: %{rust_arches} - rust-maildir ExclusiveArch: %{rust_arches} - rust-mailparse ExclusiveArch: %{rust_arches} - rust-man ExclusiveArch: %{rust_arches} - rust-maplit ExclusiveArch: %{rust_arches} - rust-markup5ever ExclusiveArch: %{rust_arches} - rust-markup5ever_rcdom ExclusiveArch: %{rust_arches} - rust-match_cfg ExclusiveArch: %{rust_arches} - rust-matches ExclusiveArch: %{rust_arches} - rust-matrixmultiply ExclusiveArch: %{rust_arches} - rust-maxminddb ExclusiveArch: %{rust_arches} - rust-maybe-uninit ExclusiveArch: %{rust_arches} - rust-mbox ExclusiveArch: %{rust_arches} - rust-md-5 ExclusiveArch: %{rust_arches} - rust-md5 ExclusiveArch: %{rust_arches} - rust-mdl ExclusiveArch: %{rust_arches} - rust-memchr ExclusiveArch: %{rust_arches} - rust-memmap ExclusiveArch: %{rust_arches} - rust-memmap2 ExclusiveArch: %{rust_arches} - rust-memoffset ExclusiveArch: %{rust_arches} - rust-memoffset0.5 ExclusiveArch: %{rust_arches} - rust-metadeps ExclusiveArch: %{rust_arches} - rust-migrations_internals ExclusiveArch: %{rust_arches} - rust-migrations_macros ExclusiveArch: %{rust_arches} - rust-mime ExclusiveArch: %{rust_arches} - rust-mime-sniffer ExclusiveArch: %{rust_arches} - rust-mime0.2 ExclusiveArch: %{rust_arches} - rust-mime_guess ExclusiveArch: %{rust_arches} - rust-mime_guess1 ExclusiveArch: %{rust_arches} - rust-miniflux_api ExclusiveArch: %{rust_arches} - rust-miniz-sys ExclusiveArch: %{rust_arches} - rust-miniz_oxide ExclusiveArch: %{rust_arches} - rust-miniz_oxide0.3 ExclusiveArch: %{rust_arches} - rust-miniz_oxide_c_api ExclusiveArch: %{rust_arches} - rust-mint ExclusiveArch: %{rust_arches} - rust-mio ExclusiveArch: %{rust_arches} - rust-mio-extras ExclusiveArch: %{rust_arches} - rust-mio-uds ExclusiveArch: %{rust_arches} - rust-mio0.6 ExclusiveArch: %{rust_arches} - rust-mktemp ExclusiveArch: %{rust_arches} - rust-mnt ExclusiveArch: %{rust_arches} - rust-mockito ExclusiveArch: %{rust_arches} - rust-modifier ExclusiveArch: %{rust_arches} - rust-muldiv ExclusiveArch: %{rust_arches} - rust-multimap ExclusiveArch: %{rust_arches} - rust-multipart ExclusiveArch: %{rust_arches} - rust-mustache ExclusiveArch: %{rust_arches} - rust-nalgebra ExclusiveArch: %{rust_arches} - rust-nasm-rs ExclusiveArch: %{rust_arches} - rust-native-tls ExclusiveArch: %{rust_arches} - rust-natord ExclusiveArch: %{rust_arches} - rust-net2 ExclusiveArch: %{rust_arches} - rust-netlink-packet-core ExclusiveArch: %{rust_arches} - rust-netlink-packet-route ExclusiveArch: %{rust_arches} - rust-netlink-packet-utils ExclusiveArch: %{rust_arches} - rust-netlink-proto ExclusiveArch: %{rust_arches} - rust-netlink-sys ExclusiveArch: %{rust_arches} - rust-netmap_sys ExclusiveArch: %{rust_arches} - rust-new_debug_unreachable ExclusiveArch: %{rust_arches} - rust-news-flash ExclusiveArch: %{rust_arches} - rust-newtype_derive ExclusiveArch: %{rust_arches} - rust-nickel ExclusiveArch: %{rust_arches} - rust-nix ExclusiveArch: %{rust_arches} - rust-nix0.14 ExclusiveArch: %{rust_arches} - rust-nix0.17 ExclusiveArch: %{rust_arches} - rust-no-panic ExclusiveArch: %{rust_arches} - rust-nodrop ExclusiveArch: %{rust_arches} - rust-nom ExclusiveArch: %{rust_arches} - rust-nom4 ExclusiveArch: %{rust_arches} - rust-noop_proc_macro ExclusiveArch: %{rust_arches} - rust-normalize-line-endings ExclusiveArch: %{rust_arches} - rust-notify ExclusiveArch: %{rust_arches} - rust-num ExclusiveArch: %{rust_arches} - rust-num-bigint ExclusiveArch: %{rust_arches} - rust-num-bigint-dig ExclusiveArch: %{rust_arches} - rust-num-complex ExclusiveArch: %{rust_arches} - rust-num-derive ExclusiveArch: %{rust_arches} - rust-num-integer ExclusiveArch: %{rust_arches} - rust-num-iter ExclusiveArch: %{rust_arches} - rust-num-rational ExclusiveArch: %{rust_arches} - rust-num-traits ExclusiveArch: %{rust_arches} - rust-num-traits0.1 ExclusiveArch: %{rust_arches} - rust-num_cpus ExclusiveArch: %{rust_arches} - rust-number_prefix ExclusiveArch: %{rust_arches} - rust-numtoa ExclusiveArch: %{rust_arches} - rust-obfstr ExclusiveArch: %{rust_arches} - rust-obfstr-impl ExclusiveArch: %{rust_arches} - rust-object ExclusiveArch: %{rust_arches} - rust-odds ExclusiveArch: %{rust_arches} - rust-oid ExclusiveArch: %{rust_arches} - rust-once_cell ExclusiveArch: %{rust_arches} - rust-onig ExclusiveArch: %{rust_arches} - rust-onig_sys ExclusiveArch: %{rust_arches} - rust-oorandom ExclusiveArch: %{rust_arches} - rust-opaque-debug ExclusiveArch: %{rust_arches} - rust-open ExclusiveArch: %{rust_arches} - rust-openat ExclusiveArch: %{rust_arches} - rust-openat-ext ExclusiveArch: %{rust_arches} - rust-opener ExclusiveArch: %{rust_arches} - rust-openssh-keys ExclusiveArch: %{rust_arches} - rust-openssl ExclusiveArch: %{rust_arches} - rust-openssl-probe ExclusiveArch: %{rust_arches} - rust-openssl-sys ExclusiveArch: %{rust_arches} - rust-ord_subset ExclusiveArch: %{rust_arches} - rust-ordered-float ExclusiveArch: %{rust_arches} - rust-ordered-multimap ExclusiveArch: %{rust_arches} - rust-os_info ExclusiveArch: %{rust_arches} - rust-os_pipe ExclusiveArch: %{rust_arches} - rust-osmesa-sys ExclusiveArch: %{rust_arches} - rust-osstrtools ExclusiveArch: %{rust_arches} - rust-ostree ExclusiveArch: %{rust_arches} - rust-ostree-sys ExclusiveArch: %{rust_arches} - rust-owned-alloc ExclusiveArch: %{rust_arches} - rust-owned_ttf_parser ExclusiveArch: %{rust_arches} - rust-owning_ref ExclusiveArch: %{rust_arches} - rust-packaging ExclusiveArch: %{rust_arches} - rust-pad ExclusiveArch: %{rust_arches} - rust-pager ExclusiveArch: %{rust_arches} - rust-palette ExclusiveArch: %{rust_arches} - rust-palette_derive ExclusiveArch: %{rust_arches} - rust-pango ExclusiveArch: %{rust_arches} - rust-pango-sys ExclusiveArch: %{rust_arches} - rust-pangocairo ExclusiveArch: %{rust_arches} - rust-pangocairo-sys ExclusiveArch: %{rust_arches} - rust-parity-wasm ExclusiveArch: %{rust_arches} - rust-parking_lot ExclusiveArch: %{rust_arches} - rust-parking_lot_core ExclusiveArch: %{rust_arches} - rust-parse-zoneinfo ExclusiveArch: %{rust_arches} - rust-parse_cfg ExclusiveArch: %{rust_arches} - rust-parsec-client ExclusiveArch: %{rust_arches} - rust-parsec-interface ExclusiveArch: %{rust_arches} - rust-partial-io ExclusiveArch: %{rust_arches} - rust-paste ExclusiveArch: %{rust_arches} - rust-paste-impl ExclusiveArch: %{rust_arches} - rust-path-absolutize ExclusiveArch: %{rust_arches} - rust-path-dedot ExclusiveArch: %{rust_arches} - rust-path-slash ExclusiveArch: %{rust_arches} - rust-pathdiff ExclusiveArch: %{rust_arches} - rust-pathfinder_geometry ExclusiveArch: %{rust_arches} - rust-pathfinder_simd ExclusiveArch: %{rust_arches} - rust-pbr ExclusiveArch: %{rust_arches} - rust-pcap ExclusiveArch: %{rust_arches} - rust-pcre2 ExclusiveArch: %{rust_arches} - rust-pcre2-sys ExclusiveArch: %{rust_arches} - rust-peeking_take_while ExclusiveArch: %{rust_arches} - rust-peg ExclusiveArch: %{rust_arches} - rust-peg-macros ExclusiveArch: %{rust_arches} - rust-peg-runtime ExclusiveArch: %{rust_arches} - rust-peg0.5 ExclusiveArch: %{rust_arches} - rust-pem ExclusiveArch: %{rust_arches} - rust-percent-encoding ExclusiveArch: %{rust_arches} - rust-percent-encoding1 ExclusiveArch: %{rust_arches} - rust-peresil ExclusiveArch: %{rust_arches} - rust-permutate ExclusiveArch: %{rust_arches} - rust-permutohedron ExclusiveArch: %{rust_arches} - rust-pest ExclusiveArch: %{rust_arches} - rust-pest_derive ExclusiveArch: %{rust_arches} - rust-pest_generator ExclusiveArch: %{rust_arches} - rust-pest_meta ExclusiveArch: %{rust_arches} - rust-petgraph ExclusiveArch: %{rust_arches} - rust-phf ExclusiveArch: %{rust_arches} - rust-phf0.7 ExclusiveArch: %{rust_arches} - rust-phf_codegen ExclusiveArch: %{rust_arches} - rust-phf_codegen0.7 ExclusiveArch: %{rust_arches} - rust-phf_generator ExclusiveArch: %{rust_arches} - rust-phf_generator0.7 ExclusiveArch: %{rust_arches} - rust-phf_macros ExclusiveArch: %{rust_arches} - rust-phf_macros0.7 ExclusiveArch: %{rust_arches} - rust-phf_shared ExclusiveArch: %{rust_arches} - rust-phf_shared0.7 ExclusiveArch: %{rust_arches} - rust-picky-asn1 ExclusiveArch: %{rust_arches} - rust-picky-asn1-der ExclusiveArch: %{rust_arches} - rust-picky-asn1-x509 ExclusiveArch: %{rust_arches} - rust-pico-args ExclusiveArch: %{rust_arches} - rust-pin-project ExclusiveArch: %{rust_arches} - rust-pin-project-internal ExclusiveArch: %{rust_arches} - rust-pin-project-internal0.4 ExclusiveArch: %{rust_arches} - rust-pin-project-lite ExclusiveArch: %{rust_arches} - rust-pin-project-lite0.1 ExclusiveArch: %{rust_arches} - rust-pin-project0.4 ExclusiveArch: %{rust_arches} - rust-pin-utils ExclusiveArch: %{rust_arches} - rust-pipe ExclusiveArch: %{rust_arches} - rust-piper ExclusiveArch: %{rust_arches} - rust-pkcs11 ExclusiveArch: %{rust_arches} - rust-pkg-config ExclusiveArch: %{rust_arches} - rust-plain ExclusiveArch: %{rust_arches} - rust-platform-dirs ExclusiveArch: %{rust_arches} - rust-platforms ExclusiveArch: %{rust_arches} - rust-plist ExclusiveArch: %{rust_arches} - rust-plotters ExclusiveArch: %{rust_arches} - rust-plugin ExclusiveArch: %{rust_arches} - rust-pnet_base ExclusiveArch: %{rust_arches} - rust-pnet_datalink ExclusiveArch: %{rust_arches} - rust-pnet_sys ExclusiveArch: %{rust_arches} - rust-png ExclusiveArch: %{rust_arches} - rust-podio ExclusiveArch: %{rust_arches} - rust-polyval ExclusiveArch: %{rust_arches} - rust-pommes ExclusiveArch: %{rust_arches} - rust-ppv-lite86 ExclusiveArch: %{rust_arches} - rust-pq-sys ExclusiveArch: %{rust_arches} - rust-precomputed-hash ExclusiveArch: %{rust_arches} - rust-predicates ExclusiveArch: %{rust_arches} - rust-predicates-core ExclusiveArch: %{rust_arches} - rust-predicates-tree ExclusiveArch: %{rust_arches} - rust-pretty-git-prompt ExclusiveArch: %{rust_arches} - rust-pretty-hex ExclusiveArch: %{rust_arches} - rust-pretty_assertions ExclusiveArch: %{rust_arches} - rust-pretty_env_logger ExclusiveArch: %{rust_arches} - rust-prettytable-rs ExclusiveArch: %{rust_arches} - rust-proc-macro-crate ExclusiveArch: %{rust_arches} - rust-proc-macro-error ExclusiveArch: %{rust_arches} - rust-proc-macro-error-attr ExclusiveArch: %{rust_arches} - rust-proc-macro-hack ExclusiveArch: %{rust_arches} - rust-proc-macro-nested ExclusiveArch: %{rust_arches} - rust-proc-macro2 ExclusiveArch: %{rust_arches} - rust-proc-macro2-0.4 ExclusiveArch: %{rust_arches} - rust-proc-quote ExclusiveArch: %{rust_arches} - rust-proc-quote-impl ExclusiveArch: %{rust_arches} - rust-procedural-masquerade ExclusiveArch: %{rust_arches} - rust-process_path ExclusiveArch: %{rust_arches} - rust-procfs ExclusiveArch: %{rust_arches} - rust-procfs0.8 ExclusiveArch: %{rust_arches} - rust-procs ExclusiveArch: %{rust_arches} - rust-progress-streams ExclusiveArch: %{rust_arches} - rust-prometheus ExclusiveArch: %{rust_arches} - rust-proptest ExclusiveArch: %{rust_arches} - rust-proptest-derive ExclusiveArch: %{rust_arches} - rust-prost ExclusiveArch: %{rust_arches} - rust-prost-build ExclusiveArch: %{rust_arches} - rust-prost-derive ExclusiveArch: %{rust_arches} - rust-prost-types ExclusiveArch: %{rust_arches} - rust-protobuf ExclusiveArch: %{rust_arches} - rust-protobuf-codegen ExclusiveArch: %{rust_arches} - rust-protobuf-codegen-pure ExclusiveArch: %{rust_arches} - rust-protoc ExclusiveArch: %{rust_arches} - rust-protoc-rust ExclusiveArch: %{rust_arches} - rust-psa-crypto ExclusiveArch: %{rust_arches} - rust-psa-crypto-sys ExclusiveArch: %{rust_arches} - rust-psm ExclusiveArch: %{rust_arches} - rust-psutil ExclusiveArch: %{rust_arches} - rust-publicsuffix ExclusiveArch: %{rust_arches} - rust-pulldown-cmark ExclusiveArch: %{rust_arches} - rust-pulse ExclusiveArch: %{rust_arches} - rust-pure-rust-locales ExclusiveArch: %{rust_arches} - rust-qr2term ExclusiveArch: %{rust_arches} - rust-qrcode ExclusiveArch: %{rust_arches} - rust-quick-error ExclusiveArch: %{rust_arches} - rust-quick-error1 ExclusiveArch: %{rust_arches} - rust-quick-xml ExclusiveArch: %{rust_arches} - rust-quickcheck ExclusiveArch: %{rust_arches} - rust-quickcheck0.6 ExclusiveArch: %{rust_arches} - rust-quickcheck_macros ExclusiveArch: %{rust_arches} - rust-quickersort ExclusiveArch: %{rust_arches} - rust-quote ExclusiveArch: %{rust_arches} - rust-quote0.3 ExclusiveArch: %{rust_arches} - rust-quote0.6 ExclusiveArch: %{rust_arches} - rust-quoted_printable ExclusiveArch: %{rust_arches} - rust-r2d2 ExclusiveArch: %{rust_arches} - rust-rand ExclusiveArch: %{rust_arches} - rust-rand0.4 ExclusiveArch: %{rust_arches} - rust-rand0.5 ExclusiveArch: %{rust_arches} - rust-rand0.6 ExclusiveArch: %{rust_arches} - rust-rand_chacha ExclusiveArch: %{rust_arches} - rust-rand_chacha0.1 ExclusiveArch: %{rust_arches} - rust-rand_core ExclusiveArch: %{rust_arches} - rust-rand_core0.3 ExclusiveArch: %{rust_arches} - rust-rand_core0.4 ExclusiveArch: %{rust_arches} - rust-rand_distr ExclusiveArch: %{rust_arches} - rust-rand_distr0.2 ExclusiveArch: %{rust_arches} - rust-rand_hc ExclusiveArch: %{rust_arches} - rust-rand_hc0.1 ExclusiveArch: %{rust_arches} - rust-rand_isaac ExclusiveArch: %{rust_arches} - rust-rand_isaac0.1 ExclusiveArch: %{rust_arches} - rust-rand_jitter ExclusiveArch: %{rust_arches} - rust-rand_jitter0.1 ExclusiveArch: %{rust_arches} - rust-rand_os ExclusiveArch: %{rust_arches} - rust-rand_os0.1 ExclusiveArch: %{rust_arches} - rust-rand_pcg ExclusiveArch: %{rust_arches} - rust-rand_pcg0.1 ExclusiveArch: %{rust_arches} - rust-rand_xorshift ExclusiveArch: %{rust_arches} - rust-rand_xorshift0.1 ExclusiveArch: %{rust_arches} - rust-rand_xoshiro ExclusiveArch: %{rust_arches} - rust-random-fast-rng ExclusiveArch: %{rust_arches} - rust-random-trait ExclusiveArch: %{rust_arches} - rust-randomize ExclusiveArch: %{rust_arches} - rust-rav1e ExclusiveArch: %{rust_arches} - rust-raw-window-handle ExclusiveArch: %{rust_arches} - rust-rawpointer ExclusiveArch: %{rust_arches} - rust-rawslice ExclusiveArch: %{rust_arches} - rust-rayon ExclusiveArch: %{rust_arches} - rust-rayon-core ExclusiveArch: %{rust_arches} - rust-readwrite ExclusiveArch: %{rust_arches} - rust-recycler ExclusiveArch: %{rust_arches} - rust-ref-cast ExclusiveArch: %{rust_arches} - rust-ref-cast-impl ExclusiveArch: %{rust_arches} - rust-regex ExclusiveArch: %{rust_arches} - rust-regex-automata ExclusiveArch: %{rust_arches} - rust-regex-syntax ExclusiveArch: %{rust_arches} - rust-region ExclusiveArch: %{rust_arches} - rust-relay ExclusiveArch: %{rust_arches} - rust-remove_dir_all ExclusiveArch: %{rust_arches} - rust-reqwest ExclusiveArch: %{rust_arches} - rust-resize ExclusiveArch: %{rust_arches} - rust-resolv-conf ExclusiveArch: %{rust_arches} - rust-restson ExclusiveArch: %{rust_arches} - rust-retry ExclusiveArch: %{rust_arches} - rust-rgb ExclusiveArch: %{rust_arches} - rust-ring ExclusiveArch: %{rust_arches} - rust-ripgrep ExclusiveArch: %{rust_arches} - rust-rle-decode-fast ExclusiveArch: %{rust_arches} - rust-rmp ExclusiveArch: %{rust_arches} - rust-rmp-serde ExclusiveArch: %{rust_arches} - rust-roff ExclusiveArch: %{rust_arches} - rust-ron ExclusiveArch: %{rust_arches} - rust-rpassword ExclusiveArch: %{rust_arches} - rust-rpick ExclusiveArch: %{rust_arches} - rust-rsa ExclusiveArch: %{rust_arches} - rust-rtnetlink ExclusiveArch: %{rust_arches} - rust-ruma-identifiers ExclusiveArch: %{rust_arches} - rust-rust-embed ExclusiveArch: %{rust_arches} - rust-rust-embed-impl ExclusiveArch: %{rust_arches} - rust-rust-embed-utils ExclusiveArch: %{rust_arches} - rust-rust-ini ExclusiveArch: %{rust_arches} - rust-rust-stemmers ExclusiveArch: %{rust_arches} - rust-rust_decimal ExclusiveArch: %{rust_arches} - rust-rust_hawktracer ExclusiveArch: %{rust_arches} - rust-rust_hawktracer_normal_macro ExclusiveArch: %{rust_arches} - rust-rust_hawktracer_proc_macro ExclusiveArch: %{rust_arches} - rust-rust_hawktracer_sys ExclusiveArch: %{rust_arches} - rust-rustc-demangle ExclusiveArch: %{rust_arches} - rust-rustc-hash ExclusiveArch: %{rust_arches} - rust-rustc-serialize ExclusiveArch: %{rust_arches} - rust-rustc-test ExclusiveArch: %{rust_arches} - rust-rustc_tools_util ExclusiveArch: %{rust_arches} - rust-rustc_version ExclusiveArch: %{rust_arches} - rust-rustdoc-stripper ExclusiveArch: %{rust_arches} - rust-rustfilt ExclusiveArch: %{rust_arches} - rust-rustfix ExclusiveArch: %{rust_arches} - rust-rustio ExclusiveArch: %{rust_arches} - rust-rusttype ExclusiveArch: %{rust_arches} - rust-rustversion ExclusiveArch: %{rust_arches} - rust-rusty-fork ExclusiveArch: %{rust_arches} - rust-rustyline ExclusiveArch: %{rust_arches} - rust-rustyline-derive ExclusiveArch: %{rust_arches} - rust-ryu ExclusiveArch: %{rust_arches} - rust-safe-transmute ExclusiveArch: %{rust_arches} - rust-safemem ExclusiveArch: %{rust_arches} - rust-same-file ExclusiveArch: %{rust_arches} - rust-sass-rs ExclusiveArch: %{rust_arches} - rust-sass-sys ExclusiveArch: %{rust_arches} - rust-scan_fmt ExclusiveArch: %{rust_arches} - rust-scheduled-thread-pool ExclusiveArch: %{rust_arches} - rust-scoped-tls ExclusiveArch: %{rust_arches} - rust-scoped-tls-hkt ExclusiveArch: %{rust_arches} - rust-scoped_threadpool ExclusiveArch: %{rust_arches} - rust-scopeguard ExclusiveArch: %{rust_arches} - rust-scopetime ExclusiveArch: %{rust_arches} - rust-scroll ExclusiveArch: %{rust_arches} - rust-scroll_derive ExclusiveArch: %{rust_arches} - rust-sd ExclusiveArch: %{rust_arches} - rust-sd-notify ExclusiveArch: %{rust_arches} - rust-seahash ExclusiveArch: %{rust_arches} - rust-secrecy ExclusiveArch: %{rust_arches} - rust-secret-service ExclusiveArch: %{rust_arches} - rust-semver ExclusiveArch: %{rust_arches} - rust-semver-parser ExclusiveArch: %{rust_arches} - rust-semver-parser0.7 ExclusiveArch: %{rust_arches} - rust-semver-parser0.9 ExclusiveArch: %{rust_arches} - rust-semver0.10 ExclusiveArch: %{rust_arches} - rust-semver0.9 ExclusiveArch: %{rust_arches} - rust-serde ExclusiveArch: %{rust_arches} - rust-serde-big-array ExclusiveArch: %{rust_arches} - rust-serde-pickle ExclusiveArch: %{rust_arches} - rust-serde-value ExclusiveArch: %{rust_arches} - rust-serde-xml-rs ExclusiveArch: %{rust_arches} - rust-serde_bytes ExclusiveArch: %{rust_arches} - rust-serde_cbor ExclusiveArch: %{rust_arches} - rust-serde_derive ExclusiveArch: %{rust_arches} - rust-serde_ignored ExclusiveArch: %{rust_arches} - rust-serde_json ExclusiveArch: %{rust_arches} - rust-serde_repr ExclusiveArch: %{rust_arches} - rust-serde_stacker ExclusiveArch: %{rust_arches} - rust-serde_test ExclusiveArch: %{rust_arches} - rust-serde_url_params ExclusiveArch: %{rust_arches} - rust-serde_urlencoded ExclusiveArch: %{rust_arches} - rust-serde_urlencoded0.6 ExclusiveArch: %{rust_arches} - rust-serde_with_macros ExclusiveArch: %{rust_arches} - rust-serde_yaml ExclusiveArch: %{rust_arches} - rust-serial_test ExclusiveArch: %{rust_arches} - rust-serial_test_derive ExclusiveArch: %{rust_arches} - rust-servo-fontconfig ExclusiveArch: %{rust_arches} - rust-servo-fontconfig-sys ExclusiveArch: %{rust_arches} - rust-sha-1 ExclusiveArch: %{rust_arches} - rust-sha1 ExclusiveArch: %{rust_arches} - rust-sha2 ExclusiveArch: %{rust_arches} - rust-sha3 ExclusiveArch: %{rust_arches} - rust-shared_child ExclusiveArch: %{rust_arches} - rust-shared_library ExclusiveArch: %{rust_arches} - rust-shell-escape ExclusiveArch: %{rust_arches} - rust-shell-words ExclusiveArch: %{rust_arches} - rust-shellexpand ExclusiveArch: %{rust_arches} - rust-shlex ExclusiveArch: %{rust_arches} - rust-signal-hook ExclusiveArch: %{rust_arches} - rust-signal-hook-registry ExclusiveArch: %{rust_arches} - rust-silver ExclusiveArch: %{rust_arches} - rust-simd_helpers ExclusiveArch: %{rust_arches} - rust-simple_asn1 ExclusiveArch: %{rust_arches} - rust-simple_logger ExclusiveArch: %{rust_arches} - rust-simplelog ExclusiveArch: %{rust_arches} - rust-siphasher ExclusiveArch: %{rust_arches} - rust-size ExclusiveArch: %{rust_arches} - rust-sized-chunks ExclusiveArch: %{rust_arches} - rust-skeptic ExclusiveArch: %{rust_arches} - rust-skim ExclusiveArch: %{rust_arches} - rust-slab ExclusiveArch: %{rust_arches} - rust-slash-formatter ExclusiveArch: %{rust_arches} - rust-slice-deque ExclusiveArch: %{rust_arches} - rust-slog ExclusiveArch: %{rust_arches} - rust-slog-async ExclusiveArch: %{rust_arches} - rust-slog-scope ExclusiveArch: %{rust_arches} - rust-slog-term ExclusiveArch: %{rust_arches} - rust-slotmap ExclusiveArch: %{rust_arches} - rust-slug ExclusiveArch: %{rust_arches} - rust-sluice ExclusiveArch: %{rust_arches} - rust-smallvec ExclusiveArch: %{rust_arches} - rust-smart-default ExclusiveArch: %{rust_arches} - rust-smithay-client-toolkit ExclusiveArch: %{rust_arches} - rust-smithay-clipboard ExclusiveArch: %{rust_arches} - rust-snafu ExclusiveArch: %{rust_arches} - rust-snafu-derive ExclusiveArch: %{rust_arches} - rust-snowflake ExclusiveArch: %{rust_arches} - rust-socket2 ExclusiveArch: %{rust_arches} - rust-soup-sys ExclusiveArch: %{rust_arches} - rust-sourceview ExclusiveArch: %{rust_arches} - rust-spin ExclusiveArch: %{rust_arches} - rust-spinning_top ExclusiveArch: %{rust_arches} - rust-spmc ExclusiveArch: %{rust_arches} - rust-ssh-key-dir ExclusiveArch: %{rust_arches} - rust-stable_deref_trait ExclusiveArch: %{rust_arches} - rust-stacker ExclusiveArch: %{rust_arches} - rust-standback ExclusiveArch: %{rust_arches} - rust-starship ExclusiveArch: %{rust_arches} - rust-starship_module_config_derive ExclusiveArch: %{rust_arches} - rust-static_assertions ExclusiveArch: %{rust_arches} - rust-statistical ExclusiveArch: %{rust_arches} - rust-stb_truetype ExclusiveArch: %{rust_arches} - rust-stream-cipher ExclusiveArch: %{rust_arches} - rust-streaming-stats ExclusiveArch: %{rust_arches} - rust-string ExclusiveArch: %{rust_arches} - rust-string_cache ExclusiveArch: %{rust_arches} - rust-string_cache_codegen ExclusiveArch: %{rust_arches} - rust-string_cache_shared ExclusiveArch: %{rust_arches} - rust-strings ExclusiveArch: %{rust_arches} - rust-strip-ansi-escapes ExclusiveArch: %{rust_arches} - rust-strsim ExclusiveArch: %{rust_arches} - rust-structopt ExclusiveArch: %{rust_arches} - rust-structopt-derive ExclusiveArch: %{rust_arches} - rust-structopt-derive0.2 ExclusiveArch: %{rust_arches} - rust-structopt0.2 ExclusiveArch: %{rust_arches} - rust-strum ExclusiveArch: %{rust_arches} - rust-strum_macros ExclusiveArch: %{rust_arches} - rust-subtle ExclusiveArch: %{rust_arches} - rust-sudo_plugin ExclusiveArch: %{rust_arches} - rust-sudo_plugin-sys ExclusiveArch: %{rust_arches} - rust-sval ExclusiveArch: %{rust_arches} - rust-sval_derive ExclusiveArch: %{rust_arches} - rust-sxd-document ExclusiveArch: %{rust_arches} - rust-syn ExclusiveArch: %{rust_arches} - rust-syn-mid ExclusiveArch: %{rust_arches} - rust-syn0.15 ExclusiveArch: %{rust_arches} - rust-synom ExclusiveArch: %{rust_arches} - rust-synstructure ExclusiveArch: %{rust_arches} - rust-syntect ExclusiveArch: %{rust_arches} - rust-sys-info ExclusiveArch: %{rust_arches} - rust-sysinfo ExclusiveArch: %{rust_arches} - rust-system-deps ExclusiveArch: %{rust_arches} - rust-tabwriter ExclusiveArch: %{rust_arches} - rust-take ExclusiveArch: %{rust_arches} - rust-take_mut ExclusiveArch: %{rust_arches} - rust-tar ExclusiveArch: %{rust_arches} - rust-target-lexicon ExclusiveArch: %{rust_arches} - rust-tealdeer ExclusiveArch: %{rust_arches} - rust-teloxide ExclusiveArch: %{rust_arches} - rust-teloxide-macros ExclusiveArch: %{rust_arches} - rust-tempdir ExclusiveArch: %{rust_arches} - rust-tempfile ExclusiveArch: %{rust_arches} - rust-tendril ExclusiveArch: %{rust_arches} - rust-tera ExclusiveArch: %{rust_arches} - rust-term ExclusiveArch: %{rust_arches} - rust-term_grid ExclusiveArch: %{rust_arches} - rust-term_size ExclusiveArch: %{rust_arches} - rust-termcolor ExclusiveArch: %{rust_arches} - rust-terminal_size ExclusiveArch: %{rust_arches} - rust-terminfo ExclusiveArch: %{rust_arches} - rust-termion ExclusiveArch: %{rust_arches} - rust-termios ExclusiveArch: %{rust_arches} - rust-test-assembler ExclusiveArch: %{rust_arches} - rust-tester ExclusiveArch: %{rust_arches} - rust-testing_logger ExclusiveArch: %{rust_arches} - rust-textwrap ExclusiveArch: %{rust_arches} - rust-textwrap0.11 ExclusiveArch: %{rust_arches} - rust-thiserror ExclusiveArch: %{rust_arches} - rust-thiserror-impl ExclusiveArch: %{rust_arches} - rust-thread-id ExclusiveArch: %{rust_arches} - rust-thread-scoped ExclusiveArch: %{rust_arches} - rust-thread_local ExclusiveArch: %{rust_arches} - rust-threadpool ExclusiveArch: %{rust_arches} - rust-tiff ExclusiveArch: %{rust_arches} - rust-tiger-digest ExclusiveArch: %{rust_arches} - rust-time ExclusiveArch: %{rust_arches} - rust-time-macros ExclusiveArch: %{rust_arches} - rust-time-macros-impl ExclusiveArch: %{rust_arches} - rust-time0.1 ExclusiveArch: %{rust_arches} - rust-timebomb ExclusiveArch: %{rust_arches} - rust-timer ExclusiveArch: %{rust_arches} - rust-timerfd ExclusiveArch: %{rust_arches} - rust-tiny_http ExclusiveArch: %{rust_arches} - rust-tinytemplate ExclusiveArch: %{rust_arches} - rust-tinyvec ExclusiveArch: %{rust_arches} - rust-tinyvec0.3 ExclusiveArch: %{rust_arches} - rust-tinyvec_macros ExclusiveArch: %{rust_arches} - rust-tokei ExclusiveArch: %{rust_arches} - rust-tokio ExclusiveArch: %{rust_arches} - rust-tokio-codec ExclusiveArch: %{rust_arches} - rust-tokio-core ExclusiveArch: %{rust_arches} - rust-tokio-current-thread ExclusiveArch: %{rust_arches} - rust-tokio-executor ExclusiveArch: %{rust_arches} - rust-tokio-fs ExclusiveArch: %{rust_arches} - rust-tokio-io ExclusiveArch: %{rust_arches} - rust-tokio-io-pool ExclusiveArch: %{rust_arches} - rust-tokio-macros ExclusiveArch: %{rust_arches} - rust-tokio-mock-task ExclusiveArch: %{rust_arches} - rust-tokio-openssl ExclusiveArch: %{rust_arches} - rust-tokio-reactor ExclusiveArch: %{rust_arches} - rust-tokio-socks ExclusiveArch: %{rust_arches} - rust-tokio-sync ExclusiveArch: %{rust_arches} - rust-tokio-tcp ExclusiveArch: %{rust_arches} - rust-tokio-test ExclusiveArch: %{rust_arches} - rust-tokio-threadpool ExclusiveArch: %{rust_arches} - rust-tokio-timer ExclusiveArch: %{rust_arches} - rust-tokio-tls ExclusiveArch: %{rust_arches} - rust-tokio-tls0.2 ExclusiveArch: %{rust_arches} - rust-tokio-tungstenite ExclusiveArch: %{rust_arches} - rust-tokio-udp ExclusiveArch: %{rust_arches} - rust-tokio-uds ExclusiveArch: %{rust_arches} - rust-tokio-util ExclusiveArch: %{rust_arches} - rust-tokio-util0.2 ExclusiveArch: %{rust_arches} - rust-tokio0.1 ExclusiveArch: %{rust_arches} - rust-toml ExclusiveArch: %{rust_arches} - rust-toml0.4 ExclusiveArch: %{rust_arches} - rust-tower-layer ExclusiveArch: %{rust_arches} - rust-tower-service ExclusiveArch: %{rust_arches} - rust-tower-test ExclusiveArch: %{rust_arches} - rust-tower-util ExclusiveArch: %{rust_arches} - rust-tpm2-policy ExclusiveArch: %{rust_arches} - rust-tracing ExclusiveArch: %{rust_arches} - rust-tracing-attributes ExclusiveArch: %{rust_arches} - rust-tracing-core ExclusiveArch: %{rust_arches} - rust-tracing-futures ExclusiveArch: %{rust_arches} - rust-traitobject ExclusiveArch: %{rust_arches} - rust-treebitmap ExclusiveArch: %{rust_arches} - rust-treeline ExclusiveArch: %{rust_arches} - rust-trust-dns-native-tls ExclusiveArch: %{rust_arches} - rust-trust-dns-openssl ExclusiveArch: %{rust_arches} - rust-trust-dns-proto ExclusiveArch: %{rust_arches} - rust-trust-dns-resolver ExclusiveArch: %{rust_arches} - rust-try-lock ExclusiveArch: %{rust_arches} - rust-try_from ExclusiveArch: %{rust_arches} - rust-try_or ExclusiveArch: %{rust_arches} - rust-trybuild ExclusiveArch: %{rust_arches} - rust-tss-esapi ExclusiveArch: %{rust_arches} - rust-ttf-parser ExclusiveArch: %{rust_arches} - rust-tui ExclusiveArch: %{rust_arches} - rust-tui-react ExclusiveArch: %{rust_arches} - rust-tui0.11 ExclusiveArch: %{rust_arches} - rust-tui0.9 ExclusiveArch: %{rust_arches} - rust-tuikit ExclusiveArch: %{rust_arches} - rust-tungstenite ExclusiveArch: %{rust_arches} - rust-twoway ExclusiveArch: %{rust_arches} - rust-typeable ExclusiveArch: %{rust_arches} - rust-typed-arena ExclusiveArch: %{rust_arches} - rust-typemap ExclusiveArch: %{rust_arches} - rust-typenum ExclusiveArch: %{rust_arches} - rust-ucd-parse ExclusiveArch: %{rust_arches} - rust-ucd-trie ExclusiveArch: %{rust_arches} - rust-ucd-util ExclusiveArch: %{rust_arches} - rust-unchecked-index ExclusiveArch: %{rust_arches} - rust-unescape ExclusiveArch: %{rust_arches} - rust-unic-char-property ExclusiveArch: %{rust_arches} - rust-unic-char-range ExclusiveArch: %{rust_arches} - rust-unic-common ExclusiveArch: %{rust_arches} - rust-unic-segment ExclusiveArch: %{rust_arches} - rust-unic-ucd-category ExclusiveArch: %{rust_arches} - rust-unic-ucd-common ExclusiveArch: %{rust_arches} - rust-unic-ucd-segment ExclusiveArch: %{rust_arches} - rust-unic-ucd-version ExclusiveArch: %{rust_arches} - rust-unicase ExclusiveArch: %{rust_arches} - rust-unicase1 ExclusiveArch: %{rust_arches} - rust-unicode-bidi ExclusiveArch: %{rust_arches} - rust-unicode-normalization ExclusiveArch: %{rust_arches} - rust-unicode-segmentation ExclusiveArch: %{rust_arches} - rust-unicode-width ExclusiveArch: %{rust_arches} - rust-unicode-xid ExclusiveArch: %{rust_arches} - rust-unicode-xid0.1 ExclusiveArch: %{rust_arches} - rust-unicode_categories ExclusiveArch: %{rust_arches} - rust-unindent ExclusiveArch: %{rust_arches} - rust-universal-hash ExclusiveArch: %{rust_arches} - rust-unix_socket ExclusiveArch: %{rust_arches} - rust-unreachable ExclusiveArch: %{rust_arches} - rust-unsafe-any ExclusiveArch: %{rust_arches} - rust-untrusted ExclusiveArch: %{rust_arches} - rust-uom ExclusiveArch: %{rust_arches} - rust-url ExclusiveArch: %{rust_arches} - rust-url1 ExclusiveArch: %{rust_arches} - rust-url_serde ExclusiveArch: %{rust_arches} - rust-urlencoding ExclusiveArch: %{rust_arches} - rust-urlocator ExclusiveArch: %{rust_arches} - rust-urlshortener ExclusiveArch: %{rust_arches} - rust-users ExclusiveArch: %{rust_arches} - rust-users0.10 ExclusiveArch: %{rust_arches} - rust-utf-8 ExclusiveArch: %{rust_arches} - rust-utf8-ranges ExclusiveArch: %{rust_arches} - rust-utf8parse ExclusiveArch: %{rust_arches} - rust-uuid ExclusiveArch: %{rust_arches} - rust-uuid0.7 ExclusiveArch: %{rust_arches} - rust-v_escape ExclusiveArch: %{rust_arches} - rust-v_escape_derive ExclusiveArch: %{rust_arches} - rust-v_htmlescape ExclusiveArch: %{rust_arches} - rust-varlink ExclusiveArch: %{rust_arches} - rust-varlink-cli ExclusiveArch: %{rust_arches} - rust-varlink_generator ExclusiveArch: %{rust_arches} - rust-varlink_parser ExclusiveArch: %{rust_arches} - rust-varlink_stdinterfaces ExclusiveArch: %{rust_arches} - rust-vec_map ExclusiveArch: %{rust_arches} - rust-vergen ExclusiveArch: %{rust_arches} - rust-version ExclusiveArch: %{rust_arches} - rust-version-compare ExclusiveArch: %{rust_arches} - rust-version-sync ExclusiveArch: %{rust_arches} - rust-version-sync0.8 ExclusiveArch: %{rust_arches} - rust-version_check ExclusiveArch: %{rust_arches} - rust-vmw_backdoor ExclusiveArch: %{rust_arches} - rust-void ExclusiveArch: %{rust_arches} - rust-vte ExclusiveArch: %{rust_arches} - rust-vte0.3 ExclusiveArch: %{rust_arches} - rust-vte_generate_state_changes ExclusiveArch: %{rust_arches} - rust-wait-timeout ExclusiveArch: %{rust_arches} - rust-walkdir ExclusiveArch: %{rust_arches} - rust-want ExclusiveArch: %{rust_arches} - rust-warp ExclusiveArch: %{rust_arches} - rust-wasm-bindgen ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-backend ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-macro ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-macro-support ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-shared ExclusiveArch: %{rust_arches} - rust-wasm-bindgen-test-macro ExclusiveArch: %{rust_arches} - rust-wayland-client ExclusiveArch: %{rust_arches} - rust-wayland-commons ExclusiveArch: %{rust_arches} - rust-wayland-cursor ExclusiveArch: %{rust_arches} - rust-wayland-egl ExclusiveArch: %{rust_arches} - rust-wayland-protocols ExclusiveArch: %{rust_arches} - rust-wayland-scanner ExclusiveArch: %{rust_arches} - rust-wayland-server ExclusiveArch: %{rust_arches} - rust-wayland-sys ExclusiveArch: %{rust_arches} - rust-web-sys ExclusiveArch: %{rust_arches} - rust-webkit2gtk ExclusiveArch: %{rust_arches} - rust-webkit2gtk-sys ExclusiveArch: %{rust_arches} - rust-websocket ExclusiveArch: %{rust_arches} - rust-websocket-base ExclusiveArch: %{rust_arches} - rust-weezl ExclusiveArch: %{rust_arches} - rust-which ExclusiveArch: %{rust_arches} - rust-wild ExclusiveArch: %{rust_arches} - rust-winit ExclusiveArch: %{rust_arches} - rust-ws ExclusiveArch: %{rust_arches} - rust-x11 ExclusiveArch: %{rust_arches} - rust-x11-clipboard ExclusiveArch: %{rust_arches} - rust-x11-dl ExclusiveArch: %{rust_arches} - rust-xattr ExclusiveArch: %{rust_arches} - rust-xcb ExclusiveArch: %{rust_arches} - rust-xcursor ExclusiveArch: %{rust_arches} - rust-xdg ExclusiveArch: %{rust_arches} - rust-xkbcommon ExclusiveArch: %{rust_arches} - rust-xml-rs ExclusiveArch: %{rust_arches} - rust-xml5ever ExclusiveArch: %{rust_arches} - rust-xz2 ExclusiveArch: %{rust_arches} - rust-y4m ExclusiveArch: %{rust_arches} - rust-yaml-rust ExclusiveArch: %{rust_arches} - rust-yaml-rust0.3 ExclusiveArch: %{rust_arches} - rust-ybaas ExclusiveArch: %{rust_arches} - rust-ytop ExclusiveArch: %{rust_arches} - rust-yubibomb ExclusiveArch: %{rust_arches} - rust-yup-oauth2 ExclusiveArch: %{rust_arches} - rust-zbus_macros ExclusiveArch: %{rust_arches} - rust-zeroize ExclusiveArch: %{rust_arches} - rust-zeroize_derive ExclusiveArch: %{rust_arches} - rust-zincati ExclusiveArch: %{rust_arches} - rust-zip ExclusiveArch: %{rust_arches} - rust-zoneinfo_compiled ExclusiveArch: %{rust_arches} - rust-zoxide ExclusiveArch: %{rust_arches} - rust-zram-generator ExclusiveArch: %{rust_arches} - rust-zstd ExclusiveArch: %{rust_arches} - rust-zstd-safe ExclusiveArch: %{rust_arches} - rust-zstd-sys ExclusiveArch: %{rust_arches} - rust-zvariant ExclusiveArch: %{rust_arches} - rust-zvariant_derive ExclusiveArch: %{rust_arches} - s390utils ExclusiveArch: s390 s390x - safetyblanket ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le - sagemath ExclusiveArch: aarch64 %{ix86} x86_64 ppc sparcv9 - sbcl ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - sbd ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le - sbsigntools ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - seabios ExclusiveArch: x86_64 - seadrive-gui ExclusiveArch: %{qt5_qtwebengine_arches} - seafile-client ExclusiveArch: %{qt5_qtwebengine_arches} - seamonkey ExclusiveArch: x86_64 - seqan3 ExclusiveArch: %{power64} x86_64 aarch64 - servicelog ExclusiveArch: ppc %{power64} - sgabios ExclusiveArch: %{ix86} x86_64 - sharpfont ExclusiveArch: %mono_arches - sharpziplib ExclusiveArch: %{mono_arches} - shim ExclusiveArch: %{efi} - shim-unsigned-aarch64 ExclusiveArch: aarch64 - shim-unsigned-x64 ExclusiveArch: x86_64 - sigul ExclusiveArch: x86_64 - skychart ExclusiveArch: %{fpc_arches} - snapd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - soup-sharp ExclusiveArch: %{mono_arches} - source-to-image ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - sparkleshare ExclusiveArch: %{mono_arches} - spicctrl ExclusiveArch: %{ix86} x86_64 - spice ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - springlobby ExclusiveArch: %{ix86} x86_64 - squeekboard ExclusiveArch: %{rust_arches} - startdde ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - statsd ExclusiveArch: %{nodejs_arches} noarch - stratis-cli ExclusiveArch: %{rust_arches} noarch - stratisd ExclusiveArch: %{rust_arches} - stripesnoop ExclusiveArch: %{ix86} x86_64 - supercollider ExclusiveArch: %{qt5_qtwebengine_arches} - supermin ExclusiveArch: %{kernel_arches} - svt-av1 ExclusiveArch: x86_64 - svt-vp9 ExclusiveArch: x86_64 - swift-lang ExclusiveArch: x86_64 aarch64 - sysbench ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - syslinux ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - taglib-sharp ExclusiveArch: %{mono_arches} - tarantool ExclusiveArch: %{ix86} x86_64 - tboot ExclusiveArch: %{ix86} x86_64 - tdlib ExclusiveArch: x86_64 - templates_parser ExclusiveArch: %GPRbuild_arches - ternimal ExclusiveArch: %{rust_arches} - testcloud ExclusiveArch: %{kernel_arches} noarch - themonospot-base ExclusiveArch: %mono_arches - themonospot-console ExclusiveArch: %mono_arches - themonospot-gui-gtk ExclusiveArch: %mono_arches - themonospot-plugin-avi ExclusiveArch: %mono_arches - themonospot-plugin-mkv ExclusiveArch: %mono_arches - thermald ExclusiveArch: %{ix86} x86_64 - tilix ExclusiveArch: %{ldc_arches} - tmux-top ExclusiveArch: %{go_arches} - tomboy ExclusiveArch: %{mono_arches} - torbrowser-launcher ExclusiveArch: %{ix86} x86_64 - tuned-profiles-nfv-host-bin ExclusiveArch: %{ix86} x86_64 - uClibc ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} - ucx ExclusiveArch: aarch64 ppc64le x86_64 - ugene ExclusiveArch: %{ix86} x86_64 - uglify-js ExclusiveArch: %{nodejs_arches} noarch - uglify-js1 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - unetbootin ExclusiveArch: %{ix86} x86_64 - ursa-major ExclusiveArch: noarch aarch64 ppc64le s390x x86_64 - v8-314 ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64 - valgrind ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 - vapoursynth ExclusiveArch: %{ix86} x86_64 - vboot-utils ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - virt-p2v ExclusiveArch: x86_64 - virt-v2v ExclusiveArch: x86_64 - virtualbox-guest-additions ExclusiveArch: i686 x86_64 - virtualplanet ExclusiveArch: %{fpc_arches} - vkd3d ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - vmaf ExclusiveArch: x86_64 - vmem ExclusiveArch: x86_64 - vmemcache ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 - vrq ExclusiveArch: %{ix86} x86_64 - warsow ExclusiveArch: %{ix86} x86_64 %{arm} - warsow-data ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{ix86} x86_64 %{arm} - webkit2-sharp ExclusiveArch: %mono_arches - wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: %{ix86} %{arm} - wine-dxvk ExclusiveArch: %{ix86} x86_64 - winetricks ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - wxMaxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 - x2goclient ExclusiveArch: x86_64 - xe-guest-utilities-latest ExclusiveArch: %{ix86} x86_64 - xen ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 - xmlada ExclusiveArch: %{GPRbuild_arches} - xorg-x11-drv-armsoc ExclusiveArch: %{arm} aarch64 - xorg-x11-drv-intel ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-openchrome ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vesa ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vmware ExclusiveArch: %{ix86} x86_64 ia64 - xsp ExclusiveArch: %mono_arches - yarnpkg ExclusiveArch: %{nodejs_arches} noarch - zeromq-ada ExclusiveArch: %{GPRbuild_arches} - zlib-ada ExclusiveArch: %{GPRbuild_arches} - zlib-ng ExclusiveArch: aarch64 i686 ppc64le s390x x86_64 - zola ExclusiveArch: %{rust_arches}

3 years, 4 months

1
0
0 / 0

Architecture specific change in rpms/xalan-c.git

by githook-noreply＠fedoraproject.org

The package rpms/xalan-c.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/xalan-c.git/commit/?id=31274e91d4.... Change: -%ifarch alpha %{power64} s390x sparc64 x86_64 aarch64 Thanks. Full change: ============ commit 31274e91d4f92f2056d7e27ecdac54c27a650248 Author: Benjamin Beasley <code(a)musicinmybrain.net> Date: Wed Dec 9 12:12:11 2020 -0500 Packaging improvements, mostly backported from the version 1.12 RPM in Fedora 34: - Build API documentation with Doxygen - Update summaries and descriptions from upstream - Enable at least XPath tests - Drop unused old tarball and patches from source RPM diff --git a/xalan-c-1.10.0-gcc43.patch b/xalan-c-1.10.0-gcc43.patch deleted file mode 100644 index 264a0bd..0000000 --- a/xalan-c-1.10.0-gcc43.patch +++ /dev/null @@ -1,75 +0,0 @@ -The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in -unnecessary dependencies which aren't requested by the standard. -This fixes build for gcc-4.3 - -Lubomir Kundrak <lkundrak(a)redhat.com> - -diff -urp xml-xalan.orig/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp ---- xml-xalan.orig/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2005-05-05 02:32:04.000000000 +0200 -+++ xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2008-01-04 23:15:13.000000000 +0100 -@@ -31,6 +31,7 @@ - #include <sys/stat.h> - #include <errno.h> - #endif -+#include <cstring> - - - -diff -urp xml-xalan.orig/c/src/xalanc/XalanDOM/XalanDOMString.cpp xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp ---- xml-xalan.orig/c/src/xalanc/XalanDOM/XalanDOMString.cpp 2005-08-08 17:25:52.000000000 +0200 -+++ xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp 2008-01-04 23:17:08.000000000 +0100 -@@ -26,6 +26,7 @@ - - - #include <cstdlib> -+#include <cstring> - - - -diff -urp xml-xalan.orig/c/src/xalanc/XalanExe/XalanExe.cpp xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp ---- xml-xalan.orig/c/src/xalanc/XalanExe/XalanExe.cpp 2005-04-29 23:39:46.000000000 +0200 -+++ xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp 2008-01-04 23:23:09.000000000 +0100 -@@ -24,6 +24,7 @@ - #else - #include <iostream> - #endif -+#include <cstring> - - - -diff -urp xml-xalan.orig/c/src/xalanc/XMLSupport/FormatterToHTML.cpp xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp ---- xml-xalan.orig/c/src/xalanc/XMLSupport/FormatterToHTML.cpp 2005-06-30 23:52:35.000000000 +0200 -+++ xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp 2008-01-04 23:23:26.000000000 +0100 -@@ -26,6 +26,7 @@ - - - #include <cassert> -+#include <cstring> - - - -diff -urp xml-xalan.orig/c/src/xalanc/XSLT/ElemNumber.cpp xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp ---- xml-xalan.orig/c/src/xalanc/XSLT/ElemNumber.cpp 2005-07-26 22:09:17.000000000 +0200 -+++ xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp 2008-01-04 23:24:01.000000000 +0100 -@@ -15,6 +15,7 @@ - */ - #include "ElemNumber.hpp" - -+#include <cstring> - - - #include <xercesc/sax/AttributeList.hpp> -diff -urpxml-xalan/c/src/xalanc.orig/PlatformSupport/DoubleSupport.cpp xml-xalan/c/src/xalanc/PlatformSupport/DoubleSupport.cpp ---- xml-xalan/c/src/xalanc.orig/PlatformSupport/DoubleSupport.cpp 2010-02-12 11:11:30.000000000 +0000 -+++ xml-xalan/c/src/xalanc/PlatformSupport/DoubleSupport.cpp 2010-02-12 11:12:15.000000000 +0000 -@@ -19,9 +19,7 @@ - - #include <clocale> - #include <cmath> --#if !defined(XALAN_NO_STD_NUMERIC_LIMITS) --#include <limits> --#endif -+#include <climits> - - - #include "DOMStringHelper.hpp" diff --git a/xalan-c-1.10.0-new-xerces-c.patch b/xalan-c-1.10.0-new-xerces-c.patch deleted file mode 100644 index 8cb3e45..0000000 --- a/xalan-c-1.10.0-new-xerces-c.patch +++ /dev/null @@ -1,6687 +0,0 @@ -Make Xalan-C++ 1.10.0 compile with Xerces-C++ 3. - -This patch is a backport of the following changesets: -http://svn.apache.org/viewvc?view=rev&revision=482425 -http://svn.apache.org/viewvc?view=rev&revision=572759 -http://svn.apache.org/viewvc?view=rev&revision=651671 -http://svn.apache.org/viewvc?view=rev&revision=671671 -http://svn.apache.org/viewvc?view=rev&revision=672824 -http://svn.apache.org/viewvc?view=rev&revision=672963 -http://svn.apache.org/viewvc?view=rev&revision=696900 - -They were applied against the following tag: -web: http://svn.apache.org/viewvc/xalan/c/tags/Xalan-C_1_10_0/ -svn: http://svn.apache.org/repos/asf/xalan/c/tags/Xalan-C_1_10_0/ - -Conflicts were resolved manually, trying to keep the intended meaning -of the change. No guarantees, though. - -See also: -https://bugs.gentoo.org/show_bug.cgi?id=242218 -http://thread.gmane.org/gmane.text.xml.xalan.c++.user/3600/focus=3601 -https://issues.apache.org/jira/browse/XALANC-622 -https://issues.apache.org/jira/browse/XALANC-652 - -2008-10-20 Martin von Gagern - -Index: src/xalanc/PlatformSupport/AttributesImpl.cpp -=================================================================== ---- src/xalanc/PlatformSupport/AttributesImpl.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/AttributesImpl.cpp (working copy) -@@ -109,7 +109,7 @@ - // until we're done. - AttributesVectorType tempVector(getMemoryManager()); - -- const unsigned int theLength = theRHS.getLength(); -+ const XalanSize_t theLength = theRHS.getLength(); - - if (theLength > 0) - { -@@ -167,12 +167,12 @@ - // safe and don't need any try blocks. - AttributesImpl theTempList(getMemoryManager()); - -- const unsigned int theLength = theRHS.getLength(); -+ const XalanSize_t theLength = theRHS.getLength(); - - theTempList.reserve(theLength); - - // Add each attribute. -- for(unsigned int i = 0; i < theLength; i++) -+ for(XalanSize_t i = 0; i < theLength; i++) - { - theTempList.addAttribute( - theRHS.getURI(i), -@@ -192,7 +192,7 @@ - - - --unsigned int -+XalanSize_t - AttributesImpl::getLength() const - { - return unsigned(m_attributesVector.size()); -@@ -201,7 +201,7 @@ - - - const XMLCh* --AttributesImpl::getURI(const unsigned int index) const -+AttributesImpl::getURI(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -211,7 +211,7 @@ - - - const XMLCh* --AttributesImpl::getLocalName(const unsigned int index) const -+AttributesImpl::getLocalName(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -221,7 +221,7 @@ - - - const XMLCh* --AttributesImpl::getQName(const unsigned int index) const -+AttributesImpl::getQName(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -231,7 +231,7 @@ - - - const XMLCh* --AttributesImpl::getType(const unsigned int index) const -+AttributesImpl::getType(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -241,7 +241,7 @@ - - - const XMLCh* --AttributesImpl::getValue(const unsigned int index) const -+AttributesImpl::getValue(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -380,18 +380,41 @@ - - - -+bool -+AttributesImpl::getIndex( -+ const XMLCh* const uri, -+ const XMLCh* const localPart, -+ XalanSize_t& index) const -+{ -+ const int tempIndex = -+ getIndex(uri, localPart); -+ -+ if (tempIndex == -1) -+ { -+ return false; -+ } -+ else -+ { -+ index = tempIndex; -+ -+ return true; -+ } -+} -+ -+ -+ - int - AttributesImpl::getIndex( - const XMLCh* const uri, -- const XMLCh* const localName) const -+ const XMLCh* const localPart) const - { -- assert(uri != 0 && localName != 0); -+ assert(uri != 0 && localPart != 0); - - const AttributesVectorType::const_iterator i = - XALAN_STD_QUALIFIER find_if( - m_attributesVector.begin(), - m_attributesVector.end(), -- URIAndLocalNameCompareFunctor(uri, localName)); -+ URIAndLocalNameCompareFunctor(uri, localPart)); - - if (i != m_attributesVector.end()) - { -@@ -407,6 +430,28 @@ - - - -+bool -+AttributesImpl::getIndex( -+ const XMLCh* const qName, -+ XalanSize_t& index) const -+{ -+ const int tempIndex = -+ getIndex(qName); -+ -+ if (tempIndex == -1) -+ { -+ return false; -+ } -+ else -+ { -+ index = tempIndex; -+ -+ return true; -+ } -+} -+ -+ -+ - int - AttributesImpl::getIndex(const XMLCh* const qname) const - { -Index: src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp -=================================================================== ---- src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/NamedNodeMapAttributeList.cpp (working copy) -@@ -43,13 +43,15 @@ - - - --NamedNodeMapAttributeList::NamedNodeMapAttributeList(const XalanNamedNodeMap& theMap, -- MemoryManagerType& theManager) : -+NamedNodeMapAttributeList::NamedNodeMapAttributeList( -+ const XalanNamedNodeMap& theMap, -+ MemoryManagerType& theManager) : - ParentType(), - m_nodeMap(theMap), - m_lastIndex(theMap.getLength() - 1), - m_memoryManager(theManager) - { -+ assert(theMap.getLength() != 0); - } - - -@@ -60,7 +62,7 @@ - - - --unsigned int -+XalanSize_t - NamedNodeMapAttributeList::getLength() const - { - return m_nodeMap.getLength(); -@@ -69,7 +71,7 @@ - - - const XMLCh* --NamedNodeMapAttributeList::getName(const unsigned int index) const -+NamedNodeMapAttributeList::getName(const XalanSize_t index) const - { - const XalanNode* const theAttribute = m_nodeMap.item(m_lastIndex - index); - assert(theAttribute != 0); -@@ -80,7 +82,7 @@ - - - const XMLCh* --NamedNodeMapAttributeList::getType(const unsigned int /* index */) const -+NamedNodeMapAttributeList::getType(const XalanSize_t /* index */) const - { - assert(length(s_typeString) > 0); - -@@ -90,9 +92,11 @@ - - - const XMLCh* --NamedNodeMapAttributeList::getValue(const unsigned int index) const -+NamedNodeMapAttributeList::getValue(const XalanSize_t index) const - { -- const XalanNode* const theAttribute = m_nodeMap.item(m_lastIndex - index); -+ assert(index <= m_lastIndex); -+ -+ const XalanNode* const theAttribute = m_nodeMap.item(m_lastIndex - index); - assert(theAttribute != 0); - - return c_wstr(theAttribute->getNodeValue()); -@@ -111,7 +115,7 @@ - - - const XMLCh* --NamedNodeMapAttributeList::getValue(const XMLCh* const name) const -+NamedNodeMapAttributeList::getValue(const XMLCh* const name) const - { - const XalanNode* theNode = m_nodeMap.getNamedItem(XalanDOMString(name, m_memoryManager)); - -Index: src/xalanc/PlatformSupport/StdBinInputStream.cpp -=================================================================== ---- src/xalanc/PlatformSupport/StdBinInputStream.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/StdBinInputStream.cpp (working copy) -@@ -43,7 +43,7 @@ - - - --unsigned int -+XalanFilePos - StdBinInputStream::curPos() const - { - return m_stream.tellg(); -@@ -51,10 +51,10 @@ - - - --unsigned int -+XalanSize_t - StdBinInputStream::readBytes( - XMLByte* const toFill, -- const unsigned int maxToRead) -+ const XalanSize_t maxToRead) - { - assert(sizeof(XMLByte) == sizeof(char)); - -@@ -80,4 +80,12 @@ - - - -+const XalanDOMChar* -+StdBinInputStream::getContentType() const -+{ -+ return 0; -+} -+ -+ -+ - XALAN_CPP_NAMESPACE_END -Index: src/xalanc/PlatformSupport/AttributeListImpl.hpp -=================================================================== ---- src/xalanc/PlatformSupport/AttributeListImpl.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/AttributeListImpl.hpp (working copy) -@@ -73,17 +73,17 @@ - } - - // These are inherited from AttributeList -- virtual unsigned int -+ virtual XalanSize_t - getLength() const; - - virtual const XMLCh* -- getName(const unsigned int index) const; -+ getName(const XalanSize_t index) const; - - virtual const XMLCh* -- getType(const unsigned int index) const; -+ getType(const XalanSize_t index) const; - - virtual const XMLCh* -- getValue(const unsigned int index) const; -+ getValue(const XalanSize_t index) const; - - virtual const XMLCh* - getType(const XMLCh* const name) const; -@@ -141,7 +141,7 @@ - * @param theCount The number to reserve - */ - void -- reserve(unsigned int theCount) -+ reserve(XalanSize_t theCount) - { - m_AttributeVector.reserve(theCount); - } -Index: src/xalanc/PlatformSupport/XSLException.hpp -=================================================================== ---- src/xalanc/PlatformSupport/XSLException.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/XSLException.hpp (working copy) -@@ -40,8 +40,6 @@ - { - public: - -- typedef XalanLocator::size_type size_type; -- - /** - * Constructor - * -@@ -119,7 +117,7 @@ - * - * @return the line number - */ -- size_type -+ XalanFileLoc - getLineNumber() const - { - return m_lineNumber; -@@ -130,13 +128,12 @@ - * - * @return the column number - */ -- size_type -+ XalanFileLoc - getColumnNumber() const - { - return m_columnNumber; - } - -- - MemoryManagerType& - getMemoryManager()const - { -Index: src/xalanc/PlatformSupport/XalanLocator.hpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanLocator.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanLocator.hpp (working copy) -@@ -45,8 +45,6 @@ - - typedef Locator ParentType; - -- typedef XMLSSize_t size_type; -- - XalanLocator() {} - - virtual -@@ -58,28 +56,28 @@ - virtual const XMLCh* - getSystemId() const = 0; - -- virtual size_type -+ virtual XalanFileLoc - getLineNumber() const = 0; - -- virtual size_type -+ virtual XalanFileLoc - getColumnNumber() const = 0; - -- static size_type -+ static XalanFileLoc - getLineNumber(const ParentType* theLocator) - { -- return theLocator == 0 ? size_type(-1) : theLocator->getLineNumber(); -+ return theLocator == 0 ? getUnknownValue() : theLocator->getLineNumber(); - } - -- static size_type -+ static XalanFileLoc - getColumnNumber(const ParentType* theLocator) - { -- return theLocator == 0 ? size_type(-1) : theLocator->getColumnNumber(); -+ return theLocator == 0 ? getUnknownValue() : theLocator->getColumnNumber(); - } - -- static size_type -+ static XalanFileLoc - getUnknownValue() - { -- return size_type(-1); -+ return XalanFileLoc(-1); - } - - private: -Index: src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp (working copy) -@@ -74,4 +74,12 @@ - - - -+MemoryManager* -+XalanMemoryManagerDefault::getExceptionMemoryManager() -+{ -+ return this; -+} -+ -+ -+ - XALAN_CPP_NAMESPACE_END -Index: src/xalanc/PlatformSupport/FormatterListener.hpp -=================================================================== ---- src/xalanc/PlatformSupport/FormatterListener.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/FormatterListener.hpp (working copy) -@@ -66,7 +66,7 @@ - typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler ParentType; - - // A handy typedef... Must match DocumentHandler's type for characters(), etc... -- typedef unsigned int size_type; -+ typedef XalanSize_t size_type; - - enum eFormat - { -Index: src/xalanc/PlatformSupport/DOMStringHelper.hpp -=================================================================== ---- src/xalanc/PlatformSupport/DOMStringHelper.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/DOMStringHelper.hpp (working copy) -@@ -705,7 +705,7 @@ - { - public: - -- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int); -+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type); - - static void - DoubleToCharacters( -Index: src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp -=================================================================== ---- src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp (working copy) -@@ -43,24 +43,25 @@ - typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList ParentType; - - explicit -- NamedNodeMapAttributeList(const XalanNamedNodeMap& theMap, -- MemoryManagerType& theManager); -+ NamedNodeMapAttributeList( -+ const XalanNamedNodeMap& theMap, -+ MemoryManagerType& theManager); - - virtual - ~NamedNodeMapAttributeList(); - - // These are inherited from AttributeList -- virtual unsigned int -+ virtual XalanSize_t - getLength() const; - - virtual const XalanDOMChar* -- getName(const unsigned int index) const; -+ getName(const XalanSize_t index) const; - - virtual const XalanDOMChar* -- getType(const unsigned int index) const; -+ getType(const XalanSize_t index) const; - - virtual const XalanDOMChar* -- getValue(const unsigned int index) const; -+ getValue(const XalanSize_t index) const; - - virtual const XalanDOMChar* - getType(const XalanDOMChar* const name) const; -@@ -83,11 +84,11 @@ - // Data members... - const XalanNamedNodeMap& m_nodeMap; - -- const unsigned int m_lastIndex; -+ const XalanSize_t m_lastIndex; - -+ MemoryManagerType& m_memoryManager; -+ - static const XalanDOMChar s_typeString[]; -- -- MemoryManagerType& m_memoryManager; - }; - - -Index: src/xalanc/PlatformSupport/AttributesImpl.hpp -=================================================================== ---- src/xalanc/PlatformSupport/AttributesImpl.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/AttributesImpl.hpp (working copy) -@@ -65,31 +65,42 @@ - AttributesImpl& - operator=(const AttributesType& theRHS); - -- // These are inherited from AttributeList -- virtual unsigned int -+ // These are inherited from Attributes -+ virtual XalanSize_t - getLength() const; - - virtual const XMLCh* -- getURI(const unsigned int index) const; -+ getURI(const XalanSize_t index) const; - - virtual const XMLCh* -- getLocalName(const unsigned int index) const; -+ getLocalName(const XalanSize_t index) const; - - virtual const XMLCh* -- getQName(const unsigned int index) const; -+ getQName(const XalanSize_t index) const; - - virtual const XMLCh* -- getType(const unsigned int index) const; -+ getType(const XalanSize_t index) const; - - virtual const XMLCh* -- getValue(const unsigned int index) const; -+ getValue(const XalanSize_t index) const; - -- virtual int -+ virtual bool -+ getIndex( -+ const XMLCh* const uri, -+ const XMLCh* const localPart, -+ XalanSize_t& index) const; -+ -+ virtual int - getIndex( - const XMLCh* const uri, -- const XMLCh* const localName) const; -+ const XMLCh* const localPart) const; - -- virtual int -+ virtual bool -+ getIndex( -+ const XMLCh* const qName, -+ XalanSize_t& index) const; -+ -+ virtual int - getIndex(const XMLCh* const qname) const; - - virtual const XMLCh* -@@ -186,7 +197,7 @@ - * @param theCount The number to reserve - */ - void -- reserve(unsigned int theCount) -+ reserve(XalanSize_t theCount) - { - m_attributesVector.reserve(theCount); - } -Index: src/xalanc/PlatformSupport/AttributeListImpl.cpp -=================================================================== ---- src/xalanc/PlatformSupport/AttributeListImpl.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/AttributeListImpl.cpp (working copy) -@@ -110,7 +110,7 @@ - // until we're done. - AttributeVectorType tempVector(getMemoryManager()); - -- const unsigned int theLength = theRHS.getLength(); -+ const XalanSize_t theLength = theRHS.getLength(); - - if (theLength > 0) - { -@@ -166,12 +166,12 @@ - // safe and don't need any try blocks. - AttributeListImpl theTempList(getMemoryManager()); - -- const unsigned int theLength = theRHS.getLength(); -+ const XalanSize_t theLength = theRHS.getLength(); - - theTempList.reserve(theLength); - - // Add each attribute. -- for(unsigned int i = 0; i < theLength; i++) -+ for(XalanSize_t i = 0; i < theLength; i++) - { - theTempList.addAttribute( - theRHS.getName(i), -@@ -189,7 +189,7 @@ - - - --unsigned int -+XalanSize_t - AttributeListImpl::getLength() const - { - // Make sure the mismatch between Xerces and vector<> doesn't cause a problem... -@@ -201,7 +201,7 @@ - - - const XMLCh* --AttributeListImpl::getName(const unsigned int index) const -+AttributeListImpl::getName(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -211,7 +211,7 @@ - - - const XMLCh* --AttributeListImpl::getType(const unsigned int index) const -+AttributeListImpl::getType(const XalanSize_t index) const - { - assert(index < getLength()); - -@@ -221,7 +221,7 @@ - - - const XMLCh* --AttributeListImpl::getValue(const unsigned int index) const -+AttributeListImpl::getValue(const XalanSize_t index) const - { - assert(index < getLength()); - -Index: src/xalanc/PlatformSupport/StdBinInputStream.hpp -=================================================================== ---- src/xalanc/PlatformSupport/StdBinInputStream.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/StdBinInputStream.hpp (working copy) -@@ -58,14 +58,17 @@ - virtual - ~StdBinInputStream(); - -- virtual unsigned int -+ virtual XalanFilePos - curPos() const; - -- virtual unsigned int -+ virtual XalanSize_t - readBytes( - XMLByte* const toFill, -- const unsigned int maxToRead); -+ const XalanSize_t maxToRead); - -+ virtual const XalanDOMChar* -+ getContentType() const; -+ - private: - - // Unimplemented... -Index: src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp (working copy) -@@ -52,6 +52,9 @@ - virtual void - deallocate(void* pointer); - -+ virtual MemoryManager* -+ getExceptionMemoryManager(); -+ - private: - - // These are not implemented. -Index: src/xalanc/PlatformSupport/XalanTranscodingServices.hpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanTranscodingServices.hpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanTranscodingServices.hpp (working copy) -@@ -56,8 +56,8 @@ - static void - terminate(); - -- typedef unsigned char XalanXMLByte; -- typedef unsigned int size_type; -+ typedef unsigned char XalanXMLByte; -+ typedef XalanSize_t size_type; - typedef unsigned int UnicodeCharType; - - static size_type -Index: src/xalanc/PlatformSupport/XalanMemoryManagement.cpp -=================================================================== ---- src/xalanc/PlatformSupport/XalanMemoryManagement.cpp (revision 706129) -+++ src/xalanc/PlatformSupport/XalanMemoryManagement.cpp (working copy) -@@ -40,7 +40,8 @@ - - return 0; - } -- virtual void -+ -+ virtual void - deallocate( void* /* pDataPointer */ ) - { - XALAN_USING_STD(bad_alloc) -@@ -48,8 +49,12 @@ - throw bad_alloc(); - - } -- -- -+ -+ MemoryManager* -+ getExceptionMemoryManager() -+ { -+ return this; -+ } - }; - - -Index: src/xalanc/Include/VCPPDefinitions.hpp -=================================================================== ---- src/xalanc/Include/VCPPDefinitions.hpp (revision 706129) -+++ src/xalanc/Include/VCPPDefinitions.hpp (working copy) -@@ -17,7 +17,7 @@ - #define VCPPDEFINITIONS_HEADER_GUARD_1357924680 - - --#pragma warning(disable: 4127 4251 4511 4512 4514 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715) -+#pragma warning(disable: 4127 4251 4345 4351 4511 4512 4514 4521 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715) - - - // --------------------------------------------------------------------------- -Index: src/xalanc/Include/PlatformDefinitions.hpp -=================================================================== ---- src/xalanc/Include/PlatformDefinitions.hpp (revision 706129) -+++ src/xalanc/Include/PlatformDefinitions.hpp (working copy) -@@ -120,6 +120,16 @@ - typedef unsigned short XalanDOMChar; - #endif - -+#if XERCES_VERSION_MAJOR < 3 -+typedef unsigned int XalanSize_t; -+typedef unsigned int XalanFilePos; -+typedef unsigned int XalanFileLoc; -+#else -+typedef XMLSize_t XalanSize_t; -+typedef XMLFilePos XalanFilePos; -+typedef XMLFileLoc XalanFileLoc; -+#endif -+ - template<bool value> - struct XalanCompileErrorBoolean - { -Index: src/xalanc/XPath/XPathProcessorImpl.hpp -=================================================================== ---- src/xalanc/XPath/XPathProcessorImpl.hpp (revision 706129) -+++ src/xalanc/XPath/XPathProcessorImpl.hpp (working copy) -@@ -70,6 +70,8 @@ - - typedef XalanVector<bool> BoolVectorType; - -+ typedef XalanDOMString::size_type t_size_type; -+ - XPathProcessorImpl(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR); - - virtual -@@ -121,12 +123,12 @@ - * When a separator token is found, see if there's a element name or the - * like to map. - */ -- int -+ t_size_type - mapNSTokens( - const XalanDOMString& pat, -- int startSubstring, -- int posOfNSSep, -- int posOfScan); -+ t_size_type startSubstring, -+ t_size_type posOfNSSep, -+ t_size_type posOfScan); - - /** - * Check if m_token==s. If m_token is null, this won't throw -Index: src/xalanc/XPath/XPathExecutionContextDefault.cpp -=================================================================== ---- src/xalanc/XPath/XPathExecutionContextDefault.cpp (revision 706129) -+++ src/xalanc/XPath/XPathExecutionContextDefault.cpp (working copy) -@@ -492,8 +492,8 @@ - { - assert(m_xpathEnvSupport != 0); - -- XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue(); -- XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue(); - - MemoryManagerType& theManager = const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager(); - -@@ -546,8 +546,8 @@ - { - assert(m_xpathEnvSupport != 0); - -- XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue(); -- XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue(); - - MemoryManagerType& theManager = const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager(); - -@@ -600,8 +600,8 @@ - { - assert(m_xpathEnvSupport != 0); - -- XalanLocator::size_type lineNumber = XalanLocator::getUnknownValue(); -- XalanLocator::size_type columnNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue(); - - MemoryManagerType& theManager = const_cast<XPathExecutionContextDefault*>(this)->getMemoryManager(); - -Index: src/xalanc/XPath/XPathExecutionContextDefault.hpp -=================================================================== ---- src/xalanc/XPath/XPathExecutionContextDefault.hpp (revision 706129) -+++ src/xalanc/XPath/XPathExecutionContextDefault.hpp (working copy) -@@ -32,9 +32,6 @@ - - - --/** -- * @author <a href="mailto:david_n_bertoni@lotus.com">David N. Bertoni</a> -- */ - // Base class include file. - #include <xalanc/XPath/XPathExecutionContext.hpp> - -@@ -346,7 +343,11 @@ - - protected: - -- typedef XalanObjectCache<MutableNodeRefList, DefaultCacheCreateFunctorMemMgr<MutableNodeRefList>, DeleteFunctor<MutableNodeRefList>, ClearCacheResetFunctor<MutableNodeRefList> > NodeListCacheType; -+ typedef XalanObjectCache< -+ MutableNodeRefList, -+ DefaultCacheCreateFunctorMemMgr<MutableNodeRefList>, -+ DeleteFunctor<MutableNodeRefList>, -+ ClearCacheResetFunctor<MutableNodeRefList> > NodeListCacheType; - - enum { eNodeListCacheListSize = 50 }; - -Index: src/xalanc/XPath/FormatterStringLengthCounter.cpp -=================================================================== ---- src/xalanc/XPath/FormatterStringLengthCounter.cpp (revision 706129) -+++ src/xalanc/XPath/FormatterStringLengthCounter.cpp (working copy) -@@ -76,8 +76,8 @@ - - void - FormatterStringLengthCounter::characters( -- const XMLCh* const /* chars */, -- const unsigned int length) -+ const XMLCh* const /* chars */, -+ const size_type length) - { - m_count += length; - } -@@ -86,8 +86,8 @@ - - void - FormatterStringLengthCounter::charactersRaw( -- const XMLCh* const /* chars */, -- const unsigned int /*length */) -+ const XMLCh* const /* chars */, -+ const size_type /*length */) - { - } - -@@ -101,8 +101,8 @@ - - void - FormatterStringLengthCounter::ignorableWhitespace( -- const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const XMLCh* const /* chars */, -+ const size_type /* length */) - { - } - -@@ -133,8 +133,8 @@ - - void - FormatterStringLengthCounter::cdata( -- const XMLCh* const /* ch */, -- const unsigned int /* length */) -+ const XMLCh* const /* ch */, -+ const size_type /* length */) - { - } - -Index: src/xalanc/XPath/XPathConstructionContext.hpp -=================================================================== ---- src/xalanc/XPath/XPathConstructionContext.hpp (revision 706129) -+++ src/xalanc/XPath/XPathConstructionContext.hpp (working copy) -@@ -123,20 +123,11 @@ - { - } - -- // Note non-const copy semantics... -- GetAndReleaseCachedString(GetAndReleaseCachedString& theSource) : -- m_constructionContext(theSource.m_constructionContext), -- m_string(theSource.m_string) -- { -- theSource.m_string = 0; -- } -- - ~GetAndReleaseCachedString() - { -- if (m_string != 0) -- { -- m_constructionContext->releaseCachedString(*m_string); -- } -+ assert(m_string != 0); -+ -+ m_constructionContext->releaseCachedString(*m_string); - } - - XalanDOMString& -@@ -150,13 +141,18 @@ - XPathConstructionContext& - getConstructionContext() const - { -+ assert(m_constructionContext != 0); -+ - return *m_constructionContext; - } - -- - private: - - // Not implemented... -+ GetAndReleaseCachedString(); -+ -+ GetAndReleaseCachedString(const GetAndReleaseCachedString&); -+ - GetAndReleaseCachedString& - operator=(const GetAndReleaseCachedString&); - -Index: src/xalanc/XPath/XPathExecutionContext.hpp -=================================================================== ---- src/xalanc/XPath/XPathExecutionContext.hpp (revision 706129) -+++ src/xalanc/XPath/XPathExecutionContext.hpp (working copy) -@@ -35,9 +35,6 @@ - - - --/** -- * @author <a href="mailto:david_n_bertoni@lotus.com">David N. Bertoni</a> -- */ - // Base class header file... - #include <xalanc/PlatformSupport/ExecutionContext.hpp> - -@@ -470,6 +467,10 @@ - private: - - // Not implemented... -+ GetAndReleaseCachedString(); -+ -+ GetAndReleaseCachedString(const GetAndReleaseCachedString&); -+ - GetAndReleaseCachedString& - operator=(const GetAndReleaseCachedString&); - -Index: src/xalanc/XPath/XObject.hpp -=================================================================== ---- src/xalanc/XPath/XObject.hpp (revision 706129) -+++ src/xalanc/XPath/XObject.hpp (working copy) -@@ -141,7 +141,7 @@ - virtual const XalanDOMString& - str() const; - -- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int); -+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type); - - /** - * Send the string value to a FormatterListener instance. -Index: src/xalanc/XPath/FormatterStringLengthCounter.hpp -=================================================================== ---- src/xalanc/XPath/FormatterStringLengthCounter.hpp (revision 706129) -+++ src/xalanc/XPath/FormatterStringLengthCounter.hpp (working copy) -@@ -41,8 +41,6 @@ - { - public: - -- typedef unsigned long size_type; -- - /** - * FormatterStringLengthCounter instance constructor. - */ -@@ -81,12 +79,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -94,7 +92,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -110,7 +108,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - private: - -Index: src/xalanc/XPath/XPathProcessorImpl.cpp -=================================================================== ---- src/xalanc/XPath/XPathProcessorImpl.cpp (revision 706129) -+++ src/xalanc/XPath/XPathProcessorImpl.cpp (working copy) -@@ -212,16 +212,16 @@ - - m_expression->setCurrentPattern(m_constructionContext->getPooledString(pat)); - -- const int nChars = length(pat); -+ const t_size_type nChars = length(pat); - -- int startSubstring = -1; -- int posOfNSSep = -1; -+ t_size_type startSubstring = XalanDOMString::npos; -+ t_size_type posOfNSSep = XalanDOMString::npos; - - const XPathConstructionContext::GetAndReleaseCachedString theGuard(*m_constructionContext); - - XalanDOMString& theToken = theGuard.get(); - -- for(int i = 0; i < nChars; i++) -+ for(t_size_type i = 0; i < nChars; i++) - { - XalanDOMChar c = charAt(pat, i); - -@@ -229,9 +229,9 @@ - { - case XalanUnicode::charQuoteMark: - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i); - } -@@ -253,7 +253,7 @@ - - addToTokenQueue(theToken); - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - else - { -@@ -264,9 +264,9 @@ - - case XalanUnicode::charApostrophe: - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i); - } -@@ -288,7 +288,7 @@ - - addToTokenQueue(theToken); - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - else - { -@@ -302,9 +302,9 @@ - case XalanUnicode::charSpace: - case XalanUnicode::charHTab: - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i); - } -@@ -315,14 +315,14 @@ - addToTokenQueue(theToken); - } - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - } - break; - - case XalanUnicode::charHyphenMinus: - { -- if(!(startSubstring == -1)) -+ if(!(startSubstring == XalanDOMString::npos)) - { - break; - } -@@ -347,9 +347,9 @@ - case XalanUnicode::charLessThanSign: - case XalanUnicode::charGreaterThanSign: - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, i); - } -@@ -360,7 +360,7 @@ - addToTokenQueue(theToken); - } - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - - substring(pat, theToken, i, i + 1); -@@ -373,7 +373,7 @@ - { - if(posOfNSSep == i - 1 && i > 0) - { -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { - if (startSubstring < i - 1) - { -@@ -383,8 +383,8 @@ - } - } - -- startSubstring = -1; -- posOfNSSep = -1; -+ startSubstring = XalanDOMString::npos; -+ posOfNSSep = XalanDOMString::npos; - - substring(pat, theToken, i - 1, i + 1); - -@@ -401,7 +401,7 @@ - - default: - { -- if(-1 == startSubstring) -+ if(XalanDOMString::npos == startSubstring) - { - startSubstring = i; - -@@ -440,16 +440,16 @@ - - addToTokenQueue(theToken); - -- startSubstring = -1; -+ startSubstring = XalanDOMString::npos; - } - } - } - } - } - -- if(startSubstring != -1) -+ if(startSubstring != XalanDOMString::npos) - { -- if(-1 != posOfNSSep) -+ if(XalanDOMString::npos != posOfNSSep) - { - posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, nChars); - } -@@ -504,12 +504,12 @@ - - - --int -+XPathProcessorImpl::t_size_type - XPathProcessorImpl::mapNSTokens( - const XalanDOMString& pat, -- int startSubstring, -- int posOfNSSep, -- int posOfScan) -+ t_size_type startSubstring, -+ t_size_type posOfNSSep, -+ t_size_type posOfScan) - { - assert(m_prefixResolver != 0); - -@@ -575,7 +575,7 @@ - } - } - -- return -1; -+ return XalanDOMString::npos; - } - - -@@ -2938,14 +2938,16 @@ - bool - XPathProcessorImpl::isCurrentLiteral() const - { -- const int last = length(m_token) - 1; -+ const t_size_type theLength = m_token.length(); - -- if (last <= 0) -+ if (theLength <= 1) - { - return false; - } - else - { -+ const t_size_type last = theLength - 1; -+ - const XalanDOMChar c0 = m_tokenChar; - const XalanDOMChar cX = charAt(m_token, last); - -Index: src/xalanc/XPath/XPath.hpp -=================================================================== ---- src/xalanc/XPath/XPath.hpp (revision 706129) -+++ src/xalanc/XPath/XPath.hpp (working copy) -@@ -241,7 +241,7 @@ - XPathExecutionContext& executionContext, - XalanDOMString& result) const; - -- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int); -+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type); - - /** - * Execute the XPath from the provided context. -Index: src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp -=================================================================== ---- src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp (working copy) -@@ -83,6 +83,12 @@ - - static ExceptionCode - translateErrorCode(DOMExceptionType::ExceptionCode theCode); -+ -+ static ExceptionCode -+ translateErrorCode(short theCode) -+ { -+ return translateErrorCode(static_cast<DOMExceptionType::ExceptionCode>(theCode)); -+ } - }; - - -Index: src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp -=================================================================== ---- src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp (working copy) -@@ -741,7 +741,12 @@ - DOMParserType* const theParser = - new (&theMemoryManager) DOMParserType(0, &theMemoryManager); - -+#if XERCES_VERSION_MAJOR < 3 - theParser->setExpandEntityReferences(true); -+#else -+ theParser->setCreateEntityReferenceNodes(false); -+#endif -+ - theParser->setDoNamespaces(m_doNamespaces); - theParser->setEntityResolver(m_entityResolver); - -@@ -759,7 +764,11 @@ - SAXParserType* const theParser = - new (&theMemoryManager) SAXParserType(0, &theMemoryManager); - -+#if XERCES_VERSION_MAJOR < 3 - theParser->setDoValidation(false); -+#else -+ theParser->setValidationScheme(SAXParserType::Val_Never); -+#endif - - theParser->setDoNamespaces(false); - -Index: src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp -=================================================================== ---- src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp (working copy) -@@ -48,17 +48,17 @@ - ~XercesNamedNodeMapAttributeList(); - - // These are inherited from AttributeList -- virtual unsigned int -+ virtual XalanSize_t - getLength() const; - - virtual const XMLCh* -- getName(const unsigned int index) const; -+ getName(const XalanSize_t index) const; - - virtual const XMLCh* -- getType(const unsigned int index) const; -+ getType(const XalanSize_t index) const; - - virtual const XMLCh* -- getValue(const unsigned int index) const; -+ getValue(const XalanSize_t index) const; - - virtual const XMLCh* - getType(const XMLCh* const name) const; -@@ -81,7 +81,7 @@ - // Data members... - const DOMNamedNodeMapType* const m_nodeMap; - -- const XMLSizeType m_lastIndex; -+ const XalanSize_t m_lastIndex; - - static const XMLCh s_typeString[]; - }; -Index: src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp -=================================================================== ---- src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp (working copy) -@@ -191,7 +191,7 @@ - void - FormatterToXercesDOM::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - m_textBuffer.append(chars, length); - } -@@ -201,7 +201,7 @@ - void - FormatterToXercesDOM::charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - try - { -@@ -237,7 +237,7 @@ - void - FormatterToXercesDOM::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - try - { -@@ -301,7 +301,7 @@ - void - FormatterToXercesDOM::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - try - { -Index: src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp -=================================================================== ---- src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.cpp (working copy) -@@ -48,6 +48,7 @@ - m_nodeMap(theMap), - m_lastIndex(theMap->getLength() - 1) - { -+ assert(theMap->getLength() != 0); - } - - -@@ -58,7 +59,7 @@ - - - --unsigned int -+XalanSize_t - XercesNamedNodeMapAttributeList::getLength() const - { - return m_lastIndex + 1; -@@ -67,7 +68,7 @@ - - - const XMLCh* --XercesNamedNodeMapAttributeList::getName(const unsigned int index) const -+XercesNamedNodeMapAttributeList::getName(const XalanSize_t index) const - { - const DOMNodeType* const theAttribute = m_nodeMap->item(m_lastIndex - index); - assert(theAttribute != 0); -@@ -78,7 +79,7 @@ - - - const XMLCh* --XercesNamedNodeMapAttributeList::getType(const unsigned int /* index */) const -+XercesNamedNodeMapAttributeList::getType(const XalanSize_t /* index */) const - { - assert(length(s_typeString) > 0); - -@@ -88,7 +89,7 @@ - - - const XMLCh* --XercesNamedNodeMapAttributeList::getValue(const unsigned int index) const -+XercesNamedNodeMapAttributeList::getValue(const XalanSize_t index) const - { - const DOMNodeType* const theAttribute = m_nodeMap->item(m_lastIndex - index); - assert(theAttribute != 0); -@@ -126,7 +127,7 @@ - const XMLCh* - XercesNamedNodeMapAttributeList::getValue(const char* const /*name*/) const - { -- assert( 0 ); -+ assert(false); - - return 0; - } -Index: src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp -=================================================================== ---- src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp (revision 706129) -+++ src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp (working copy) -@@ -82,12 +82,12 @@ - ~FormatterToXercesDOM(); - - -- // These methods are inherited from DocumentHandler ... -+ // These methods are inherited from FormatterListener... - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - comment(const XMLCh* const data); -@@ -95,7 +95,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -120,12 +120,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -Index: src/xalanc/XSLT/XSLTProcessor.hpp -=================================================================== ---- src/xalanc/XSLT/XSLTProcessor.hpp (revision 706129) -+++ src/xalanc/XSLT/XSLTProcessor.hpp (working copy) -@@ -80,7 +80,7 @@ - { - public: - -- typedef size_t size_type; -+ typedef XalanSize_t size_type; - - XSLTProcessor(); - -Index: src/xalanc/XSLT/ElemCopyOf.cpp -=================================================================== ---- src/xalanc/XSLT/ElemCopyOf.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemCopyOf.cpp (working copy) -@@ -49,8 +49,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -60,13 +60,13 @@ - { - bool isSelectCurrentNode = false; - -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; ++i) -+ for (XalanSize_t i = 0; i < nAttrs; ++i) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_SELECT)) -+ if (equals(aname, Constants::ATTRNAME_SELECT)) - { - const XalanDOMChar* const avalue = atts.getValue(i); - assert(avalue != 0); -@@ -80,7 +80,7 @@ - m_selectPattern = constructionContext.createXPath(getLocator(), avalue, *this); - } - } -- else if(isAttrOK( -+ else if (isAttrOK( - aname, - atts, - i, -@@ -124,7 +124,7 @@ - - if (m_selectPattern == 0) - { -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - StylesheetExecutionContext::BorrowReturnMutableNodeRefList theNodeList(executionContext); - -@@ -147,7 +147,7 @@ - const XObjectPtr value(m_selectPattern->execute(*this, executionContext)); - assert(value.null() == false); - -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - executionContext.fireSelectEvent( - SelectionEvent( -@@ -209,7 +209,7 @@ - - if (m_selectPattern == 0) - { -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - StylesheetExecutionContext::BorrowReturnMutableNodeRefList theNodeList(executionContext); - -@@ -232,7 +232,7 @@ - const XObjectPtr value(m_selectPattern->execute(*this, executionContext)); - assert(value.null() == false); - -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - executionContext.fireSelectEvent( - SelectionEvent( -@@ -283,7 +283,7 @@ - - - const XPath* --ElemCopyOf::getXPath(unsigned int index) const -+ElemCopyOf::getXPath(XalanSize_t index) const - { - return index == 0 ? m_selectPattern : 0; - } -Index: src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp -=================================================================== ---- src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemAttributeSetAllocator.cpp (working copy) -@@ -23,7 +23,9 @@ - - - --XalanElemAttributeSetAllocator::XalanElemAttributeSetAllocator(MemoryManagerType& theManager, size_type theBlockCount) : -+XalanElemAttributeSetAllocator::XalanElemAttributeSetAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount) : - m_allocator(theManager, theBlockCount) - { - } -@@ -41,8 +43,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - data_type* const theBlock = m_allocator.allocateBlock(); - assert(theBlock != 0); -Index: src/xalanc/XSLT/ElemAttribute.hpp -=================================================================== ---- src/xalanc/XSLT/ElemAttribute.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemAttribute.hpp (working copy) -@@ -52,8 +52,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemAttribute(); -Index: src/xalanc/XSLT/XalanElemElementAllocator.hpp -=================================================================== ---- src/xalanc/XSLT/XalanElemElementAllocator.hpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemElementAllocator.hpp (working copy) -@@ -57,7 +57,9 @@ - * - * @param theBlockSize The block size. - */ -- XalanElemElementAllocator(MemoryManagerType& theManager, size_type theBlockCount); -+ XalanElemElementAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount); - - ~XalanElemElementAllocator(); - -@@ -77,8 +79,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - /** - * Determine if an object is owned by the allocator... -Index: src/xalanc/XSLT/XalanElemAttributeAllocator.hpp -=================================================================== ---- src/xalanc/XSLT/XalanElemAttributeAllocator.hpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemAttributeAllocator.hpp (working copy) -@@ -57,7 +57,9 @@ - * - * @param theBlockSize The block size. - */ -- XalanElemAttributeAllocator(MemoryManagerType& theManager, size_type theBlockCount); -+ XalanElemAttributeAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount); - - ~XalanElemAttributeAllocator(); - -@@ -77,8 +79,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - /** - * Determine if an object is owned by the allocator... -Index: src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp -=================================================================== ---- src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp (working copy) -@@ -631,8 +631,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - Type* theResult; - -@@ -656,9 +656,12 @@ - const AttributeListType& atts, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = XalanLocator::getLineNumber(locator); -- const XalanLocator::size_type columnNumber = XalanLocator::getColumnNumber(locator); -+ const XalanFileLoc lineNumber = -+ XalanLocator::getLineNumber(locator); - -+ const XalanFileLoc columnNumber = -+ XalanLocator::getColumnNumber(locator); -+ - ElemTemplateElement* theElement = 0; - - switch(token) -@@ -975,9 +978,12 @@ - const AttributeListType& atts, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = XalanLocator::getLineNumber(locator); -- const XalanLocator::size_type columnNumber = XalanLocator::getColumnNumber(locator); -+ const XalanFileLoc lineNumber = -+ XalanLocator::getLineNumber(locator); - -+ const XalanFileLoc columnNumber = -+ XalanLocator::getColumnNumber(locator); -+ - ElemTemplateElement* theElement = 0; - - if (token == ELEMNAME_LITERAL_RESULT) -@@ -1032,9 +1038,6 @@ - ExtensionNSHandler& handler, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = XalanLocator::getLineNumber(locator); -- const XalanLocator::size_type columnNumber = XalanLocator::getColumnNumber(locator); -- - m_allocatedElements.push_back(0); - - m_allocatedElements.back() = ElemExtensionCall::create( -@@ -1043,8 +1046,8 @@ - stylesheetTree, - name, - atts, -- lineNumber, -- columnNumber, -+ XalanLocator::getLineNumber(locator), -+ XalanLocator::getColumnNumber(locator), - handler); - - return m_allocatedElements.back(); -@@ -1061,14 +1064,11 @@ - bool disableOutputEscaping, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = XalanLocator::getLineNumber(locator); -- const XalanLocator::size_type columnNumber = XalanLocator::getColumnNumber(locator); -- - return m_elemTextLiteralAllocator.create( - *this, - stylesheetTree, -- lineNumber, -- columnNumber, -+ XalanLocator::getLineNumber(locator), -+ XalanLocator::getColumnNumber(locator), - chars, - 0, - length, -@@ -1992,7 +1992,7 @@ - } - }; - --const unsigned int StylesheetConstructionContextDefault::s_elementTokenTableSize = -+const XalanSize_t StylesheetConstructionContextDefault::s_elementTokenTableSize = - sizeof(s_elementTokenTable) / sizeof(s_elementTokenTable[0]); - - const StylesheetConstructionContextDefault::ElementTokenTableEntry& StylesheetConstructionContextDefault::s_elementTokenTableLast = -Index: src/xalanc/XSLT/StylesheetConstructionContext.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetConstructionContext.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetConstructionContext.hpp (working copy) -@@ -76,12 +76,6 @@ - - typedef XalanQName::NamespacesStackType NamespacesStackType; - --#if defined(XALAN_STRICT_ANSI_HEADERS) -- typedef std::size_t size_type; --#else -- typedef size_t size_type; --#endif -- - /** - * IDs for XSL element types. These are the values - * that must be returned by getElementToken(). -Index: src/xalanc/XSLT/ElemDecimalFormat.hpp -=================================================================== ---- src/xalanc/XSLT/ElemDecimalFormat.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemDecimalFormat.hpp (working copy) -@@ -57,8 +57,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - - ~ElemDecimalFormat(); -@@ -83,7 +83,7 @@ - } - - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index) const; - - private: - -Index: src/xalanc/XSLT/ElemAttributeSet.hpp -=================================================================== ---- src/xalanc/XSLT/ElemAttributeSet.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemAttributeSet.hpp (working copy) -@@ -49,8 +49,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemAttributeSet(); -Index: src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp -=================================================================== ---- src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (working copy) -@@ -928,9 +928,9 @@ - - void - StylesheetExecutionContextDefault::characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length) - { - assert(m_xsltProcessor != 0); - -@@ -941,9 +941,9 @@ - - void - StylesheetExecutionContextDefault::charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length) - { - assert(m_xsltProcessor != 0); - -Index: src/xalanc/XSLT/ElemSort.cpp -=================================================================== ---- src/xalanc/XSLT/ElemSort.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemSort.cpp (working copy) -@@ -39,8 +39,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -52,38 +52,38 @@ - m_orderAVT(0), - m_caseOrderAVT(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_SELECT)) -+ if (equals(aname, Constants::ATTRNAME_SELECT)) - { - m_selectPattern - = constructionContext.createXPath(getLocator(), atts.getValue(i), *this); - } -- else if(equals(aname, Constants::ATTRNAME_LANG)) -+ else if (equals(aname, Constants::ATTRNAME_LANG)) - { - m_langAVT = - constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this); - } -- else if(equals(aname, Constants::ATTRNAME_DATATYPE)) -+ else if (equals(aname, Constants::ATTRNAME_DATATYPE)) - { - m_dataTypeAVT = - constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this); - } -- else if(equals(aname, Constants::ATTRNAME_ORDER)) -+ else if (equals(aname, Constants::ATTRNAME_ORDER)) - { - m_orderAVT = - constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this); - } -- else if(equals(aname, Constants::ATTRNAME_CASEORDER)) -+ else if (equals(aname, Constants::ATTRNAME_CASEORDER)) - { - m_caseOrderAVT = - constructionContext.createAVT(getLocator(), aname, atts.getValue(i), *this); - } -- else if(isAttrOK( -+ else if (isAttrOK( - aname, - atts, - i, -@@ -126,8 +126,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - typedef ElemSort ThisType; - -@@ -163,7 +163,7 @@ - - - const XPath* --ElemSort::getXPath(unsigned int index) const -+ElemSort::getXPath(XalanSize_t index) const - { - return index == 0 ? m_selectPattern : 0; - } -Index: src/xalanc/XSLT/ElemElement.hpp -=================================================================== ---- src/xalanc/XSLT/ElemElement.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemElement.hpp (working copy) -@@ -60,8 +60,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemElement(); -Index: src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp -=================================================================== ---- src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp (working copy) -@@ -57,7 +57,9 @@ - * - * @param theBlockSize The block size. - */ -- XalanElemApplyTemplatesAllocator(MemoryManagerType& theManager, size_type theBlockCount); -+ XalanElemApplyTemplatesAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount); - - ~XalanElemApplyTemplatesAllocator(); - -@@ -77,8 +79,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - /** - * Determine if an object is owned by the allocator... -Index: src/xalanc/XSLT/ElemCopyOf.hpp -=================================================================== ---- src/xalanc/XSLT/ElemCopyOf.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemCopyOf.hpp (working copy) -@@ -57,8 +57,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - - -@@ -76,7 +76,7 @@ - execute(StylesheetExecutionContext& executionContext) const; - #endif - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index) const; - - private: - -Index: src/xalanc/XSLT/ElemApplyTemplates.cpp -=================================================================== ---- src/xalanc/XSLT/ElemApplyTemplates.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemApplyTemplates.cpp (working copy) -@@ -50,8 +50,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ParentType( - constructionContext, - stylesheetTree, -@@ -60,9 +60,9 @@ - StylesheetConstructionContext::ELEMNAME_APPLY_TEMPLATES), - m_mode(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -Index: src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp -=================================================================== ---- src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp (working copy) -@@ -57,7 +57,9 @@ - * - * @param theBlockSize The block size. - */ -- XalanElemAttributeSetAllocator(MemoryManagerType& theManager, size_type theBlockCount); -+ XalanElemAttributeSetAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount); - - ~XalanElemAttributeSetAllocator(); - -@@ -77,8 +79,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - /** - * Determine if an object is owned by the allocator... -Index: src/xalanc/XSLT/StylesheetExecutionContext.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetExecutionContext.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetExecutionContext.hpp (working copy) -@@ -56,6 +56,7 @@ - - - #include <xalanc/PlatformSupport/AttributeListImpl.hpp> -+#include <xalanc/PlatformSupport/FormatterListener.hpp> - #include <xalanc/PlatformSupport/XalanCollationServices.hpp> - - -@@ -105,12 +106,10 @@ - { - public: - --#if defined(XALAN_STRICT_ANSI_HEADERS) -- typedef std::size_t tl_size_type; --#else -- typedef size_t tl_size_type; --#endif -+ typedef XalanSize_t tl_size_type; - -+ typedef FormatterListener::size_type fl_size_type; -+ - #if defined(XALAN_NO_STD_NAMESPACE) - typedef ostream StreamType; - #else -@@ -1069,9 +1068,9 @@ - */ - virtual void - characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) = 0; -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length) = 0; - - /** - * Receive notification of character data. If available, when the -@@ -1084,9 +1083,9 @@ - */ - virtual void - charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) = 0; -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length) = 0; - - /** - * Called when a Comment is to be constructed. -Index: src/xalanc/XSLT/ElemTemplateElement.cpp -=================================================================== ---- src/xalanc/XSLT/ElemTemplateElement.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemTemplateElement.cpp (working copy) -@@ -82,8 +82,8 @@ - ElemTemplateElement::ElemTemplateElement( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken) : - PrefixResolver(), - m_stylesheet(stylesheetTree), -@@ -112,8 +112,8 @@ - Stylesheet& stylesheetTree, - int xslToken, - const XalanDOMString& baseURI, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - PrefixResolver(), - m_stylesheet(stylesheetTree), - m_namespacesHandler(constructionContext.getMemoryManager()), -@@ -158,7 +158,7 @@ - ElemTemplateElement::isAttrOK( - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext) const - { - return m_stylesheet.isAttrOK(attrName, atts, which, constructionContext); -@@ -171,7 +171,7 @@ - const XalanDOMChar* elementName, - const XalanDOMChar* aname, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext) - { - if(constructionContext.isXMLSpaceAttribute( -@@ -1062,12 +1062,13 @@ - - - const XPath* --ElemTemplateElement::getXPath(unsigned int /* index */) const -+ElemTemplateElement::getXPath(XalanSize_t /* index */) const - { - return 0; - } - - -+ - #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION) - const ElemTemplateElement* - ElemTemplateElement::findTemplateToTransformChild( -@@ -1504,8 +1505,8 @@ - - - ElemTemplateElement::LocatorProxy::LocatorProxy( -- size_type theLineNumber, -- size_type theColumnNumber, -+ XMLFileLoc theLineNumber, -+ XMLFileLoc theColumnNumber, - const XalanDOMString& theURI) : - m_lineNumber(theLineNumber), - m_columnNumber(theColumnNumber), -@@ -1521,7 +1522,7 @@ - - - --ElemTemplateElement::LocatorProxy::size_type -+XMLFileLoc - ElemTemplateElement::LocatorProxy::getLineNumber() const - { - return m_lineNumber; -@@ -1529,7 +1530,7 @@ - - - --ElemTemplateElement::LocatorProxy::size_type -+XMLFileLoc - ElemTemplateElement::LocatorProxy::getColumnNumber() const - { - return m_columnNumber; -Index: src/xalanc/XSLT/Stylesheet.cpp -=================================================================== ---- src/xalanc/XSLT/Stylesheet.cpp (revision 706129) -+++ src/xalanc/XSLT/Stylesheet.cpp (working copy) -@@ -252,9 +252,9 @@ - XPath* matchAttr = 0; - XPath* useAttr = 0; - -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for(XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -@@ -317,7 +317,7 @@ - } - } - -- if(0 == theQName) -+ if (0 == theQName) - { - const GetAndReleaseCachedString theGuard(constructionContext); - -@@ -331,7 +331,7 @@ - locator); - } - -- if(0 == matchAttr) -+ if (0 == matchAttr) - { - const GetAndReleaseCachedString theGuard(constructionContext); - -@@ -345,7 +345,7 @@ - locator); - } - -- if(0 == useAttr) -+ if (0 == useAttr) - { - const GetAndReleaseCachedString theGuard(constructionContext); - -@@ -374,13 +374,13 @@ - void - Stylesheet::pushNamespaces(const AttributeListType& atts) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - - NamespaceVectorType namespaces(getMemoryManager()); - - XalanDOMString prefix(getMemoryManager()); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for(XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - const XalanDOMChar* const value = atts.getValue(i); -@@ -438,12 +438,10 @@ - Stylesheet::PatternTableVectorType& theList, - const XalanMatchPatternData* thePattern) - { -- -- typedef Stylesheet::size_type size_type; - assert(thePattern != 0); - - const double thePatternPriority = thePattern->getPriorityOrDefault(); -- const size_type thePatternPosition = thePattern->getPosition(); -+ const XalanSize_t thePatternPosition = thePattern->getPosition(); - - typedef Stylesheet::PatternTableVectorType PatternTableListType; - typedef PatternTableListType::iterator iterator; -@@ -452,7 +450,7 @@ - - const iterator theEnd = theList.end(); - -- while(theCurrent != theEnd) -+ while (theCurrent != theEnd) - { - const double theCurrentPriority = (*theCurrent)->getPriorityOrDefault(); - -@@ -626,7 +624,7 @@ - Stylesheet::isAttrOK( - const XalanDOMChar* attrName, - const AttributeListType& /* atts */, -- int /* which */, -+ XalanSize_t /* which */, - StylesheetConstructionContext& constructionContext) const - { - // Namespace declarations are OK by definition -@@ -1497,16 +1495,16 @@ - const AttributeListType& atts, - StylesheetConstructionContext& constructionContext) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - - const XalanDOMString* stylesheetNamespace = 0; - const XalanDOMString* resultNamespace = 0; - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_STYLESHEET_PREFIX) == true) -+ if (equals(aname, Constants::ATTRNAME_STYLESHEET_PREFIX) == true) - { - const XalanDOMChar* const value = atts.getValue(i); - -@@ -1519,7 +1517,7 @@ - stylesheetNamespace = getNamespaceForPrefix(value, constructionContext); - } - } -- else if(equals(aname, Constants::ATTRNAME_RESULT_PREFIX)) -+ else if (equals(aname, Constants::ATTRNAME_RESULT_PREFIX)) - { - const XalanDOMChar* const value = atts.getValue(i); - -@@ -1532,7 +1530,7 @@ - resultNamespace = getNamespaceForPrefix(value, constructionContext); - } - } -- else if(!isAttrOK(aname, atts, i, constructionContext)) -+ else if (!isAttrOK(aname, atts, i, constructionContext)) - { - const GetAndReleaseCachedString theGuard(constructionContext); - -@@ -1588,10 +1586,10 @@ - const AttributeListType& atts, - const LocatorType* locator) - { -- const XalanLocator::size_type lineNumber = -+ const XalanFileLoc lineNumber = - XalanLocator::getLineNumber(locator); - -- const XalanLocator::size_type columnNumber = -+ const XalanFileLoc columnNumber = - XalanLocator::getColumnNumber(locator); - - m_elemDecimalFormats.reserve(m_elemDecimalFormats.size() + 1); -Index: src/xalanc/XSLT/ElemUse.cpp -=================================================================== ---- src/xalanc/XSLT/ElemUse.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemUse.cpp (working copy) -@@ -48,8 +48,8 @@ - ElemUse::ElemUse( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken) : - ElemTemplateElement(constructionContext, - stylesheetTree, -@@ -268,7 +268,7 @@ - StylesheetConstructionContext& constructionContext, - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which) -+ XalanSize_t which) - { - bool isUAS = false; - -Index: src/xalanc/XSLT/ElemValueOf.cpp -=================================================================== ---- src/xalanc/XSLT/ElemValueOf.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemValueOf.cpp (working copy) -@@ -185,7 +185,7 @@ - void - characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - m_executionContext.characters(chars, 0, length); - } -@@ -193,7 +193,7 @@ - void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - m_executionContext.charactersRaw(chars, 0, length); - } -@@ -206,7 +206,7 @@ - void - ignorableWhitespace( - const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -232,7 +232,7 @@ - void - cdata( - const XMLCh* const /* ch */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -Index: src/xalanc/XSLT/ElemCopy.cpp -=================================================================== ---- src/xalanc/XSLT/ElemCopy.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemCopy.cpp (working copy) -@@ -46,32 +46,32 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemUse(constructionContext, - stylesheetTree, - lineNumber, - columnNumber, - StylesheetConstructionContext::ELEMNAME_COPY) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(processUseAttributeSets( -+ if (processUseAttributeSets( - constructionContext, - aname, - atts, - i) == false && -- processSpaceAttr( -+ processSpaceAttr( - Constants::ELEMNAME_COPY_WITH_PREFIX_STRING.c_str(), - aname, - atts, - i, - constructionContext) == false && -- isAttrOK( -+ isAttrOK( - aname, - atts, - i, -@@ -94,6 +94,7 @@ - } - - -+ - #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION) - const ElemTemplateElement* - ElemCopy::startElement(StylesheetExecutionContext& executionContext) const -@@ -120,7 +121,6 @@ - executionContext.copyNamespaceAttributes(*sourceNode); - - return beginExecuteChildren(executionContext); -- - } - else - { -Index: src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (working copy) -@@ -213,8 +213,9 @@ - getURLFromString(const XalanDOMString& urlString); - - virtual XalanDOMString& -- getURLStringFromString(const XalanDOMString& urlString, -- XalanDOMString& theResult); -+ getURLStringFromString( -+ const XalanDOMString& urlString, -+ XalanDOMString& theResult); - - virtual URLAutoPtrType - getURLFromString( -@@ -648,7 +649,7 @@ - - static const ElementTokenTableEntry s_elementTokenTable[]; - -- static const unsigned int s_elementTokenTableSize; -+ static const XalanSize_t s_elementTokenTableSize; - - static const ElementTokenTableEntry& s_elementTokenTableLast; - -Index: src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp (working copy) -@@ -471,15 +471,15 @@ - - virtual void - characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length); - - virtual void - charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar* ch, -+ fl_size_type start, -+ fl_size_type length); - - virtual void - comment(const XalanDOMChar* data); -@@ -515,8 +515,7 @@ - endCreateXResultTreeFrag(); - - virtual void -- beginFormatToText( -- XalanDOMString& theResult); -+ beginFormatToText(XalanDOMString& theResult); - - virtual void - endFormatToText(); -Index: src/xalanc/XSLT/ElemSort.hpp -=================================================================== ---- src/xalanc/XSLT/ElemSort.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemSort.hpp (working copy) -@@ -59,8 +59,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - static ElemSort* - create( -@@ -68,8 +68,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - ~ElemSort(); - -@@ -132,7 +132,7 @@ - getElementName() const; - - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index = 0) const; - - private: - -Index: src/xalanc/XSLT/XSLTEngineImpl.cpp -=================================================================== ---- src/xalanc/XSLT/XSLTEngineImpl.cpp (revision 706129) -+++ src/xalanc/XSLT/XSLTEngineImpl.cpp (working copy) -@@ -692,7 +692,7 @@ - #if defined(XALAN_OLD_STYLE_CASTS) - nsNode = (const XalanElement*)&fragBase; - #else -- nsNode = static_cast<XalanElement*>(node); -+ nsNode = static_cast<const XalanElement*>(node); - #endif - } - else -@@ -1064,9 +1064,12 @@ - - XalanDOMString uri( theManager ); - -- int lineNumber = XalanLocator::getUnknownValue(); -- int columnNumber = XalanLocator::getUnknownValue(); -+ XalanFileLoc lineNumber = -+ XalanLocator::getUnknownValue(); - -+ XalanFileLoc columnNumber = -+ XalanLocator::getUnknownValue(); -+ - const LocatorType* locator = getLocatorFromStack(); - - if (locator == 0 && styleNode != 0) -@@ -1136,8 +1139,8 @@ - id = &theDummy; - } - -- const XalanLocator::size_type lineNumber = locator.getLineNumber(); -- const XalanLocator::size_type columnNumber = locator.getColumnNumber(); -+ XalanFileLoc lineNumber = locator.getLineNumber(); -+ XalanFileLoc columnNumber = locator.getColumnNumber(); - - if (m_problemListener != 0) - { -@@ -1364,12 +1367,12 @@ - - void - XSLTEngineImpl::addResultAttribute( -- AttributeListImpl& attList, -- const XalanDOMString& aname, -- const XalanDOMChar* value, -- XalanDOMString::size_type theLength, -- bool fromCopy, -- const LocatorType* locator) -+ AttributeListImpl& attList, -+ const XalanDOMString& aname, -+ const XalanDOMChar* value, -+ size_type theLength, -+ bool fromCopy, -+ const LocatorType* locator) - { - assert(value != 0); - -@@ -1517,13 +1520,13 @@ - const AttributeListImpl& thePendingAttributes = - (const AttributeListImpl&)getPendingAttributes(); - -- const unsigned int n = thePendingAttributes.getLength(); -+ const XalanSize_t n = thePendingAttributes.getLength(); - -- for(unsigned int i = 0; i < n; i++) -+ for (XalanSize_t i = 0; i < n; i++) - { -- if(equals( -- thePendingAttributes.getName(i), -- DOMServices::s_XMLNamespace) == true) -+ if (equals( -+ thePendingAttributes.getName(i), -+ DOMServices::s_XMLNamespace) == true) - { - return true; - } -@@ -1650,7 +1653,7 @@ - - flushPending(); - -- const unsigned int nAtts = atts.getLength(); -+ const XalanSize_t nAtts = atts.getLength(); - - assert(m_outputContextStack.empty() == false); - -@@ -1659,7 +1662,7 @@ - - thePendingAttributes.clear(); - -- for(unsigned int i = 0; i < nAtts; i++) -+ for (XalanSize_t i = 0; i < nAtts; i++) - { - thePendingAttributes.addAttribute( - atts.getName(i), -@@ -1708,8 +1711,8 @@ - - void - XSLTEngineImpl::characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type length) - { - characters( - ch, -@@ -1721,9 +1724,9 @@ - - void - XSLTEngineImpl::characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length) - { - assert(getFormatterListenerImpl() != 0); - assert(ch != 0); -@@ -1732,11 +1735,11 @@ - - doFlushPending(); - -- if(generateCDATASection() == true) -+ if (generateCDATASection() == true) - { - getFormatterListenerImpl()->cdata(ch + start, length); - -- if(getTraceListeners() > 0) -+ if (getTraceListeners() > 0) - { - fireCharacterGenerateEvent(ch, start, length, true); - } -@@ -1745,7 +1748,7 @@ - { - getFormatterListenerImpl()->characters(ch + start, length); - -- if(getTraceListeners() > 0) -+ if (getTraceListeners() > 0) - { - fireCharacterGenerateEvent(ch, start, length, false); - } -@@ -1817,9 +1820,9 @@ - - void - XSLTEngineImpl::charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length) - { - assert(ch != 0); - assert(length != 0); -@@ -1880,8 +1883,8 @@ - - void - XSLTEngineImpl::ignorableWhitespace( -- const XalanDOMChar* ch, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type length) - { - assert(getFormatterListenerImpl() != 0); - assert(ch != 0); -@@ -1973,9 +1976,9 @@ - - void - XSLTEngineImpl::cdata( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length) - { - assert(getFormatterListenerImpl() != 0); - assert(ch != 0); -@@ -2716,7 +2719,7 @@ - const XalanDOMString& thePrefix, - XalanDOMString::size_type thePrefixLength) - { -- const unsigned int thePendingAttributesCount = -+ const XalanSize_t thePendingAttributesCount = - thePendingAttributes.getLength(); - - if (thePendingAttributesCount == 0) -@@ -2729,7 +2732,7 @@ - bool fResult = false; - - // Check each attribute... -- for (unsigned int i = 0; i < thePendingAttributesCount; ++i) -+ for (XalanSize_t i = 0; i < thePendingAttributesCount; ++i) - { - const XalanDOMChar* const thePendingAttributeName = - thePendingAttributes.getName(i); -@@ -3141,10 +3144,10 @@ - - void - XSLTEngineImpl::fireCharacterGenerateEvent( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length, -- bool isCDATA) -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length, -+ bool isCDATA) - { - const GenerateEvent ge( - isCDATA == true ? GenerateEvent::EVENTTYPE_CDATA : GenerateEvent::EVENTTYPE_CHARACTERS, -Index: src/xalanc/XSLT/DecimalToRoman.hpp -=================================================================== ---- src/xalanc/XSLT/DecimalToRoman.hpp (revision 706129) -+++ src/xalanc/XSLT/DecimalToRoman.hpp (working copy) -@@ -38,7 +38,7 @@ - { - enum { eMaxLetter = 2 }; - -- typedef unsigned long ValueType; -+ typedef XalanSize_t ValueType; - - ValueType m_postValue; - -Index: src/xalanc/XSLT/ElemForEach.cpp -=================================================================== ---- src/xalanc/XSLT/ElemForEach.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemForEach.cpp (working copy) -@@ -55,8 +55,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -66,17 +66,17 @@ - m_sortElems(constructionContext.getMemoryManager()), - m_sortElemsCount(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_SELECT)) -+ if (equals(aname, Constants::ATTRNAME_SELECT)) - { - m_selectPattern = constructionContext.createXPath(getLocator(), atts.getValue(i), *this); - } -- else if(isAttrOK( -+ else if (isAttrOK( - aname, - atts, - i, -@@ -96,7 +96,7 @@ - } - } - -- if(0 == m_selectPattern) -+ if (0 == m_selectPattern) - { - error( - constructionContext, -@@ -111,8 +111,8 @@ - ElemForEach::ElemForEach( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken) : - ElemTemplateElement(constructionContext, - stylesheetTree, -@@ -147,8 +147,8 @@ - const AttributeListType& atts, - const LocatorType* locator) - { -- const int lineNumber = XalanLocator::getLineNumber(locator); -- const int columnNumber = XalanLocator::getColumnNumber(locator); -+ const XalanFileLoc lineNumber = XalanLocator::getLineNumber(locator); -+ const XalanFileLoc columnNumber = XalanLocator::getColumnNumber(locator); - - m_sortElems.reserve(m_sortElems.size() + 1); - -@@ -826,7 +826,7 @@ - - - const XPath* --ElemForEach::getXPath(unsigned int index) const -+ElemForEach::getXPath(XalanSize_t index) const - { - return index == 0 ? m_selectPattern : 0; - } -Index: src/xalanc/XSLT/ElemApplyTemplates.hpp -=================================================================== ---- src/xalanc/XSLT/ElemApplyTemplates.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemApplyTemplates.hpp (working copy) -@@ -50,11 +50,11 @@ - * @param columnNumber column number in document - */ - ElemApplyTemplates( -- StylesheetConstructionContext& constructionContext, -- Stylesheet& stylesheetTree, -- const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ StylesheetConstructionContext& constructionContext, -+ Stylesheet& stylesheetTree, -+ const AttributeListType& atts, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemApplyTemplates(); -Index: src/xalanc/XSLT/StylesheetHandler.cpp -=================================================================== ---- src/xalanc/XSLT/StylesheetHandler.cpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetHandler.cpp (working copy) -@@ -1525,7 +1525,7 @@ - void - StylesheetHandler::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if (m_inTemplate == false && - inExtensionElement() == false && -@@ -1551,7 +1551,7 @@ - void - StylesheetHandler::cdata( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - accumulateText(chars, length); - -@@ -1565,7 +1565,7 @@ - void - StylesheetHandler::ignorableWhitespace( - const XMLCh* const /*chars*/, -- const unsigned int /*length*/) -+ const size_type /*length*/) - { - // Ignore! - m_lastPopped = 0; -@@ -1617,7 +1617,7 @@ - void - StylesheetHandler::charactersRaw( - const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -1625,8 +1625,8 @@ - - void - StylesheetHandler::processText( -- const XMLCh* chars, -- XalanDOMString::size_type length) -+ const XMLCh* chars, -+ size_type length) - { - if(m_inTemplate) - { -@@ -1719,8 +1719,8 @@ - - void - StylesheetHandler::accumulateText( -- const XMLCh* chars, -- XalanDOMString::size_type length) -+ const XMLCh* chars, -+ size_type length) - { - if(m_inTemplate) - { -Index: src/xalanc/XSLT/ElemTemplateElement.hpp -=================================================================== ---- src/xalanc/XSLT/ElemTemplateElement.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemTemplateElement.hpp (working copy) -@@ -89,8 +89,8 @@ - ElemTemplateElement( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken); - - /** -@@ -110,8 +110,8 @@ - Stylesheet& stylesheetTree, - int xslToken, - const XalanDOMString& baseURI = XalanDOMString(XalanMemMgrs::getDummyMemMgr()), -- int lineNumber = XalanLocator::getUnknownValue(), -- int columnNumber = XalanLocator::getUnknownValue()); -+ XalanFileLoc lineNumber = XalanLocator::getUnknownValue(), -+ XalanFileLoc columnNumber = XalanLocator::getUnknownValue()); - - virtual - ~ElemTemplateElement(); -@@ -138,7 +138,7 @@ - isAttrOK( - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext) const; - - /** -@@ -156,7 +156,7 @@ - const XalanDOMChar* elementName, - const XalanDOMChar* aname, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext); - - /** -@@ -615,7 +615,7 @@ - * @return pointer or null - */ - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index) const; - - // These interfaces are inherited from PrefixResolver... - -@@ -633,8 +633,8 @@ - public: - - LocatorProxy( -- size_type theLineNumber, -- size_type theColumnNumber, -+ XMLFileLoc theLineNumber, -+ XMLFileLoc theColumnNumber, - const XalanDOMString& theURI); - - virtual -@@ -646,10 +646,10 @@ - virtual const XMLCh* - getSystemId() const; - -- virtual size_type -+ virtual XMLFileLoc - getLineNumber() const; - -- virtual size_type -+ virtual XMLFileLoc - getColumnNumber() const; - - const XalanDOMString& -@@ -670,21 +670,21 @@ - operator==(const LocatorProxy&) const; - - // data members... -- const size_type m_lineNumber; -+ const XMLFileLoc m_lineNumber; - -- const size_type m_columnNumber; -+ const XMLFileLoc m_columnNumber; - - const XalanDOMString& m_uri; - }; - - -- LocatorProxy::size_type -+ XMLFileLoc - getLineNumber() const - { - return m_locatorProxy.getLineNumber(); - } - -- LocatorProxy::size_type -+ XMLFileLoc - getColumnNumber() const - { - return m_locatorProxy.getColumnNumber(); -Index: src/xalanc/XSLT/Stylesheet.hpp -=================================================================== ---- src/xalanc/XSLT/Stylesheet.hpp (revision 706129) -+++ src/xalanc/XSLT/Stylesheet.hpp (working copy) -@@ -86,7 +86,6 @@ - - public: - -- typedef StylesheetConstructionContext::size_type size_type; - typedef StylesheetExecutionContext::ParamVectorType ParamVectorType; - typedef XalanQName::NamespaceVectorType NamespaceVectorType; - typedef XalanQName::NamespacesStackType NamespacesStackType; -@@ -288,7 +287,7 @@ - isAttrOK( - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which, -+ XalanSize_t which, - StylesheetConstructionContext& constructionContext) const; - - /** -@@ -298,8 +297,9 @@ - * @return namespace string for node, or null if not found. - */ - const XalanDOMString* -- getNamespaceFromStack(const XalanDOMString& nodeName, -- XalanDOMString& theBuffer) const -+ getNamespaceFromStack( -+ const XalanDOMString& nodeName, -+ XalanDOMString& theBuffer) const - { - return getNamespaceFromStack(c_wstr(nodeName), theBuffer); - } -@@ -311,8 +311,9 @@ - * @return namespace string for node, or null if not found. - */ - const XalanDOMString* -- getNamespaceFromStack(const XalanDOMChar* nodeName, -- XalanDOMString& theBuffer) const; -+ getNamespaceFromStack( -+ const XalanDOMChar* nodeName, -+ XalanDOMString& theBuffer) const; - - /** - * Get the namespace from a prefix by searching the stack of namespace -Index: src/xalanc/XSLT/ElemUse.hpp -=================================================================== ---- src/xalanc/XSLT/ElemUse.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemUse.hpp (working copy) -@@ -56,8 +56,8 @@ - ElemUse( - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, - int xslToken); - - virtual -@@ -77,7 +77,7 @@ - StylesheetConstructionContext& constructionContext, - const XalanDOMChar* attrName, - const AttributeListType& atts, -- int which); -+ XalanSize_t which); - - // These methods are inherited from ElemTemplateElement ... - -Index: src/xalanc/XSLT/ElemCallTemplate.cpp -=================================================================== ---- src/xalanc/XSLT/ElemCallTemplate.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemCallTemplate.cpp (working copy) -@@ -54,13 +54,13 @@ - m_templateName(0), - m_template(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for(XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_NAME)) -+ if (equals(aname, Constants::ATTRNAME_NAME)) - { - m_templateName = constructionContext.createXalanQName( - atts.getValue(i), -@@ -76,7 +76,7 @@ - atts.getValue(i)); - } - } -- else if(isAttrOK( -+ else if (isAttrOK( - aname, - atts, - i, -Index: src/xalanc/XSLT/CountersTable.hpp -=================================================================== ---- src/xalanc/XSLT/CountersTable.hpp (revision 706129) -+++ src/xalanc/XSLT/CountersTable.hpp (working copy) -@@ -55,7 +55,7 @@ - */ - struct Counter - { -- typedef unsigned long CountType; -+ typedef XalanSize_t CountType; - - typedef XalanVector<XalanNode*> NodeVectorType; - -Index: src/xalanc/XSLT/ElemCopy.hpp -=================================================================== ---- src/xalanc/XSLT/ElemCopy.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemCopy.hpp (working copy) -@@ -49,8 +49,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - // These methods are inherited from ElemTemplateElement ... - -Index: src/xalanc/XSLT/ElemChoose.cpp -=================================================================== ---- src/xalanc/XSLT/ElemChoose.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemChoose.cpp (working copy) -@@ -48,26 +48,26 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, - columnNumber, - StylesheetConstructionContext::ELEMNAME_CHOOSE) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(isAttrOK( -+ if (isAttrOK( - aname, - atts, - i, - constructionContext) == false && -- processSpaceAttr( -+ processSpaceAttr( - Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING.c_str(), - aname, - atts, -@@ -107,17 +107,17 @@ - { - const int type = node->getXSLToken(); - -- if(StylesheetConstructionContext::ELEMNAME_WHEN == type) -+ if (StylesheetConstructionContext::ELEMNAME_WHEN == type) - { - -- const XPath* const theXPath = node->getXPath(); -+ const XPath* const theXPath = node->getXPath(0); - assert(theXPath != 0); - - bool test; - - theXPath->execute(*this, executionContext, test); - -- if(0 != executionContext.getTraceListeners()) -+ if (0 != executionContext.getTraceListeners()) - { - executionContext.fireSelectEvent( - SelectionEvent(executionContext, -@@ -172,7 +172,7 @@ - if(StylesheetConstructionContext::ELEMNAME_WHEN == type) - { - -- const XPath* const theXPath = node->getXPath(); -+ const XPath* const theXPath = node->getXPath(0); - assert(theXPath != 0); - - bool test; -Index: src/xalanc/XSLT/ElemApplyImport.cpp -=================================================================== ---- src/xalanc/XSLT/ElemApplyImport.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemApplyImport.cpp (working copy) -@@ -52,21 +52,21 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, - columnNumber, - StylesheetConstructionContext::ELEMNAME_APPLY_IMPORTS) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(isAttrOK( -+ if (isAttrOK( - aname, - atts, - i, -Index: src/xalanc/XSLT/KeyDeclaration.hpp -=================================================================== ---- src/xalanc/XSLT/KeyDeclaration.hpp (revision 706129) -+++ src/xalanc/XSLT/KeyDeclaration.hpp (working copy) -@@ -54,8 +54,8 @@ - const XPath& matchPattern, - const XPath& use, - const XalanDOMString& uri, -- XalanLocator::size_type lineNumber, -- XalanLocator::size_type columnNumber) : -+ XMLFileLoc lineNumber, -+ XMLFileLoc columnNumber) : - m_qname(&qname), - m_match(&matchPattern), - m_use(&use), -@@ -136,7 +136,7 @@ - * - * @return The line number - */ -- XalanLocator::size_type -+ XMLFileLoc - getLineNumber() const - { - return m_lineNumber; -@@ -147,7 +147,7 @@ - * - * @return The column number - */ -- XalanLocator::size_type -+ XMLFileLoc - getColumnNumber() const - { - return m_columnNumber; -@@ -163,9 +163,9 @@ - - const XalanDOMString* m_uri; - -- XalanLocator::size_type m_lineNumber; -+ XMLFileLoc m_lineNumber; - -- XalanLocator::size_type m_columnNumber; -+ XMLFileLoc m_columnNumber; - }; - - -Index: src/xalanc/XSLT/ElemAttribute.cpp -=================================================================== ---- src/xalanc/XSLT/ElemAttribute.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemAttribute.cpp (working copy) -@@ -46,8 +46,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -56,9 +56,9 @@ - m_nameAVT(0), - m_namespaceAVT(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -@@ -398,6 +398,7 @@ - } - - executionContext.getAndPopCachedString(); -+ - return 0; - } - -Index: src/xalanc/XSLT/XSLTEngineImpl.hpp -=================================================================== ---- src/xalanc/XSLT/XSLTEngineImpl.hpp (revision 706129) -+++ src/xalanc/XSLT/XSLTEngineImpl.hpp (working copy) -@@ -425,7 +425,7 @@ - addResultNamespaceDecl( - const XalanDOMString& prefix, - const XalanDOMChar* namespaceVal, -- XalanDOMString::size_type len) -+ size_type len) - { - m_resultNamespacesStack.addDeclaration( - prefix, -@@ -496,15 +496,15 @@ - * @param theLength The length of the value - * @param fromCopy true if the attribute is being copied from the source tree - * @param locator The Locator for reporting errors. -- */ -- void -- addResultAttribute( -- AttributeListImpl& attList, -- const XalanDOMString& aname, -- const XalanDOMChar* value, -- XalanDOMString::size_type theLength, -- bool fromCopy = false, -- const LocatorType* locator = 0); -+ */ -+ void -+ addResultAttribute( -+ AttributeListImpl& attList, -+ const XalanDOMString& aname, -+ const XalanDOMChar* value, -+ size_type theLength, -+ bool fromCopy = false, -+ const LocatorType* locator = 0); - - /** - * Add attribute to pending attributes list, and if it is a namespace, add -@@ -585,15 +585,15 @@ - void - endElement(const XalanDOMChar* name); - -- void -- characters ( -- const XalanDOMChar* ch, -- XalanDOMString::size_type length); -+ void -+ characters ( -+ const XalanDOMChar* ch, -+ size_type length); - -- void -- ignorableWhitespace( -- const XalanDOMChar* ch, -- XalanDOMString::size_type length); -+ void -+ ignorableWhitespace( -+ const XalanDOMChar* ch, -+ size_type length); - - void - processingInstruction( -@@ -603,18 +603,18 @@ - void - resetDocument(); - -- /** -- * Receive notification of character data. -- * -- * @param ch pointer to characters from the XML document -- * @param start startng offset in 'ch' array -- * @param length number of characters to read from the array -- */ -- void -- characters( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ /** -+ * Receive notification of character data. -+ * -+ * @param ch pointer to characters from the XML document -+ * @param start startng offset in 'ch' array -+ * @param length number of characters to read from the array -+ */ -+ void -+ characters( -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length); - - /** - * Send character data from the node to the result tree. -@@ -641,20 +641,20 @@ - void - startElement(const XalanDOMChar* name); - -- /** -- * Receive notification of character data. If available, when the -- * disable-output-escaping attribute is used, output raw text without -- * escaping. -- * -- * @param ch pointer to characters from the XML document -- * @param start start position in the array -- * @param length number of characters to read from the array -- */ -- void -- charactersRaw( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ /** -+ * Receive notification of character data. If available, when the -+ * disable-output-escaping attribute is used, output raw text without -+ * escaping. -+ * -+ * @param ch pointer to characters from the XML document -+ * @param start start position in the array -+ * @param length number of characters to read from the array -+ */ -+ void -+ charactersRaw( -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length); - - /** - * Send raw character data from the node to the result tree. -@@ -689,18 +689,18 @@ - void - entityReference(const XalanDOMChar* data); - -- /** -- * Receive notification of cdata. -- * -- * @param ch pointer to characters from the XML document -- * @param start start position in the array -- * @param length number of characters to read from the array -- */ -- void -- cdata( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ /** -+ * Receive notification of cdata. -+ * -+ * @param ch pointer to characters from the XML document -+ * @param start start position in the array -+ * @param length number of characters to read from the array -+ */ -+ void -+ cdata( -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length); - - /** - * Clone a node to the result tree -@@ -1600,12 +1600,12 @@ - const XalanDOMString& theString, - bool isCDATA); - -- void -- fireCharacterGenerateEvent( -- const XalanDOMChar* ch, -- XalanDOMString::size_type start, -- XalanDOMString::size_type length, -- bool isCDATA); -+ void -+ fireCharacterGenerateEvent( -+ const XalanDOMChar* ch, -+ size_type start, -+ size_type length, -+ bool isCDATA); - - void - checkDefaultNamespace( -Index: src/xalanc/XSLT/ElemForEach.hpp -=================================================================== ---- src/xalanc/XSLT/ElemForEach.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemForEach.hpp (working copy) -@@ -67,11 +67,11 @@ - * @param columnNumber column number in document - */ - ElemForEach( -- StylesheetConstructionContext& constructionContext, -- Stylesheet& stylesheetTree, -- const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ StylesheetConstructionContext& constructionContext, -+ Stylesheet& stylesheetTree, -+ const AttributeListType& atts, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - virtual - ~ElemForEach(); -@@ -112,7 +112,7 @@ - #endif - - virtual const XPath* -- getXPath(unsigned int index = 0) const; -+ getXPath(XalanSize_t index) const; - - protected: - -@@ -126,11 +126,11 @@ - * @param xslToken an integer representing the type of instance. - */ - ElemForEach( -- StylesheetConstructionContext& constructionContext, -- Stylesheet& stylesheetTree, -- int lineNumber, -- int columnNumber, -- int xslToken); -+ StylesheetConstructionContext& constructionContext, -+ Stylesheet& stylesheetTree, -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber, -+ int xslToken); - - #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION) - -Index: src/xalanc/XSLT/XalanElemElementAllocator.cpp -=================================================================== ---- src/xalanc/XSLT/XalanElemElementAllocator.cpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemElementAllocator.cpp (working copy) -@@ -23,7 +23,9 @@ - - - --XalanElemElementAllocator::XalanElemElementAllocator(MemoryManagerType& theManager, size_type theBlockCount) : -+XalanElemElementAllocator::XalanElemElementAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount) : - m_allocator(theManager, theBlockCount) - { - } -@@ -41,8 +43,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - data_type* const theBlock = m_allocator.allocateBlock(); - assert(theBlock != 0); -Index: src/xalanc/XSLT/XalanElemAttributeAllocator.cpp -=================================================================== ---- src/xalanc/XSLT/XalanElemAttributeAllocator.cpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemAttributeAllocator.cpp (working copy) -@@ -23,7 +23,9 @@ - - - --XalanElemAttributeAllocator::XalanElemAttributeAllocator(MemoryManagerType& theManager, size_type theBlockCount) : -+XalanElemAttributeAllocator::XalanElemAttributeAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount) : - m_allocator(theManager, theBlockCount) - { - } -@@ -41,8 +43,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - data_type* const theBlock = m_allocator.allocateBlock(); - assert(theBlock != 0); -Index: src/xalanc/XSLT/StylesheetHandler.hpp -=================================================================== ---- src/xalanc/XSLT/StylesheetHandler.hpp (revision 706129) -+++ src/xalanc/XSLT/StylesheetHandler.hpp (working copy) -@@ -129,7 +129,10 @@ - * @see #ignorableWhitespace - * @see org.xml.sax.Locator - */ -- virtual void characters (const XMLCh* const chars, const unsigned int length); -+ virtual void -+ characters( -+ const XMLCh* const chars, -+ const size_type length); - - /** - * Receive notification of character data. If available, when the -@@ -141,7 +144,10 @@ - * @param length number of characters to read from the array - * @exception SAXException - */ -- virtual void charactersRaw(const XMLCh* const chars, const unsigned int length); -+ virtual void -+ charactersRaw( -+ const XMLCh* const chars, -+ const size_type length); - - /** - * Receive notification of cdata. -@@ -166,7 +172,10 @@ - * @exception SAXException - * @see #ignorableWhitespace - */ -- virtual void cdata(const XMLCh* const ch, const unsigned int length); -+ virtual void -+ cdata( -+ const XMLCh* const ch, -+ const size_type length); - - /** - * Receive notification of ignorable whitespace in element content. -@@ -191,7 +200,10 @@ - * @exception SAXException - * @see #characters - */ -- virtual void ignorableWhitespace (const XMLCh* const chars, const unsigned int length); -+ virtual void -+ ignorableWhitespace( -+ const XMLCh* const chars, -+ const size_type length); - - /** - * Receive notification of a processing instruction. -@@ -467,13 +479,13 @@ - - void - processText( -- const XMLCh* chars, -- XalanDOMString::size_type length); -+ const XMLCh* chars, -+ size_type length); - - void - accumulateText( -- const XMLCh* chars, -- XalanDOMString::size_type length); -+ const XMLCh* chars, -+ size_type length); - - void - processAccumulatedText(); -Index: src/xalanc/XSLT/ElemDecimalFormat.cpp -=================================================================== ---- src/xalanc/XSLT/ElemDecimalFormat.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemDecimalFormat.cpp (working copy) -@@ -50,8 +50,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemTemplateElement(constructionContext, - stylesheetTree, - lineNumber, -@@ -66,13 +66,13 @@ - m_decimalFormatSymbols.setInfinity(XalanDOMString(constructionContext.getMemoryManager())); - m_decimalFormatSymbols.setNaN(XalanDOMString(constructionContext.getMemoryManager())); - -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_NAME)) -+ if (equals(aname, Constants::ATTRNAME_NAME)) - { - assert(atts.getValue(i) != 0); - -@@ -90,7 +90,7 @@ - atts.getValue(i)); - } - } -- else if(equals(aname, Constants::ATTRNAME_DECIMALSEPARATOR)) -+ else if (equals(aname, Constants::ATTRNAME_DECIMALSEPARATOR)) - { - const XalanDOMChar* const decimalSepValue = atts.getValue(i); - assert(decimalSepValue != 0); -@@ -109,7 +109,7 @@ - decimalSepValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_GROUPINGSEPARATOR)) -+ else if (equals(aname, Constants::ATTRNAME_GROUPINGSEPARATOR)) - { - const XalanDOMChar* const sepValue = atts.getValue(i); - assert(sepValue!= 0); -@@ -128,13 +128,13 @@ - sepValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_INFINITY)) -+ else if (equals(aname, Constants::ATTRNAME_INFINITY)) - { - assert(atts.getValue(i) != 0); - - m_decimalFormatSymbols.setInfinity(atts.getValue(i)); - } -- else if(equals(aname, Constants::ATTRNAME_MINUSSIGN)) -+ else if (equals(aname, Constants::ATTRNAME_MINUSSIGN)) - { - const XalanDOMChar* const minusValue = atts.getValue(i); - assert(minusValue != 0); -@@ -153,13 +153,13 @@ - minusValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_NAN)) -+ else if (equals(aname, Constants::ATTRNAME_NAN)) - { - assert(atts.getValue(i) != 0); - - m_decimalFormatSymbols.setNaN(atts.getValue(i)); - } -- else if(equals(aname, Constants::ATTRNAME_PERCENT)) -+ else if (equals(aname, Constants::ATTRNAME_PERCENT)) - { - const XalanDOMChar* const percentValue = atts.getValue(i); - assert(percentValue != 0); -@@ -178,7 +178,7 @@ - percentValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_PERMILLE)) -+ else if (equals(aname, Constants::ATTRNAME_PERMILLE)) - { - const XalanDOMChar* const permilleValue = atts.getValue(i); - assert(permilleValue != 0); -@@ -197,7 +197,7 @@ - permilleValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_ZERODIGIT)) -+ else if (equals(aname, Constants::ATTRNAME_ZERODIGIT)) - { - const XalanDOMChar* const zeroDigitValue = atts.getValue(i); - assert(zeroDigitValue != 0); -@@ -216,7 +216,7 @@ - zeroDigitValue); - } - } -- else if(equals(aname, Constants::ATTRNAME_DIGIT)) -+ else if (equals(aname, Constants::ATTRNAME_DIGIT)) - { - const XalanDOMChar* const digitValue = atts.getValue(i); - assert(digitValue != 0); -@@ -308,7 +308,7 @@ - - - const XPath* --ElemDecimalFormat::getXPath(unsigned int index) const -+ElemDecimalFormat::getXPath(XalanSize_t index) const - { - const XPath* result = 0; - -Index: src/xalanc/XSLT/ElemAttributeSet.cpp -=================================================================== ---- src/xalanc/XSLT/ElemAttributeSet.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemAttributeSet.cpp (working copy) -@@ -41,8 +41,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemUse(constructionContext, - stylesheetTree, - lineNumber, -@@ -50,13 +50,13 @@ - StylesheetConstructionContext::ELEMNAME_ATTRIBUTE_SET), - m_qname(0) - { -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -- if(equals(aname, Constants::ATTRNAME_NAME)) -+ if (equals(aname, Constants::ATTRNAME_NAME)) - { - m_qname = constructionContext.createXalanQName( - atts.getValue(i), -@@ -72,12 +72,12 @@ - atts.getValue(i)); - } - } -- else if(processUseAttributeSets( -+ else if (processUseAttributeSets( - constructionContext, - aname, - atts, - i) == false && -- isAttrOK( -+ isAttrOK( - aname, - atts, - i, -@@ -91,7 +91,7 @@ - } - } - -- if(m_qname == 0) -+ if (m_qname == 0) - { - error( - constructionContext, -Index: src/xalanc/XSLT/ElemChoose.hpp -=================================================================== ---- src/xalanc/XSLT/ElemChoose.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemChoose.hpp (working copy) -@@ -49,8 +49,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - - // These methods are inherited from ElemTemplateElement ... -Index: src/xalanc/XSLT/ElemApplyImport.hpp -=================================================================== ---- src/xalanc/XSLT/ElemApplyImport.hpp (revision 706129) -+++ src/xalanc/XSLT/ElemApplyImport.hpp (working copy) -@@ -50,8 +50,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber); -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber); - - - // These methods are inherited from ElemTemplateElement ... -@@ -77,7 +77,6 @@ - virtual ElemTemplateElement* - appendChildElem(ElemTemplateElement* newChild); - -- - private: - }; - -Index: src/xalanc/XSLT/ElemElement.cpp -=================================================================== ---- src/xalanc/XSLT/ElemElement.cpp (revision 706129) -+++ src/xalanc/XSLT/ElemElement.cpp (working copy) -@@ -45,8 +45,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) : -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) : - ElemUse(constructionContext, - stylesheetTree, - lineNumber, -@@ -59,9 +59,9 @@ - // turn them off... - // m_namespacesHandler.setProcessNamespaceAliaises(false); - -- const unsigned int nAttrs = atts.getLength(); -+ const XalanSize_t nAttrs = atts.getLength(); - -- for(unsigned int i = 0; i < nAttrs; i++) -+ for (XalanSize_t i = 0; i < nAttrs; i++) - { - const XalanDOMChar* const aname = atts.getName(i); - -@@ -125,6 +125,7 @@ - } - - -+ - #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION) - const ElemTemplateElement* - ElemElement::startElement(StylesheetExecutionContext& executionContext) const -Index: src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp -=================================================================== ---- src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp (revision 706129) -+++ src/xalanc/XSLT/XalanElemApplyTemplatesAllocator.cpp (working copy) -@@ -23,7 +23,9 @@ - - - --XalanElemApplyTemplatesAllocator::XalanElemApplyTemplatesAllocator(MemoryManagerType& theManager, size_type theBlockCount) : -+XalanElemApplyTemplatesAllocator::XalanElemApplyTemplatesAllocator( -+ MemoryManagerType& theManager, -+ size_type theBlockCount) : - m_allocator(theManager, theBlockCount) - { - } -@@ -41,8 +43,8 @@ - StylesheetConstructionContext& constructionContext, - Stylesheet& stylesheetTree, - const AttributeListType& atts, -- int lineNumber, -- int columnNumber) -+ XalanFileLoc lineNumber, -+ XalanFileLoc columnNumber) - { - data_type* const theBlock = m_allocator.allocateBlock(); - assert(theBlock != 0); -Index: src/xalanc/XMLSupport/XalanIndentWriter.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanIndentWriter.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanIndentWriter.hpp (working copy) -@@ -22,18 +22,21 @@ - - #include <xalanc/Include/XalanVector.hpp> - -+#include <xalanc/PlatformSupport/FormatterListener.hpp> - #include <xalanc/PlatformSupport/Writer.hpp> - - - XALAN_CPP_NAMESPACE_BEGIN - - --template<class WhiteSpaceWriter, -- class NewLineWriter> -+template< -+ class WhiteSpaceWriter, -+ class NewLineWriter> - class XalanIndentWriter - { - public: -- typedef typename XalanDOMString::size_type size_type; -+ -+ typedef FormatterListener::size_type size_type; - typedef XalanVector<bool> BoolStackType; - typedef typename WhiteSpaceWriter::writer_type writer_type; - -Index: src/xalanc/XMLSupport/XalanUTF8Writer.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanUTF8Writer.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanUTF8Writer.hpp (working copy) -@@ -150,34 +150,40 @@ - /** - * Writes name chars , if not presentable, throws - */ -- void writeNameChar(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writeNameChar( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writePIChars(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writePIChars( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writeCommentChars(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writeCommentChars( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - void - safeWriteContent( -- const XalanDOMChar* theChars, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theChars, -+ size_type theLength) - { - for(size_type i = 0; i < theLength; ++i) - { -@@ -187,8 +193,8 @@ - - void - write( -- const value_type* theChars, -- XalanDOMString::size_type theLength) -+ const value_type* theChars, -+ size_type theLength) - { - #if defined(NDEBUG) - if (theLength > sizeof(m_buffer)) -@@ -214,7 +220,7 @@ - m_bufferRemaining -= theLength; - } - #else -- for(XalanDOMString::size_type i = 0; i < theLength; ++i) -+ for(size_type i = 0; i < theLength; ++i) - { - write(theChars[i]); - } -@@ -251,8 +257,8 @@ - - void - write( -- const XalanDOMChar* theChars, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theChars, -+ size_type theLength) - { - for(size_type i = 0; i < theLength; ++i) - { -@@ -262,13 +268,13 @@ - - size_type - write( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - XalanDOMChar ch = chars[start]; - -- if (XalanFormatterWriter::isUTF16HighSurrogate(ch) == false) -+ if (isUTF16HighSurrogate(ch) == false) - { - write((unsigned int)ch); - } -@@ -276,7 +282,7 @@ - { - if (start + 1 >= length) - { -- XalanFormatterWriter::throwInvalidUTF16SurrogateException( -+ throwInvalidUTF16SurrogateException( - ch, - 0, - getMemoryManager()); -@@ -284,7 +290,7 @@ - else - { - write( -- XalanFormatterWriter::decodeUTF16SurrogatePair( -+ decodeUTF16SurrogatePair( - ch, - chars[++start], - getMemoryManager())); -@@ -296,8 +302,8 @@ - - void - writeSafe( -- const XalanDOMChar* theChars, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theChars, -+ size_type theLength) - { - XalanDOMChar ch = 0; - -@@ -305,15 +311,15 @@ - { - ch = theChars[i]; - -- if (XalanFormatterWriter::isUTF16HighSurrogate(ch) == true) -+ if (isUTF16HighSurrogate(ch) == true) - { - if (i + 1 >= theLength) - { -- XalanFormatterWriter::throwInvalidUTF16SurrogateException(ch, 0, getMemoryManager()); -+ throwInvalidUTF16SurrogateException(ch, 0, getMemoryManager()); - } - else - { -- write(XalanFormatterWriter::decodeUTF16SurrogatePair(ch, theChars[i+1], getMemoryManager())); -+ write(decodeUTF16SurrogatePair(ch, theChars[i + 1], getMemoryManager())); - - ++i; - } -@@ -410,7 +416,7 @@ - } - else - { -- XalanFormatterWriter::throwInvalidCharacterException(theChar, getMemoryManager()); -+ throwInvalidCharacterException(theChar, getMemoryManager()); - } - } - -@@ -421,11 +427,11 @@ - - - // Data members... -- value_type m_buffer[kBufferSize]; -+ value_type m_buffer[kBufferSize]; - -- value_type* m_bufferPosition; -+ value_type* m_bufferPosition; - -- XalanDOMString::size_type m_bufferRemaining; -+ size_type m_bufferRemaining; - }; - - -Index: src/xalanc/XMLSupport/XalanFormatterWriter.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanFormatterWriter.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanFormatterWriter.hpp (working copy) -@@ -24,6 +24,7 @@ - #include <xercesc/sax/SAXException.hpp> - - #include <xalanc/PlatformSupport/DOMStringHelper.hpp> -+#include <xalanc/PlatformSupport/FormatterListener.hpp> - #include <xalanc/PlatformSupport/Writer.hpp> - #include <xalanc/PlatformSupport/XalanMessageLoader.hpp> - #include <xalanc/PlatformSupport/XalanOutputStream.hpp> -@@ -42,6 +43,9 @@ - { - public: - -+ typedef FormatterListener::size_type size_type; -+ -+ - template <class WriterType> - class NewLineWriterFunctor - { -@@ -90,14 +94,14 @@ - /** - * The length of the the string of characters that represents the newline - */ -- XalanDOMString::size_type m_newlineStringLength; -+ size_type m_newlineStringLength; - }; - - template<class WriterType> - class WhiteSpaceWriterFunctor - { -- typedef XalanDOMString::size_type size_type; - typedef typename WriterType::value_type value_type; -+ - public: - typedef WriterType writer_type; - -@@ -150,9 +154,6 @@ - - public: - -- typedef XalanDOMString::size_type size_type; -- -- - XalanFormatterWriter( - Writer& theWriter, - MemoryManager& theMemoryManager) : -@@ -313,7 +314,7 @@ - /** - * The length of the the string of characters that represents the newline - */ -- XalanDOMString::size_type m_newlineStringLength; -+ size_type m_newlineStringLength; - - /** - * Format a code point as a numeric character reference. -Index: src/xalanc/XMLSupport/FormatterToHTML.cpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToHTML.cpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToHTML.cpp (working copy) -@@ -156,7 +156,7 @@ - m_attrCharsMap[XalanUnicode::charLessThanSign] = 0; - m_attrCharsMap[XalanUnicode::charGreaterThanSign] = 0; - -- for(XalanDOMString::size_type i = 160; i < SPECIALSSIZE; i++) -+ for(size_type i = 160; i < SPECIALSSIZE; i++) - { - m_attrCharsMap[i] = 'S'; - } -@@ -481,7 +481,7 @@ - void - FormatterToHTML::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if(length != 0) - { -@@ -590,7 +590,7 @@ - void - FormatterToHTML::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - if(m_isScriptOrStyleElem == true) - { -@@ -632,7 +632,7 @@ - const XMLCh* const data) - - { -- const XalanDOMString::size_type dataLength = length(data); -+ const size_type dataLength = length(data); - - // Use a fairly nasty hack to tell if the next node is supposed to be - // unescaped text. -@@ -689,13 +689,13 @@ - - void - FormatterToHTML::writeCharacters( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theString, -+ size_type theLength) - { - assert(theString != 0); - -- XalanDOMString::size_type i = 0; -- XalanDOMString::size_type firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < theLength) - { -@@ -768,13 +768,13 @@ - - void - FormatterToHTML::writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength) -+ const XalanDOMChar* theString, -+ size_type theStringLength) - { - assert(theString != 0); - -- XalanDOMString::size_type i = 0; -- XalanDOMString::size_type firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < theStringLength) - { -@@ -853,8 +853,8 @@ - - void - FormatterToHTML::copyEntityIntoBuffer( -- const XalanDOMChar* s, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* s, -+ size_type theLength) - { - assert(s != 0); - -@@ -885,11 +885,11 @@ - const XalanDOMChar* value, - const XalanHTMLElementsProperties::ElementProperties& elemProperties) - { -- const XalanDOMString::size_type nameLength = length(name); -+ const size_type nameLength = length(name); - - accumContent(XalanUnicode::charSpace); - -- const XalanDOMString::size_type valueLength = length(value); -+ const size_type valueLength = length(value); - - if((valueLength == 0 || equalsIgnoreCaseASCII(name, nameLength, value, valueLength)) && - elemProperties.isAttribute(name, XalanHTMLElementsProperties::ATTREMPTY) == true) -@@ -919,8 +919,8 @@ - - void - FormatterToHTML::writeAttrURI( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength) -+ const XalanDOMChar* theString, -+ size_type theStringLength) - { - assert(theString != 0); - -@@ -939,7 +939,7 @@ - // causing damage. If the URL is already properly escaped, in theory, this - // function should not change the string value. - -- for (XalanDOMString::size_type i = 0; i < theStringLength; ++i) -+ for (size_type i = 0; i < theStringLength; ++i) - { - const XalanDOMChar ch = theString[i]; - -@@ -1123,8 +1123,8 @@ - - if (m_prefixResolver != 0) - { -- const XalanDOMString::size_type theLength = length(theElementName); -- const XalanDOMString::size_type theColonIndex = indexOf(theElementName, XalanUnicode::charColon); -+ const size_type theLength = length(theElementName); -+ const size_type theColonIndex = indexOf(theElementName, XalanUnicode::charColon); - - const XalanDOMString* thePrefix = &s_emptyString; - -Index: src/xalanc/XMLSupport/FormatterToHTML.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToHTML.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToHTML.hpp (working copy) -@@ -118,7 +118,7 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - // These methods are inherited from FormatterToXML... - -@@ -135,7 +135,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -159,19 +159,19 @@ - { - enum { eMaxLength = 8 }; - -- XalanDOMChar m_char; -+ XalanDOMChar m_char; - -- XalanDOMString::size_type m_length; -+ size_type m_length; - -- XalanDOMChar m_string[eMaxLength + 1]; -+ XalanDOMChar m_string[eMaxLength + 1]; - }; - - protected: - - virtual void - writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength); -+ const XalanDOMChar* theString, -+ size_type theStringLength); - - virtual void - accumCommentData(const XalanDOMChar* data); -@@ -181,13 +181,11 @@ - - void - writeCharacters( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theLength); -+ const XalanDOMChar* theString, -+ size_type theLength); - - private: - -- typedef XalanDOMString::size_type size_type; -- - /** - * The string "<!DOCTYPE HTML". - */ -@@ -230,8 +228,8 @@ - - void - copyEntityIntoBuffer( -- const XalanDOMChar* s, -- XalanDOMString::size_type theLength); -+ const XalanDOMChar* s, -+ size_type theLength); - - void - copyEntityIntoBuffer(const XalanDOMString& s); -@@ -256,8 +254,8 @@ - */ - void - writeAttrURI( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength); -+ const XalanDOMChar* theString, -+ size_type theStringLength); - - /** - * Accumulate the specified character by converting its numeric value to -Index: src/xalanc/XMLSupport/FormatterToNull.cpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToNull.cpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToNull.cpp (working copy) -@@ -76,7 +76,7 @@ - void - FormatterToNull::characters( - const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -85,7 +85,7 @@ - void - FormatterToNull::charactersRaw( - const XMLCh* const /* chars */, -- const unsigned int /*length */) -+ const size_type /*length */) - { - } - -@@ -100,7 +100,7 @@ - void - FormatterToNull::ignorableWhitespace( - const XMLCh* const /* chars */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -131,8 +131,8 @@ - - void - FormatterToNull::cdata( -- const XMLCh* const /* ch */, -- const unsigned int /* length */) -+ const XMLCh* const /* ch */, -+ const size_type /* length */) - { - } - -Index: src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp (working copy) -@@ -233,7 +233,7 @@ - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - writeParentTagEnd(); - -@@ -391,7 +391,7 @@ - m_writer.write(value_type(XalanUnicode::charQuestionMark)); - writeName(target); - -- const XalanDOMString::size_type len = length(data); -+ const size_type len = length(data); - - // We need to make sure there is a least one whitespace character - // between the target and the data. -@@ -416,7 +416,7 @@ - void - writeCharacters( - const XMLCh* chars, -- unsigned int length) -+ size_type length) - { - assert(length != 0); - -@@ -424,8 +424,8 @@ - - m_indentHandler.setPreserve(true); - -- unsigned int i = 0; -- unsigned int firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < length) - { -@@ -466,7 +466,7 @@ - void - writeCDATA( - const XMLCh* chars, -- unsigned int length) -+ size_type length) - { - assert(length != 0); - -@@ -638,12 +638,12 @@ - * @param start the start offset into the string. - * @param length the length of the string. - */ -- XalanDOMString::size_type -+ size_type - writeNormalizedChar( -- XalanDOMChar ch, -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ XalanDOMChar ch, -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - if (XalanUnicode::charLF == ch) - { -@@ -679,11 +679,11 @@ - m_writer.write(value_type(XalanUnicode::charSemicolon)); - } - -- XalanDOMString::size_type -+ size_type - writeNormalizedCharBig( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - assert( start < length); - -@@ -712,11 +712,11 @@ - */ - void - writeCDATAChars( -- const XalanDOMChar chars[], -- XalanDOMString::size_type length, -- bool& outsideCDATA) -+ const XalanDOMChar chars[], -+ size_type length, -+ bool& outsideCDATA) - { -- XalanDOMString::size_type i = 0; -+ size_type i = 0; - - while(i < length) - { -@@ -795,13 +795,13 @@ - */ - void - writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength) -+ const XalanDOMChar* theString, -+ size_type theStringLength) - { - assert(theString != 0); - -- XalanDOMString::size_type i = 0; -- XalanDOMString::size_type firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < theStringLength) - { -@@ -863,10 +863,10 @@ - */ - void - writeNormalizedData( -- const XalanDOMChar* theData, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theData, -+ size_type theLength) - { -- for (XalanDOMString::size_type i = 0; i < theLength; ++i) -+ for (size_type i = 0; i < theLength; ++i) - { - const XalanDOMChar theChar = theData[i]; - -@@ -876,8 +876,8 @@ - - void - safeWriteContent( -- const XalanDOMChar* theChars, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theChars, -+ size_type theLength) - { - for(size_type i = 0; i < theLength; ++i) - { -Index: src/xalanc/XMLSupport/FormatterToNull.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToNull.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToNull.hpp (working copy) -@@ -74,12 +74,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -87,7 +87,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -104,7 +104,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - private: - -Index: src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp -=================================================================== ---- src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp (working copy) -@@ -258,7 +258,7 @@ - void - XalanXMLSerializerBase::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if(length != 0) - { -@@ -280,7 +280,7 @@ - void - XalanXMLSerializerBase::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - if (length != 0) - { -@@ -322,7 +322,7 @@ - void - XalanXMLSerializerBase::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if (length > 0) - { -@@ -380,7 +380,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::s_xhtmlDocTypeStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::s_xhtmlDocTypeStringLength = - FXML_SIZE(s_xhtmlDocTypeString); - - -@@ -481,7 +481,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderStartStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderStartStringLength = - FXML_SIZE(s_doctypeHeaderStartString); - - const char XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicString[] = -@@ -498,7 +498,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicStringLength = - FXML_SIZE(s_doctypeHeaderPublicString); - - const char XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemString[] = -@@ -515,7 +515,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemStringLength = - FXML_SIZE(s_doctypeHeaderSystemString); - - const char XalanXMLSerializerBase::UTF8::s_xmlHeaderStartString[] = -@@ -538,7 +538,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStartStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStartStringLength = - FXML_SIZE(s_xmlHeaderStartString); - - const char XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingString[] = -@@ -558,7 +558,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingStringLength = - FXML_SIZE(s_xmlHeaderEncodingString); - - const char XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneString[] = -@@ -580,7 +580,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneStringLength = - FXML_SIZE(s_xmlHeaderStandaloneString); - - const char XalanXMLSerializerBase::UTF8::s_xmlHeaderEndString[] = -@@ -591,7 +591,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEndStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEndStringLength = - FXML_SIZE(s_xmlHeaderEndString); - - const char XalanXMLSerializerBase::UTF8::s_defaultVersionString[] = -@@ -602,7 +602,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_defaultVersionStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_defaultVersionStringLength = - FXML_SIZE(s_defaultVersionString); - - const char XalanXMLSerializerBase::UTF8::s_cdataOpenString[] = -@@ -619,7 +619,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_cdataOpenStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_cdataOpenStringLength = - FXML_SIZE(s_cdataOpenString); - - const char XalanXMLSerializerBase::UTF8::s_cdataCloseString[] = -@@ -630,7 +630,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_cdataCloseStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_cdataCloseStringLength = - FXML_SIZE(s_cdataCloseString); - - -@@ -656,7 +656,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xhtmlDocTypeStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xhtmlDocTypeStringLength = - FXML_SIZE(s_xhtmlDocTypeString); - - const char XalanXMLSerializerBase::UTF8::s_lessThanEntityString[] = -@@ -668,7 +668,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_lessThanEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_lessThanEntityStringLength = - FXML_SIZE(s_lessThanEntityString); - - const char XalanXMLSerializerBase::UTF8::s_greaterThanEntityString[] = -@@ -680,7 +680,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_greaterThanEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_greaterThanEntityStringLength = - FXML_SIZE(s_greaterThanEntityString); - - const char XalanXMLSerializerBase::UTF8::s_ampersandEntityString[] = -@@ -693,7 +693,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_ampersandEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_ampersandEntityStringLength = - FXML_SIZE(s_ampersandEntityString); - - const char XalanXMLSerializerBase::UTF8::s_quoteEntityString[] = -@@ -707,7 +707,7 @@ - char(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_quoteEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_quoteEntityStringLength = - FXML_SIZE(s_quoteEntityString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartString[] = -@@ -725,7 +725,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartStringLength = - FXML_SIZE(s_doctypeHeaderStartString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicString[] = -@@ -742,7 +742,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicStringLength = - FXML_SIZE(s_doctypeHeaderPublicString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemString[] = -@@ -759,7 +759,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemStringLength = - FXML_SIZE(s_doctypeHeaderSystemString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderStartString[] = -@@ -782,7 +782,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStartStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStartStringLength = - FXML_SIZE(s_xmlHeaderStartString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingString[] = -@@ -802,7 +802,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingStringLength = - FXML_SIZE(s_xmlHeaderEncodingString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneString[] = -@@ -824,7 +824,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneStringLength = - FXML_SIZE(s_xmlHeaderStandaloneString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderEndString[] = -@@ -835,7 +835,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEndStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEndStringLength = - FXML_SIZE(s_xmlHeaderEndString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_defaultVersionString[] = -@@ -846,7 +846,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_defaultVersionStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_defaultVersionStringLength = - FXML_SIZE(s_defaultVersionString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_cdataOpenString[] = -@@ -863,7 +863,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_cdataOpenStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_cdataOpenStringLength = - FXML_SIZE(s_cdataOpenString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_cdataCloseString[] = -@@ -874,7 +874,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_cdataCloseStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_cdataCloseStringLength = - FXML_SIZE(s_cdataCloseString); - - -@@ -900,7 +900,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xhtmlDocTypeStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xhtmlDocTypeStringLength = - FXML_SIZE(s_xhtmlDocTypeString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_lessThanEntityString[] = -@@ -912,7 +912,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_lessThanEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_lessThanEntityStringLength = - FXML_SIZE(s_lessThanEntityString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_greaterThanEntityString[] = -@@ -924,7 +924,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_greaterThanEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_greaterThanEntityStringLength = - FXML_SIZE(s_greaterThanEntityString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_ampersandEntityString[] = -@@ -937,7 +937,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_ampersandEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_ampersandEntityStringLength = - FXML_SIZE(s_ampersandEntityString); - - const XalanDOMChar XalanXMLSerializerBase::UTF16::s_quoteEntityString[] = -@@ -951,7 +951,7 @@ - XalanDOMChar(0) - }; - --const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_quoteEntityStringLength = -+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_quoteEntityStringLength = - FXML_SIZE(s_quoteEntityString); - - -Index: src/xalanc/XMLSupport/FormatterToText.cpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToText.cpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToText.cpp (working copy) -@@ -187,7 +187,7 @@ - void - FormatterToText::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_writer != 0); - -@@ -245,7 +245,7 @@ - void - FormatterToText::charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - characters(chars, length); - } -@@ -262,7 +262,7 @@ - void - FormatterToText::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if (m_handleIgnorableWhitespace == true) - { -@@ -301,7 +301,7 @@ - void - FormatterToText::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - characters(ch, length); - } -Index: src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp (working copy) -@@ -122,12 +122,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length) = 0; -+ const size_type length) = 0; - - virtual void - entityReference(const XMLCh* const name) = 0; -@@ -135,7 +135,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -151,7 +151,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual const XalanDOMString& - getDoctypeSystem() const; -@@ -207,107 +207,107 @@ - /** - * The string "<!DOCTYPE ". - */ -- static const char s_doctypeHeaderStartString[]; -+ static const char s_doctypeHeaderStartString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderStartStringLength; -+ static const size_type s_doctypeHeaderStartStringLength; - - /** - * The string " PUBLIC \"". - */ -- static const char s_doctypeHeaderPublicString[]; -+ static const char s_doctypeHeaderPublicString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderPublicStringLength; -+ static const size_type s_doctypeHeaderPublicStringLength; - - /** - * The string " SYSTEM \"". - */ -- static const char s_doctypeHeaderSystemString[]; -+ static const char s_doctypeHeaderSystemString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderSystemStringLength; -+ static const size_type s_doctypeHeaderSystemStringLength; - - /** - * The string "<?xml version=\"". - */ -- static const char s_xmlHeaderStartString[]; -+ static const char s_xmlHeaderStartString[]; - -- static const XalanDOMString::size_type s_xmlHeaderStartStringLength; -+ static const size_type s_xmlHeaderStartStringLength; - - /** - * The string "\" encoding=\"". - */ -- static const char s_xmlHeaderEncodingString[]; -+ static const char s_xmlHeaderEncodingString[]; - -- static const XalanDOMString::size_type s_xmlHeaderEncodingStringLength; -+ static const size_type s_xmlHeaderEncodingStringLength; - - /** - * The string "\" standalone=\"". - */ -- static const char s_xmlHeaderStandaloneString[]; -+ static const char s_xmlHeaderStandaloneString[]; - -- static const XalanDOMString::size_type s_xmlHeaderStandaloneStringLength; -+ static const size_type s_xmlHeaderStandaloneStringLength; - - /** - * The string "\"?>". - */ -- static const char s_xmlHeaderEndString[]; -+ static const char s_xmlHeaderEndString[]; - -- static const XalanDOMString::size_type s_xmlHeaderEndStringLength; -+ static const size_type s_xmlHeaderEndStringLength; - - /** - * The string "1.0". - */ -- static const char s_defaultVersionString[]; -+ static const char s_defaultVersionString[]; - -- static const XalanDOMString::size_type s_defaultVersionStringLength; -+ static const size_type s_defaultVersionStringLength; - - /** - * The string "-//W3C//DTD XHTML". - */ -- static const XalanDOMChar s_xhtmlDocTypeString[]; -+ static const XalanDOMChar s_xhtmlDocTypeString[]; - -- static const XalanDOMString::size_type s_xhtmlDocTypeStringLength; -+ static const size_type s_xhtmlDocTypeStringLength; - - /** - * The string "<![CDATA[". - */ -- static const char s_cdataOpenString[]; -+ static const char s_cdataOpenString[]; - -- static const XalanDOMString::size_type s_cdataOpenStringLength; -+ static const size_type s_cdataOpenStringLength; - - /** - * The string "]]>". - */ -- static const char s_cdataCloseString[]; -+ static const char s_cdataCloseString[]; - -- static const XalanDOMString::size_type s_cdataCloseStringLength; -+ static const size_type s_cdataCloseStringLength; - - /** - * The string "<". - */ -- static const char s_lessThanEntityString[]; -+ static const char s_lessThanEntityString[]; - -- static const XalanDOMString::size_type s_lessThanEntityStringLength; -+ static const size_type s_lessThanEntityStringLength; - - /** - * The string ">". - */ -- static const char s_greaterThanEntityString[]; -+ static const char s_greaterThanEntityString[]; - -- static const XalanDOMString::size_type s_greaterThanEntityStringLength; -+ static const size_type s_greaterThanEntityStringLength; - - /** - * The string "&". - */ -- static const char s_ampersandEntityString[]; -+ static const char s_ampersandEntityString[]; - -- static const XalanDOMString::size_type s_ampersandEntityStringLength; -+ static const size_type s_ampersandEntityStringLength; - - /** - * The string """. - */ -- static const char s_quoteEntityString[]; -+ static const char s_quoteEntityString[]; - -- static const XalanDOMString::size_type s_quoteEntityStringLength; -+ static const size_type s_quoteEntityStringLength; - }; - - class XALAN_XMLSUPPORT_EXPORT UTF16 -@@ -322,107 +322,107 @@ - /** - * The string "<!DOCTYPE ". - */ -- static const XalanDOMChar s_doctypeHeaderStartString[]; -+ static const XalanDOMChar s_doctypeHeaderStartString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderStartStringLength; -+ static const size_type s_doctypeHeaderStartStringLength; - - /** - * The string " PUBLIC \"". - */ -- static const XalanDOMChar s_doctypeHeaderPublicString[]; -+ static const XalanDOMChar s_doctypeHeaderPublicString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderPublicStringLength; -+ static const size_type s_doctypeHeaderPublicStringLength; - - /** - * The string " SYSTEM \"". - */ -- static const XalanDOMChar s_doctypeHeaderSystemString[]; -+ static const XalanDOMChar s_doctypeHeaderSystemString[]; - -- static const XalanDOMString::size_type s_doctypeHeaderSystemStringLength; -+ static const size_type s_doctypeHeaderSystemStringLength; - - /** - * The string "<?xml version=\"". - */ -- static const XalanDOMChar s_xmlHeaderStartString[]; -+ static const XalanDOMChar s_xmlHeaderStartString[]; - -- static const XalanDOMString::size_type s_xmlHeaderStartStringLength; -+ static const size_type s_xmlHeaderStartStringLength; - - /** - * The string "\" encoding=\"". - */ -- static const XalanDOMChar s_xmlHeaderEncodingString[]; -+ static const XalanDOMChar s_xmlHeaderEncodingString[]; - -- static const XalanDOMString::size_type s_xmlHeaderEncodingStringLength; -+ static const size_type s_xmlHeaderEncodingStringLength; - - /** - * The string "\" standalone=\"". - */ -- static const XalanDOMChar s_xmlHeaderStandaloneString[]; -+ static const XalanDOMChar s_xmlHeaderStandaloneString[]; - -- static const XalanDOMString::size_type s_xmlHeaderStandaloneStringLength; -+ static const size_type s_xmlHeaderStandaloneStringLength; - - /** - * The string "\"?>". - */ -- static const XalanDOMChar s_xmlHeaderEndString[]; -+ static const XalanDOMChar s_xmlHeaderEndString[]; - -- static const XalanDOMString::size_type s_xmlHeaderEndStringLength; -+ static const size_type s_xmlHeaderEndStringLength; - - /** - * The string "1.0". - */ -- static const XalanDOMChar s_defaultVersionString[]; -+ static const XalanDOMChar s_defaultVersionString[]; - -- static const XalanDOMString::size_type s_defaultVersionStringLength; -+ static const size_type s_defaultVersionStringLength; - - /** - * The string "-//W3C//DTD XHTML". - */ -- static const XalanDOMChar s_xhtmlDocTypeString[]; -+ static const XalanDOMChar s_xhtmlDocTypeString[]; - -- static const XalanDOMString::size_type s_xhtmlDocTypeStringLength; -+ static const size_type s_xhtmlDocTypeStringLength; - - /** - * The string "<![CDATA[". - */ -- static const XalanDOMChar s_cdataOpenString[]; -+ static const XalanDOMChar s_cdataOpenString[]; - -- static const XalanDOMString::size_type s_cdataOpenStringLength; -+ static const size_type s_cdataOpenStringLength; - - /** - * The string "]]>". - */ -- static const XalanDOMChar s_cdataCloseString[]; -+ static const XalanDOMChar s_cdataCloseString[]; - -- static const XalanDOMString::size_type s_cdataCloseStringLength; -+ static const size_type s_cdataCloseStringLength; - - /** - * The string "<". - */ -- static const XalanDOMChar s_lessThanEntityString[]; -+ static const XalanDOMChar s_lessThanEntityString[]; - -- static const XalanDOMString::size_type s_lessThanEntityStringLength; -+ static const size_type s_lessThanEntityStringLength; - - /** - * The string ">". - */ -- static const XalanDOMChar s_greaterThanEntityString[]; -+ static const XalanDOMChar s_greaterThanEntityString[]; - -- static const XalanDOMString::size_type s_greaterThanEntityStringLength; -+ static const size_type s_greaterThanEntityStringLength; - - /** - * The string "&". - */ -- static const XalanDOMChar s_ampersandEntityString[]; -+ static const XalanDOMChar s_ampersandEntityString[]; - -- static const XalanDOMString::size_type s_ampersandEntityStringLength; -+ static const size_type s_ampersandEntityStringLength; - - /** - * The string """. - */ -- static const XalanDOMChar s_quoteEntityString[]; -+ static const XalanDOMChar s_quoteEntityString[]; - -- static const XalanDOMString::size_type s_quoteEntityStringLength; -+ static const size_type s_quoteEntityStringLength; - }; - - enum -@@ -569,12 +569,12 @@ - virtual void - writeCharacters( - const XMLCh* chars, -- unsigned int length) = 0; -+ size_type length) = 0; - - virtual void - writeCDATA( - const XMLCh* chars, -- unsigned int length) = 0; -+ size_type length) = 0; - - virtual void - outputNewline() = 0; -@@ -692,7 +692,7 @@ - */ - const XalanDOMString m_standalone; - -- const XalanDOMString m_encoding; -+ const XalanDOMString m_encoding; - - static bool - isUTF16HighSurrogate(XalanDOMChar theChar) -@@ -790,9 +790,9 @@ - /** - * The string "-//W3C//DTD XHTML". - */ -- static const XalanDOMChar s_xhtmlDocTypeString[]; -+ static const XalanDOMChar s_xhtmlDocTypeString[]; - -- static const XalanDOMString::size_type s_xhtmlDocTypeStringLength; -+ static const size_type s_xhtmlDocTypeStringLength; - }; - - -Index: src/xalanc/XMLSupport/FormatterToText.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToText.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToText.hpp (working copy) -@@ -187,12 +187,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -200,7 +200,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -216,7 +216,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - private: - -Index: src/xalanc/XMLSupport/FormatterToXML.cpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToXML.cpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToXML.cpp (working copy) -@@ -695,13 +695,13 @@ - - void - FormatterToXML::accumNameArray( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { -- const XalanDOMString::size_type n = start + length; -+ const size_type n = start + length; - -- for(XalanDOMString::size_type i = start; i < n; ++i) -+ for(size_type i = start; i < n; ++i) - { - accumName(chars[i]); - } -@@ -711,13 +711,13 @@ - - void - FormatterToXML::accumContentArray( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { -- const XalanDOMString::size_type n = start + length; -+ const size_type n = start + length; - -- for(XalanDOMString::size_type i = start; i < n; ++i) -+ for(size_type i = start; i < n; ++i) - { - accumContent(chars[i]); - } -@@ -727,13 +727,13 @@ - - void - FormatterToXML::accumArrayUTF( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { -- const XalanDOMString::size_type n = start + length; -+ const size_type n = start + length; - -- for(XalanDOMString::size_type i = start; i < n; ++i) -+ for(size_type i = start; i < n; ++i) - { - accumCharUTF(chars[i]); - } -@@ -743,9 +743,9 @@ - - void - FormatterToXML::accumArrayUTFDirect( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - assert(m_maxCharacter >= 65535); - assert(m_stream != 0); -@@ -854,13 +854,13 @@ - - - --XalanDOMString::size_type -+FormatterToXML::size_type - FormatterToXML::accumDefaultEscape( -- XalanDOMChar ch, -- XalanDOMString::size_type i, -- const XalanDOMChar chars[], -- XalanDOMString::size_type len, -- bool escLF) -+ XalanDOMChar ch, -+ size_type i, -+ const XalanDOMChar chars[], -+ size_type len, -+ bool escLF) - { - if(!accumDefaultEntity(ch, escLF)) - { -@@ -1258,7 +1258,7 @@ - void - FormatterToXML::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if(length != 0) - { -@@ -1278,8 +1278,8 @@ - - m_ispreserve = true; - -- unsigned int i = 0; -- unsigned int firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < length) - { -@@ -1318,7 +1318,7 @@ - void - FormatterToXML::charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - writeParentTagEnd(); - -@@ -1378,13 +1378,13 @@ - - void - FormatterToXML::writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength) -+ const XalanDOMChar* theString, -+ size_type theStringLength) - { - assert(theString != 0); - -- XalanDOMString::size_type i = 0; -- XalanDOMString::size_type firstIndex = 0; -+ size_type i = 0; -+ size_type firstIndex = 0; - - while(i < theStringLength) - { -@@ -1423,14 +1423,14 @@ - - void - FormatterToXML::writeNormalizedChars( -- const XalanDOMChar ch[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length, -- bool isCData) -+ const XalanDOMChar ch[], -+ size_type start, -+ size_type length, -+ bool isCData) - { -- XalanDOMString::size_type end = start + length; -+ size_type end = start + length; - -- for(XalanDOMString::size_type i = start; i < end; i++) -+ for(size_type i = start; i < end; ++i) - { - const XalanDOMChar c = ch[i]; - -@@ -1595,7 +1595,7 @@ - void - FormatterToXML::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - #if 1 - // We need to do normalization, which is slower, -@@ -1678,7 +1678,7 @@ - void - FormatterToXML::cdata( - const XMLCh* const ch, -- const unsigned int length) -+ const size_type length) - { - if(m_nextIsRaw == true) - { -@@ -1839,10 +1839,10 @@ - - void - FormatterToXML::accumNormalizedPIData( -- const XalanDOMChar* theData, -- XalanDOMString::size_type theLength) -+ const XalanDOMChar* theData, -+ size_type theLength) - { -- for (XalanDOMString::size_type i = 0; i < theLength; ++i) -+ for (size_type i = 0; i < theLength; ++i) - { - accumContent(theData[i]); - } -Index: src/xalanc/XMLSupport/XalanUTF16Writer.hpp -=================================================================== ---- src/xalanc/XMLSupport/XalanUTF16Writer.hpp (revision 706129) -+++ src/xalanc/XMLSupport/XalanUTF16Writer.hpp (working copy) -@@ -56,10 +56,10 @@ - - size_type - writeCDATAChar( -- const XalanDOMChar chars[], -- size_type start, -- size_type /*length*/, -- bool& /* outsideCDATA */) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type /*length*/, -+ bool& /* outsideCDATA */) - { - assert( chars != 0 ); - -@@ -69,28 +69,34 @@ - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writeNameChar(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writeNameChar( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writePIChars(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writePIChars( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } - - /** -- * Writes name chars , if not presentable, throws -+ * Writes name chars, if not representable, throws - */ -- void writeCommentChars(const XalanDOMChar* data, -- size_type theLength) -+ void -+ writeCommentChars( -+ const XalanDOMChar* data, -+ size_type theLength) - { - write(data, theLength); - } -Index: src/xalanc/XMLSupport/FormatterToXML.hpp -=================================================================== ---- src/xalanc/XMLSupport/FormatterToXML.hpp (revision 706129) -+++ src/xalanc/XMLSupport/FormatterToXML.hpp (working copy) -@@ -146,12 +146,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -159,7 +159,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -176,7 +176,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual Writer* - getWriter() const; -@@ -294,8 +294,8 @@ - - typedef void (FormatterToXML::*AccumArrayFunctionType)( - const XalanDOMChar[], -- XalanDOMString::size_type, -- XalanDOMString::size_type); -+ size_type, -+ size_type); - - typedef void (FormatterToXML::*FlushFunctionType)(); - -@@ -374,9 +374,9 @@ - */ - void - accumName( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - assert(m_accumNameArrayFunction != 0); - -@@ -392,9 +392,9 @@ - */ - void - accumContent( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length) -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length) - { - assert(m_accumContentArrayFunction != 0); - -@@ -434,13 +434,13 @@ - /** - * Escape and accum a character. - */ -- XalanDOMString::size_type -+ size_type - accumDefaultEscape( -- XalanDOMChar ch, -- XalanDOMString::size_type i, -- const XalanDOMChar chars[], -- XalanDOMString::size_type len, -- bool escLF); -+ XalanDOMChar ch, -+ size_type i, -+ const XalanDOMChar chars[], -+ size_type len, -+ bool escLF); - - /** - * Handle one of the default entities, return false if it -@@ -513,10 +513,10 @@ - */ - virtual void - writeNormalizedChars( -- const XalanDOMChar ch[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length, -- bool isCData); -+ const XalanDOMChar ch[], -+ size_type start, -+ size_type length, -+ bool isCData); - - /** - * Write a number into the buffer as an entity -@@ -534,8 +534,8 @@ - */ - virtual void - writeAttrString( -- const XalanDOMChar* theString, -- XalanDOMString::size_type theStringLength); -+ const XalanDOMChar* theString, -+ size_type theStringLength); - - /** - * Write the data for a comment -@@ -853,9 +853,9 @@ - */ - void - accumNameArray( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length); - - /** - * Append an array of wide character to the buffer. -@@ -868,9 +868,9 @@ - */ - void - accumContentArray( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length); - - /** - * Append an array of wide character to the buffer. -@@ -883,9 +883,9 @@ - */ - void - accumArrayUTF( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length); - - /** - * Append an array of wide character to the output. -@@ -898,9 +898,9 @@ - */ - void - accumArrayUTFDirect( -- const XalanDOMChar chars[], -- XalanDOMString::size_type start, -- XalanDOMString::size_type length); -+ const XalanDOMChar chars[], -+ size_type start, -+ size_type length); - - /** - * Append a string to the buffer. -@@ -974,8 +974,8 @@ - */ - void - accumNormalizedPIData( -- const XalanDOMChar* theData, -- XalanDOMString::size_type theLength); -+ const XalanDOMChar* theData, -+ size_type theLength); - - - // Data members... -@@ -1018,7 +1018,7 @@ - */ - const XalanDOMString m_attrSpecialChars; - -- typedef XalanDOMString::size_type size_type; -+ //typedef XalanDOMString::size_type size_type; - - /** - * The string "<!DOCTYPE ". -Index: src/xalanc/Utils/MsgCreator/NLSHandler.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/NLSHandler.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/NLSHandler.hpp (working copy) -@@ -20,8 +20,15 @@ - #include "ICUResHandler.hpp" - - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - XERCES_CPP_NAMESPACE_USE - -+ -+ - class NLSHandler : public ICUResHandler - { - public: -@@ -44,7 +51,7 @@ - - void - characters( const XMLCh* const chars -- , const unsigned int length); -+ , const XMLSize_t length); - void - startDocument(); - -@@ -72,6 +79,8 @@ - - - --#endif //NLSHANDLER_MSGCREATOR_1357924680 -+XALAN_CPP_NAMESPACE_END - - -+ -+#endif //NLSHANDLER_MSGCREATOR_1357924680 -Index: src/xalanc/Utils/MsgCreator/InMemHandler.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/InMemHandler.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/InMemHandler.cpp (working copy) -@@ -26,6 +26,11 @@ - #include "InMemData.hpp" - - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - // ----------------------------------------------------------------------- - // Constructors - // ----------------------------------------------------------------------- -@@ -68,7 +73,7 @@ - - - void InMemHandler::characters( const XMLCh* const chars -- , const unsigned int length) -+ , const XalanSize_t length) - { - - if ( m_startCollectingCharacters == true ) -@@ -99,15 +104,15 @@ - - } - --void InMemHandler::endElement(const XMLCh* const , -- const XMLCh* const localname, -- const XMLCh* const ) -+void InMemHandler::endElement(const XMLCh* const /* uri */, -+ const XMLCh* const /* localname */, -+ const XMLCh* const qname) - { - if ( m_startCollectingCharacters == false) - return; - - -- if(!XMLString::compareString(localname,s_targetXMLCh)) -+ if(!XMLString::compareString(qname,s_targetXMLCh)) - { - m_startCollectingCharacters = false; - -@@ -121,13 +126,13 @@ - const Attributes& attributes) - { - -- if(!XMLString::compareString(localname,s_transUnitXMLCh)) -+ if(!XMLString::compareString(qname,s_transUnitXMLCh)) - { - // this is an elemente, SAX2Handler class is responsible to handle: - // creating Index file, commom for all localization styles - SAX2Handler::startElement(uri, localname, qname, attributes); - } -- else if(!XMLString::compareString(localname,s_targetXMLCh)) -+ else if(!XMLString::compareString(qname,s_targetXMLCh)) - { - - -@@ -203,3 +208,7 @@ - printToDataFile( szEndDataFile ); - - } -+ -+ -+ -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/MsgCreator.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/MsgCreator.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/MsgCreator.cpp (working copy) -@@ -263,7 +263,9 @@ - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); - #endif -- -+ -+ XALAN_CPP_NAMESPACE_USE -+ - CmdLineParams theParams; - - int iReturnValue = 0; -Index: src/xalanc/Utils/MsgCreator/InMemHandler.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/InMemHandler.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/InMemHandler.hpp (working copy) -@@ -20,8 +20,14 @@ - #include "SAX2Handler.hpp" - - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - XERCES_CPP_NAMESPACE_USE - -+ - class InMemHandler : public SAX2Handler - { - public: -@@ -54,7 +60,7 @@ - - virtual void - characters( const XMLCh* const chars -- , const unsigned int length); -+ , const XalanSize_t length); - - - -@@ -96,4 +102,10 @@ - - }; - -+ -+ -+XALAN_CPP_NAMESPACE_END -+ -+ -+ - #endif /// INMEMHANDLER_MSGCREATOR_1357924680 -Index: src/xalanc/Utils/MsgCreator/SAX2Handler.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (working copy) -@@ -29,11 +29,12 @@ - #include "MsgCreator.hpp" - - -+XALAN_CPP_NAMESPACE_BEGIN - -+ - static const char* INDEX_FILE_NAME="LocalMsgIndex.hpp"; - - -- - // --------------------------------------------------------------------------- - // SAX2Handler: Constructors and Destructor - // --------------------------------------------------------------------------- -@@ -92,12 +93,12 @@ - - - --void SAX2Handler::startElement(const XMLCh* const , -- const XMLCh* const localname, -- const XMLCh* const , -+void SAX2Handler::startElement(const XMLCh* const /* uri */, -+ const XMLCh* const /* localname */, -+ const XMLCh* const qname, - const Attributes& attributes) - { -- if(!XMLString::compareString(localname,s_transUnitXMLCh)) -+ if(!XMLString::compareString(qname,s_transUnitXMLCh)) - { - unsigned int len = attributes.getLength(); - -@@ -192,3 +193,5 @@ - } - - -+ -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/SAX2Handler.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/SAX2Handler.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/SAX2Handler.hpp (working copy) -@@ -23,6 +23,10 @@ - #include <xercesc/util/XMLUniDefs.hpp> - - -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - XERCES_CPP_NAMESPACE_USE - - -@@ -210,6 +214,9 @@ - }; - - --#endif //SAX2HANDLER_MSGCREATOR_1357924680 - -+XALAN_CPP_NAMESPACE_END - -+ -+ -+#endif //SAX2HANDLER_MSGCREATOR_1357924680 -Index: src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp (working copy) -@@ -24,6 +24,9 @@ - #include <cstdio> - - -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ - static XalanFileOutputStream::HandleType - openFile(const char* theFileName) - { -@@ -105,7 +108,7 @@ - void - XalanFileOutputStream::writeData( - const char* theBuffer, -- unsigned int theBufferLength) -+ XalanSize_t theBufferLength) - { - #if defined(WIN32) - DWORD theBytesWritten; -@@ -204,13 +207,13 @@ - } - - --void XalanFileOutputStream::write(const UTF16Ch* theString, unsigned int theLength) -+void XalanFileOutputStream::write(const UTF16Ch* theString, XalanSize_t theLength) - { - assert ( theString != 0 ); - writeData((const char*)theString,theLength * sizeof(UTF16Ch) ); - } - --void XalanFileOutputStream::write(const char* theString, unsigned int theLength) -+void XalanFileOutputStream::write(const char* theString, XalanSize_t theLength) - { - assert ( theString != 0 ); - -@@ -221,7 +224,7 @@ - XMLString::release(&theUTFString); - } - --void XalanFileOutputStream::writeAsASCII(const UTF16Ch* theString, unsigned int theLengts) -+void XalanFileOutputStream::writeAsASCII(const UTF16Ch* theString, XalanSize_t theLengts) - { - char* szString = XMLString::transcode(theString); - writeData( szString, theLengts ); -@@ -229,7 +232,7 @@ - - } - --void XalanFileOutputStream::writeAsASCII(const char* theString, unsigned int theLengts) -+void XalanFileOutputStream::writeAsASCII(const char* theString, XalanSize_t theLengts) - { - writeData( theString, theLengts ); - } -@@ -244,3 +247,7 @@ - { - write(s_UTF16ByteOrderMark,1); - } -+ -+ -+ -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp (working copy) -@@ -20,6 +20,7 @@ - #define XALANOUTPUTFILE_1357924680 - - #include <xercesc/util/XMLUniDefs.hpp> -+#include "xalanc/Include/PlatformDefinitions.hpp" - - - #if defined(WIN32) -@@ -32,10 +33,11 @@ - - - --XERCES_CPP_NAMESPACE_USE -+XALAN_CPP_NAMESPACE_BEGIN - - - -+XERCES_CPP_NAMESPACE_USE - - // Class responcible for printing into file with UTF16 - -@@ -111,15 +113,15 @@ - - - void -- write(const UTF16Ch* theString, unsigned int theLength); -+ write(const UTF16Ch* theString, XalanSize_t theLength); - void -- write(const char* theString, unsigned int theLength); -+ write(const char* theString, XalanSize_t theLength); - - void -- writeAsASCII(const char* theString, unsigned int theLengts); -+ writeAsASCII(const char* theString, XalanSize_t theLengts); - - void -- writeAsASCII(const UTF16Ch* theString, unsigned int theLengts); -+ writeAsASCII(const UTF16Ch* theString, XalanSize_t theLengts); - void - writeUTFprefix(); - protected: -@@ -127,7 +129,7 @@ - void - writeData( - const char* theBuffer, -- unsigned int theBufferLength); -+ XalanSize_t theBufferLength); - - void - doFlush(); -@@ -151,6 +153,7 @@ - }; - - --#endif //XALANOUTPUTFILE_1357924680 -+XALAN_CPP_NAMESPACE_END - - -+#endif //XALANOUTPUTFILE_1357924680 -Index: src/xalanc/Utils/MsgCreator/ICUResHandler.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/ICUResHandler.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/ICUResHandler.cpp (working copy) -@@ -28,7 +28,10 @@ - - - -+XALAN_CPP_NAMESPACE_BEGIN - -+ -+ - // ----------------------------------------------------------------------- - // Constructors - // ----------------------------------------------------------------------- -@@ -58,7 +61,7 @@ - // change tham with \", \{ and \} - - void ICUResHandler::characters( const XMLCh* const chars -- , const unsigned int length) -+ , const XalanSize_t length) - { - - if ( m_startCollectingCharacters == true ) -@@ -100,15 +103,15 @@ - - } - --void ICUResHandler::endElement(const XMLCh* const , -- const XMLCh* const localname, -- const XMLCh* const ) -+void ICUResHandler::endElement(const XMLCh* const /* uri */, -+ const XMLCh* const /* localname */, -+ const XMLCh* const qname) - { - if ( m_startCollectingCharacters == false) - return; - - -- if(!XMLString::compareString(localname,s_targetXMLCh)) -+ if(!XMLString::compareString(qname,s_targetXMLCh)) - { - m_startCollectingCharacters = false; - -@@ -122,13 +125,13 @@ - const Attributes& attributes) - { - -- if(!XMLString::compareString(localname,s_transUnitXMLCh)) -+ if(!XMLString::compareString(qname,s_transUnitXMLCh)) - { - // this is an elemente, SAX2Handler class is responsible to handle: - // creating Index file, commom for all localization styles - SAX2Handler::startElement(uri, localname, qname, attributes); - } -- else if(!XMLString::compareString(localname,s_targetXMLCh)) -+ else if(!XMLString::compareString(qname,s_targetXMLCh)) - { - if ( m_locale != 0 ) - { -@@ -196,4 +199,4 @@ - } - - -- -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/NLSHandler.cpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/NLSHandler.cpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/NLSHandler.cpp (working copy) -@@ -22,6 +22,11 @@ - - #include <cstdio> - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - // ----------------------------------------------------------------------- - // Constructors - // ----------------------------------------------------------------------- -@@ -48,7 +53,7 @@ - } - - void NLSHandler::characters( const XMLCh* const chars -- , const unsigned int length) -+ , const XalanSize_t length) - { - - if ( m_startCollectingCharacters == true ) -@@ -128,3 +133,7 @@ - m_fStream.writeAsASCII("^\n",2); - } - } -+ -+ -+ -+XALAN_CPP_NAMESPACE_END -Index: src/xalanc/Utils/MsgCreator/ICUResHandler.hpp -=================================================================== ---- src/xalanc/Utils/MsgCreator/ICUResHandler.hpp (revision 706129) -+++ src/xalanc/Utils/MsgCreator/ICUResHandler.hpp (working copy) -@@ -20,8 +20,15 @@ - #include "SAX2Handler.hpp" - - -+ -+XALAN_CPP_NAMESPACE_BEGIN -+ -+ -+ - XERCES_CPP_NAMESPACE_USE - -+ -+ - class ICUResHandler : public SAX2Handler - { - public: -@@ -52,7 +59,7 @@ - - virtual void - characters( const XMLCh* const chars -- , const unsigned int length); -+ , const XMLSize_t length); - - protected: - virtual void -@@ -84,5 +91,8 @@ - operator==(const ICUResHandler&) const; - }; - --#endif // ICURESHANDLER_MSGCREATOR_1357924680 - -+XALAN_CPP_NAMESPACE_END -+ -+ -+#endif // ICURESHANDLER_MSGCREATOR_1357924680 -Index: src/xalanc/XalanDOM/XalanDOMString.hpp -=================================================================== ---- src/xalanc/XalanDOM/XalanDOMString.hpp (revision 706129) -+++ src/xalanc/XalanDOM/XalanDOMString.hpp (working copy) -@@ -50,7 +50,7 @@ - typedef XalanDOMChar& reference; - typedef const XalanDOMChar& const_reference; - -- typedef unsigned int size_type; -+ typedef XalanSize_t size_type; - - typedef XalanDOMCharVectorType::iterator iterator; - typedef XalanDOMCharVectorType::const_iterator const_iterator; -@@ -60,7 +60,7 @@ - #if defined(XALAN_INLINE_INITIALIZATION) - static const size_type npos = ~0u; - #else -- enum { npos = -1 }; -+ enum { npos = ~0u }; - #endif - - XalanDOMString(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR ); -Index: src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp -=================================================================== ---- src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp (revision 706129) -+++ src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp (working copy) -@@ -96,6 +96,9 @@ - virtual void - deallocate(void* pointer); - -+ virtual MemoryManager* -+ getExceptionMemoryManager(); -+ - bool - getAssertErrors() const - { -Index: src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp -=================================================================== ---- src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp (revision 706129) -+++ src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp (working copy) -@@ -157,6 +157,14 @@ - - - -+MemoryManager* -+XalanDiagnosticMemoryManager::getExceptionMemoryManager() -+{ -+ return &m_memoryManager; -+} -+ -+ -+ - void - XalanDiagnosticMemoryManager::dumpStatistics( - StreamType* theStream, -Index: src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp -=================================================================== ---- src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp (revision 706129) -+++ src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp (working copy) -@@ -74,7 +74,8 @@ - public: - - typedef XalanVector<XalanSourceTreeElement*> ElementStackType; -- typedef XalanVector<XalanNode*> LastChildStackType; -+ typedef XalanVector<XalanNode*> LastChildStackType; -+ typedef XalanSize_t size_type; - - enum { eDefaultStackSize = 50, eDefaultTextBufferSize = 100 }; - -@@ -94,7 +95,7 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - endDocument(); -@@ -108,7 +109,7 @@ - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -165,7 +166,7 @@ - virtual void - comment( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - endCDATA(); -@@ -225,8 +226,8 @@ - - void - doCharacters( -- const XMLCh* chars, -- XalanDOMString::size_type length); -+ const XMLCh* chars, -+ size_type length); - - // Data members... - -Index: src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp -=================================================================== ---- src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp (revision 706129) -+++ src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp (working copy) -@@ -259,7 +259,7 @@ - void - FormatterToSourceTree::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - if (m_documentFragment != 0) - { -@@ -283,7 +283,7 @@ - void - FormatterToSourceTree::charactersRaw( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_document != 0); - -@@ -306,7 +306,7 @@ - void - FormatterToSourceTree::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_document != 0); - -@@ -381,7 +381,7 @@ - void - FormatterToSourceTree::cdata( - const XMLCh* const /* ch */, -- const unsigned int /* length */) -+ const size_type /* length */) - { - } - -@@ -402,8 +402,8 @@ - - void - FormatterToSourceTree::doCharacters( -- const XMLCh* chars, -- XalanDOMString::size_type length) -+ const XMLCh* chars, -+ size_type length) - { - if (m_currentElement != 0) - { -Index: src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp -=================================================================== ---- src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp (revision 706129) -+++ src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp (working copy) -@@ -141,7 +141,7 @@ - virtual void - charactersRaw( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - comment(const XMLCh* const data); -@@ -149,7 +149,7 @@ - virtual void - cdata( - const XMLCh* const ch, -- const unsigned int length); -+ const size_type length); - - virtual void - entityReference(const XMLCh* const name); -@@ -174,12 +174,12 @@ - virtual void - characters( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length); -+ const size_type length); - - virtual void - processingInstruction( -@@ -203,8 +203,8 @@ - - void - doCharacters( -- const XalanDOMChar* chars, -- XalanDOMString::size_type length); -+ const XalanDOMChar* chars, -+ size_type length); - - void - doProcessingInstruction( -Index: src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp -=================================================================== ---- src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp (revision 706129) -+++ src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp (working copy) -@@ -65,7 +65,7 @@ - void - XalanSourceTreeContentHandler::characters( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_inDTD == false); - -@@ -194,7 +194,7 @@ - void - XalanSourceTreeContentHandler::ignorableWhitespace( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_inDTD == false); - -@@ -370,7 +370,7 @@ - void - XalanSourceTreeContentHandler::comment( - const XMLCh* const chars, -- const unsigned int length) -+ const size_type length) - { - assert(m_document != 0); - -@@ -499,8 +499,8 @@ - - void - XalanSourceTreeContentHandler::doCharacters( -- const XMLCh* chars, -- XalanDOMString::size_type length) -+ const XMLCh* chars, -+ size_type length) - { - assert(m_inDTD == false); - -Index: src/xalanc/DOMSupport/DOMSupportDefault.cpp -=================================================================== ---- src/xalanc/DOMSupport/DOMSupportDefault.cpp (revision 706129) -+++ src/xalanc/DOMSupport/DOMSupportDefault.cpp (working copy) -@@ -90,18 +90,14 @@ - - if (theNode != 0 && theNode->getNodeType() == XalanNode::ENTITY_NODE) - { -- const XalanEntity* theEntity = -+ const XalanEntity* const theEntity = - #if defined(XALAN_OLD_STYLE_CASTS) - (const XalanEntity*)theNode; - #else - static_cast<const XalanEntity*>(theNode); - #endif - -- const XalanDOMString theNotationName( -- theEntity->getNotationName(), -- theMemoryManager); -- -- if(isEmpty(theNotationName) == false) // then it's unparsed -+ if(length(theEntity->getNotationName()) != 0) // then it's unparsed - { - // The draft says: "The XSLT processor may use the public - // identifier to generate a URI for the entity instead of the URI -@@ -114,7 +110,7 @@ - // So I'm falling a bit short here. - theURI = theEntity->getSystemId(); - -- if(isEmpty(theURI) == true) -+ if(theURI.length() == 0) - { - theURI = theEntity->getPublicId(); - } -Index: src/xalanc/DOMSupport/DOMServices.hpp -=================================================================== ---- src/xalanc/DOMSupport/DOMServices.hpp (revision 706129) -+++ src/xalanc/DOMSupport/DOMServices.hpp (working copy) -@@ -203,7 +203,7 @@ - append(data, text.getData()); - } - -- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int); -+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type); - - /** - * Sends the data for a node to a FormatterListener -Index: Tests/Conf/conf.cpp -=================================================================== ---- Tests/Conf/conf.cpp (revision 706129) -+++ Tests/Conf/conf.cpp (working copy) -@@ -207,7 +207,12 @@ - - XercesDOMParser theParser(0, &mgr); - -+#if XERCES_VERSION_MAJOR < 3 - theParser.setDoValidation(true); -+#else -+ theParser.setValidationScheme(XercesDOMParser::Val_Auto); -+#endif -+ - theParser.setDoNamespaces(true); - - theParser.parse(xmlInput); -@@ -308,7 +313,9 @@ - // - const XalanDOMString& currentDir = dirs[j]; - -- if (length(h.args.sub) == 0 || equals(currentDir, h.args.sub) == true) -+ if ((length(h.args.sub) == 0 || -+ equals(currentDir, h.args.sub) == true) && -+ currentDir[0] != XalanUnicode::charFullStop) - { - // Check that output directory is there. - // -Index: samples/SimpleTransform/XalanMemoryManagerImpl.hpp -=================================================================== ---- samples/SimpleTransform/XalanMemoryManagerImpl.hpp (revision 706129) -+++ samples/SimpleTransform/XalanMemoryManagerImpl.hpp (working copy) -@@ -96,7 +96,13 @@ - - } - -- virtual -+ MemoryManager* -+ getExceptionMemoryManager() -+ { -+ return this; -+ } -+ -+ virtual - ~XalanMemoryManagerImpl() - { - if( 0 == HeapDestroy(m_heapHandle) ) diff --git a/xalan-c.spec b/xalan-c.spec index 13398a3..b937b0c 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -1,85 +1,124 @@ Name: xalan-c Version: 1.11.0 -Release: 19%{?dist} -Summary: Xalan XSLT processor for C +Release: 20%{?dist} +Summary: Xalan XSLT processor for C/C++ License: ASL 2.0 -URL: http://xml.apache.org/xalan-c/ -Source0: http://www.us.apache.org/dist/xalan/xalan-c/sources/xalan_c-1.11-src.tar.gz +URL: https://xalan.apache.org/%{name}/ +%global tag Xalan-C_%(echo '%{version}' | tr . _) +%global tar_name %{tag} +%global release_url https://github.com/apache/%{name}/archive/ +Source0: %{release_url}/%{tar_name}.tar.gz Patch0: xalan-c-1.10.0-escaping.patch +BuildRequires: make +BuildRequires: gnulib-devel +BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: xerces-c-devel +%global so_version %(echo %{version} | cut -d . -f -2 | tr -d .) + %description -Xalan is an XSLT processor for transforming XML documents into HTML, text, or -other XML document types. +The Apache Xalan-C++ Project provides a library and a command line program to +transform XML documents using a stylesheet that conforms to XSLT 1.0 standards. + +Xalan is a project of the Apache Software Foundation. %package devel -Summary: Header files, libraries and development documentation for %{name} -Requires: %{name} = %{version}-%{release} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -This package contains the header files, static libraries and development -documentation for %{name}. If you like to develop programs using %{name}, -you will need to install %{name}-devel. +The %{name}-devel package contains libraries and header files for developing +applications that use %{name}. %package doc -Summary: Documentation for Xalan XSLT processor for C +Summary: Documentation for %{name} +BuildRequires: doxygen +# Explicit BR required for EPEL8: +BuildRequires: graphviz %description doc Documentation for %{name}. %prep -%setup -q -n xalan-c-1.11/c -%patch0 -p2 -b .escaping -find -type d -name CVS -print0 | xargs -0 rm -rf -chmod 644 NOTICE +%autosetup -n %{name}-%{tar_name} -p2 + +# https://github.com/apache/xalan-c/pull/35 +chmod a-x NOTICE -# Update config.guess for new architectures -cp /usr/lib/rpm/config.guess config.guess +# Update config.guess/config.sub for new architectures (aarch64) +cp -vp \ + %{_datadir}/gnulib/build-aux/config.guess \ + %{_datadir}/gnulib/build-aux/config.sub \ + ./ %build export XALANCROOT="${PWD}" export XERCESROOT=%{_includedir}/xercesc/ COMMONARGS="-plinux -cgcc -xg++ -minmem" -%ifarch alpha %{power64} s390x sparc64 x86_64 aarch64 -./runConfigure ${COMMONARGS} -b64 -P %{_prefix} -C --libdir="%{_libdir}" -z '%{optflags}' -%else -./runConfigure ${COMMONARGS} -b32 -P %{_prefix} -C --libdir="%{_libdir}" -z '%{optflags}' -%endif -# _smp_mflags do not work -make +./runConfigure ${COMMONARGS} -b%{__isa_bits} -P %{_prefix} -C --libdir="%{_libdir}" -z '%{optflags}' +# Parallel build does not work +%global _smp_mflags %{nil} +%make_build all tests +pushd xdocs +./make-apiDocs.sh +popd +mv -v build/docs/xalan-c build/docs/html %install export XALANCROOT="${PWD}" export XERCESROOT=%{_includedir}/xercesc/ -make install DESTDIR=%{buildroot} +%make_install +# Required for EPEL: %ldconfig_scriptlets +%check +LD_LIBRARY_PATH=$PWD/lib; export LD_LIBRARY_PATH +./bin/testXPath +# ./bin/ThreadTest crashes; how inauspicious! + + %files -%doc LICENSE KEYS NOTICE +%license LICENSE %{_bindir}/Xalan -%{_libdir}/libxalan*.so.* +%{_libdir}/libxalanMsg.so.%{so_version} +%{_libdir}/libxalanMsg.so.%{so_version}.* +%{_libdir}/libxalan-c.so.%{so_version} +%{_libdir}/libxalan-c.so.%{so_version}.* %files devel -%{_libdir}/libxalan*.so +%{_libdir}/libxalanMsg.so +%{_libdir}/libxalan-c.so %{_includedir}/xalanc/ %files doc -%doc readme.html xdocs samples +%license LICENSE +%doc KEYS +%doc NOTICE +%doc README +%doc readme.html +%doc samples +%doc build/docs/html %changelog +* Wed Dec 9 2020 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.11.0-20 +- Build API documentation with Doxygen +- Update summaries and descriptions from upstream +- Enable at least the XPath tests +- Drop unused old tarball and patches from source RPM + * Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.11.0-19 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild commit 487394949e66ad81b2d3e15d7b0a9735d8372553 Author: Benjamin Beasley <code(a)musicinmybrain.net> Date: Wed Dec 9 12:15:59 2020 -0500 add rpmlintrc diff --git a/xalan-c.rpmlintrc b/xalan-c.rpmlintrc new file mode 100644 index 0000000..b0edde4 --- /dev/null +++ b/xalan-c.rpmlintrc @@ -0,0 +1,2 @@ +# These are not real spelling errors... +addFilter(r'spelling-error .* en_US (stylesheet) ')

3 years, 4 months

1
0
0 / 0

Architecture specific change in rpms/libavif.git

by githook-noreply＠fedoraproject.org

The package rpms/libavif.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/libavif.git/commit/?id=fe8676260b.... Change: +%ifarch x86_64 Thanks. Full change: ============ commit 23f101c3a4507a265736f0d8bfb26d5b9baa6ae6 Author: Robert-André Mauchin <zebob.m(a)gmail.com> Date: Wed Dec 9 06:13:00 2020 +0100 Add condition for SVT Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com> (cherry picked from commit 3e1858b096a4d3f4dff1b2f7cfe9ab9a7bced7b1) diff --git a/libavif.spec b/libavif.spec index 7b8c60a..2e9fc94 100644 --- a/libavif.spec +++ b/libavif.spec @@ -25,7 +25,7 @@ BuildRequires: pkgconfig(dav1d) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(rav1e) -BuildRequires: pkgconfig(SvtAv1Enc) +%{?with_svt:BuildRequires: pkgconfig(SvtAv1Enc)} BuildRequires: pkgconfig(zlib) %description commit fe8676260bd4a185c6f13a6bae43597bf1554e2b Author: Robert-André Mauchin <zebob.m(a)gmail.com> Date: Wed Dec 9 06:13:00 2020 +0100 Add condition for SVT Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com> (cherry picked from commit d19e550a1794d18db600e12fab779626720da705) diff --git a/libavif.spec b/libavif.spec index f29d3bf..7b8c60a 100644 --- a/libavif.spec +++ b/libavif.spec @@ -2,6 +2,9 @@ %undefine __cmake_in_source_build %bcond_without aom +%ifarch x86_64 +%bcond_without svt +%endif Name: libavif Version: 0.8.4 @@ -64,7 +67,7 @@ Avif-pixbuf-loader contains a plugin to load AVIF images in GTK+ applications. %cmake %{?with_aom:-DAVIF_CODEC_AOM=1} \ -DAVIF_CODEC_DAV1D=1 \ -DAVIF_CODEC_RAV1E=1 \ - -DAVIF_CODEC_SVT=1 \ + %{?with_svt:-DAVIF_CODEC_SVT=1} \ -DAVIF_BUILD_APPS=1 \ -DAVIF_BUILD_GDK_PIXBUF=1 %cmake_build commit f2902a05e870801a57b3a8d2f53304d434904972 Author: Robert-André Mauchin <zebob.m(a)gmail.com> Date: Wed Dec 9 06:04:45 2020 +0100 Update to version 0.8.4 Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com> (cherry picked from commit 3391bfb0e93c04bae2ba6ffaec0a544bd9540453) diff --git a/.gitignore b/.gitignore index 63d857c..9f4f87d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libavif-0.8.0.tar.gz /libavif-0.8.1.tar.gz /libavif-0.8.2.tar.gz +/libavif-0.8.4.tar.gz diff --git a/libavif.spec b/libavif.spec index d2f277d..f29d3bf 100644 --- a/libavif.spec +++ b/libavif.spec @@ -4,7 +4,7 @@ %bcond_without aom Name: libavif -Version: 0.8.2 +Version: 0.8.4 Release: 1%{?dist} Summary: Library for encoding and decoding .avif files @@ -22,6 +22,7 @@ BuildRequires: pkgconfig(dav1d) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(rav1e) +BuildRequires: pkgconfig(SvtAv1Enc) BuildRequires: pkgconfig(zlib) %description @@ -63,6 +64,7 @@ Avif-pixbuf-loader contains a plugin to load AVIF images in GTK+ applications. %cmake %{?with_aom:-DAVIF_CODEC_AOM=1} \ -DAVIF_CODEC_DAV1D=1 \ -DAVIF_CODEC_RAV1E=1 \ + -DAVIF_CODEC_SVT=1 \ -DAVIF_BUILD_APPS=1 \ -DAVIF_BUILD_GDK_PIXBUF=1 %cmake_build @@ -72,7 +74,7 @@ Avif-pixbuf-loader contains a plugin to load AVIF images in GTK+ applications. %files %license LICENSE -%{_libdir}/libavif.so.* +%{_libdir}/libavif.so.9* %files devel %{_libdir}/libavif.so @@ -89,6 +91,9 @@ Avif-pixbuf-loader contains a plugin to load AVIF images in GTK+ applications. %{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-avif.so %changelog +* Wed Dec 09 05:52:07 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.8.4-1 +- Update to version 0.8.4 + * Mon Oct 19 2020 Andreas Schneider <asn(a)redhat.com> - 0.8.2-1 - Update to version 0.8.2 https://github.com/AOMediaCodec/libavif/blob/master/CHANGELOG.md diff --git a/sources b/sources index 21ae19f..415f5e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libavif-0.8.2.tar.gz) = 51034084b5a508763653e16512298c3ad57c07022327cf42c9e12728ac30e102c69dc43d6569cb39ee4a63cb81a98947b72201373d3a909b3f1b2f6f59aaa433 +SHA512 (libavif-0.8.4.tar.gz) = 92c5df26da70ca113ff3b217a4a09e3dea0b7c4737e0924bd2b232502cfda0c79f4f0785bc7992c973491af7660338cda481bae7b999632815142564bf3275ba

3 years, 4 months

1
0
0 / 0

Architecture specific change in rpms/fence-agents.git

by githook-noreply＠fedoraproject.org

The package rpms/fence-agents.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/fence-agents.git/commit/?id=bbc4c.... Change: +%ifarch x86_64 ppc64le Thanks. Full change: ============ commit bbc4cd83836149aa6c3bb9d3ad3998404df06cbf Author: Oyvind Albrigtsen <oalbrigt(a)redhat.com> Date: Wed Dec 9 13:07:37 2020 +0100 - new upstream release diff --git a/fence-agents.spec b/fence-agents.spec index 31430fb..afb536c 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -8,12 +8,18 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") -Version: 4.5.2 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Version: 4.7.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/fence-agents Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz +%if 0%{?rhel} == 7 +%ifarch s390x +%define rhel7_s390x 1 +%endif +%endif + # skipped: pve, raritan, rcd-serial, virsh %global allfenceagents %(cat <<EOF fence-agents-alom \\ @@ -38,6 +44,7 @@ fence-agents-hds-cb \\ fence-agents-heuristics-ping \\ fence-agents-hpblade \\ fence-agents-ibmblade \\ +fence-agents-ibmz \\ fence-agents-ifmib \\ fence-agents-ilo-moonshot \\ fence-agents-ilo-mp \\ @@ -80,6 +87,15 @@ fence-agents-openstack EOF) %endif +%if ! %{defined rhel7_s390x} +%global allfenceagents %(cat <<EOF +%{allfenceagents} \\ +fence-agents-aws \\ +fence-agents-gce + +EOF) +%endif + # Build dependencies ## general BuildRequires: autoconf automake libtool @@ -87,16 +103,33 @@ BuildRequires: autoconf automake libtool BuildRequires: gcc ## man pages generating BuildRequires: libxslt -## establishing proper paths to particular programs -BuildRequires: gnutls-utils ## Python dependencies +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} BuildRequires: python3-devel BuildRequires: python3-pexpect python3-pycurl python3-requests -BuildRequires: python3-suds openwsman-python3 python3-boto3 -BuildRequires: python3-google-api-client - +BuildRequires: python3-suds +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 +BuildRequires: python3-google-api-client python3-boto3 openwsman-python3 +%endif # (-openstack) +%ifarch x86_64 ppc64le BuildRequires: python3-novaclient python3-keystoneclient +%endif +%if 0%{?suse_version} +BuildRequires: python3-google-api-python-client python3-openwsman python3-boto3 +%endif +%else +BuildRequires: python-devel +BuildRequires: pexpect python-pycurl python-requests +BuildRequires: python-suds openwsman-python +%if ! %{defined rhel7_s390x} +BuildRequires: python-google-api-client python-boto3 +%endif +# (-openstack) +%ifarch x86_64 ppc64le +BuildRequires: python-novaclient python-keystoneclient +%endif +%endif # turn off the brp-python-bytecompile script # (for F28+ or equivalent, the latter is the preferred form) @@ -117,7 +150,9 @@ CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags} %install make install DESTDIR=%{buildroot} # bytecompile Python source code in a non-standard location +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/fence +%endif # XXX unsure if /usr/sbin/fence_* should be compiled as well ## tree fix up @@ -138,7 +173,11 @@ network, storage, or similar. They operate through a unified interface %package common License: GPLv2+ and LGPLv2+ Summary: Common base for Fence Agents +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-pexpect python3-pycurl +%else +Requires: pexpect python-pycurl +%endif BuildArch: noarch %description common A collection of executables to handle isolation ("fencing") of possibly @@ -155,6 +194,7 @@ This package contains support files including the Python fencing library. %exclude %{_datadir}/fence/__pycache__/XenAPI.* %{_datadir}/cluster %exclude %{_datadir}/cluster/fence_scsi_check* +%{_datadir}/pkgconfig/%{name}.pc %exclude %{_sbindir}/* %exclude %{_mandir}/man8/* @@ -175,7 +215,14 @@ This package serves as a catch-all for all supported fence agents. %package alom License: GPLv2+ and LGPLv2+ Summary: Fence agent for SUN ALOM -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description alom @@ -201,7 +248,16 @@ Fence agent for AMT compatibile devices that are accessed via License: ASL 2.0 Summary: Fence agent for Intel AMT (WS-Man) devices Requires: fence-agents-common = %{version}-%{release} +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 Requires: openwsman-python3 +%endif +%if 0%{?suse_version} +Requires: python3-openwsman +%endif +%else +Requires: openwsman-python +%endif BuildArch: noarch %description amt-ws Fence agent for AMT (WS-Man) devices. @@ -212,7 +268,14 @@ Fence agent for AMT (WS-Man) devices. %package apc License: GPLv2+ and LGPLv2+ Summary: Fence agent for APC devices -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description apc @@ -235,38 +298,57 @@ Fence agents for APC devices that are accessed via the SNMP protocol. %{_sbindir}/fence_tripplite_snmp %{_mandir}/man8/fence_tripplite_snmp.8* +%if ! %{defined rhel7_s390x} %package aws License: GPLv2+ and LGPLv2+ Summary: Fence agent for Amazon AWS Requires: fence-agents-common = %{version}-%{release} +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-boto3 +%else +Requires: python-boto3 +%endif BuildArch: noarch -Obsoletes: fence-agents +Obsoletes: fence-agents < 3.1.13 %description aws Fence agent for Amazon AWS instances. %files aws %{_sbindir}/fence_aws %{_mandir}/man8/fence_aws.8* +%endif %package azure-arm License: GPLv2+ and LGPLv2+ Summary: Fence agent for Azure Resource Manager Requires: fence-agents-common = %{version}-%{release} +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-azure-sdk +%else +Requires: python-azure-sdk +%endif BuildArch: noarch -Obsoletes: fence-agents +Obsoletes: fence-agents < 3.1.13 %description azure-arm Fence agent for Azure Resource Manager instances. %files azure-arm %{_sbindir}/fence_azure_arm %{_datadir}/fence/azure_fence.py* +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 %{_datadir}/fence/__pycache__/azure_fence.* +%endif %{_mandir}/man8/fence_azure_arm.8* %package bladecenter License: GPLv2+ and LGPLv2+ Summary: Fence agent for IBM BladeCenter -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description bladecenter @@ -279,7 +361,14 @@ via telnet or SSH. %package brocade License: GPLv2+ and LGPLv2+ Summary: Fence agent for Brocade switches -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description brocade @@ -304,7 +393,11 @@ via the SNMP protocol. %package cisco-ucs License: GPLv2+ and LGPLv2+ Summary: Fence agent for Cisco UCS series +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-pycurl +%else +Requires: python-pycurl +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description cisco-ucs @@ -314,10 +407,17 @@ via the SNMP protocol. %{_sbindir}/fence_cisco_ucs %{_mandir}/man8/fence_cisco_ucs.8* +%ifarch x86_64 ppc64le %package compute License: GPLv2+ and LGPLv2+ Summary: Fence agent for Nova compute nodes +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-requests +Requires: python3-novaclient +%else +Requires: python-requests +Requires: python2-novaclient +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description compute @@ -327,11 +427,16 @@ Fence agent for Nova compute nodes. %{_sbindir}/fence_evacuate %{_mandir}/man8/fence_compute.8* %{_mandir}/man8/fence_evacuate.8* +%endif %package docker License: GPLv2+ and LGPLv2+ Summary: Fence agent for Docker +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-pycurl +%else +Requires: python-pycurl +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description docker @@ -356,7 +461,14 @@ via telnet. %package drac5 License: GPLv2+ and LGPLv2+ Summary: Fence agent for Dell DRAC 5 -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description drac5 @@ -403,18 +515,29 @@ via the HTTP(s) protocol. %{_sbindir}/fence_eps %{_mandir}/man8/fence_eps.8* +%if ! %{defined rhel7_s390x} %package gce License: GPLv2+ and LGPLv2+ Summary: Fence agent for GCE (Google Cloud Engine) Requires: fence-agents-common = %{version}-%{release} +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 Requires: python3-google-api-client +%endif +%if 0%{?suse_version} +Requires: python3-google-api-python-client +%endif +%else +Requires: python-google-api-client +%endif BuildArch: noarch -Obsoletes: fence-agents +Obsoletes: fence-agents < 3.1.13 %description gce Fence agent for GCE (Google Cloud Engine) instances. %files gce %{_sbindir}/fence_gce %{_mandir}/man8/fence_gce.8* +%endif %package hds-cb License: GPLv2+ and LGPLv2+ @@ -433,7 +556,7 @@ License: GPLv2+ and LGPLv2+ Summary: Pseudo fence agent to affect other agents based on ping-heuristics Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch -Obsoletes: fence-agents +Obsoletes: fence-agents < 3.1.13 %description heuristics-ping Fence pseudo agent used to affect other agents based on ping-heuristics. @@ -444,7 +567,14 @@ ping-heuristics. %package hpblade License: GPLv2+ and LGPLv2+ Summary: Fence agent for HP BladeSystem devices -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description hpblade @@ -467,6 +597,23 @@ via the SNMP protocol. %{_sbindir}/fence_ibmblade %{_mandir}/man8/fence_ibmblade.8* +%package ibmz +License: GPLv2+ and LGPLv2+ +Summary: Fence agent for IBM z LPARs +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} +Requires: python3-requests +%else +Requires: python-requests +%endif +Requires: fence-agents-common = %{version}-%{release} +BuildArch: noarch +%description ibmz +Fence agent for IBM z LPARs that are accessed via the HMC +Web Services REST API. +%files ibmz +%{_sbindir}/fence_ibmz +%{_mandir}/man8/fence_ibmz.8* + %package ifmib License: GPLv2+ and LGPLv2+ Summary: Fence agent for devices with IF-MIB interfaces @@ -498,7 +645,14 @@ the HTTP(s) protocol. %package ilo-moonshot License: GPLv2+ and LGPLv2+ Summary: Fence agent for HP iLO Moonshot devices -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description ilo-moonshot @@ -511,7 +665,14 @@ via telnet or SSH. %package ilo-mp License: GPLv2+ and LGPLv2+ Summary: Fence agent for HP iLO MP devices -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description ilo-mp @@ -586,6 +747,7 @@ Fence agents for devices with IPMI interface. %{_sbindir}/fence_imm %{_mandir}/man8/fence_imm.8* +%ifarch x86_64 ppc64le %package ironic License: GPLv2+ and LGPLv2+ Summary: Fence agent for OpenStack's Ironic (Bare Metal as a service) @@ -596,6 +758,7 @@ Fence agent for OpenStack's Ironic (Bare Metal as a service) service. %files ironic %{_sbindir}/fence_ironic %{_mandir}/man8/fence_ironic.8* +%endif %package kdump License: GPLv2+ and LGPLv2+ @@ -613,7 +776,14 @@ Fence agent for use with kdump crash recovery service. %package ldom License: GPLv2+ and LGPLv2+ Summary: Fence agent for Sun LDom virtual machines -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description ldom @@ -625,7 +795,14 @@ Fence agent for APC devices that are accessed via telnet or SSH. %package lpar License: GPLv2+ and LGPLv2+ Summary: Fence agent for IBM LPAR -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description lpar @@ -650,7 +827,14 @@ Device Mapper Multipath. %package netio License: GPLv2+ and LGPLv2+ Summary: Fence agent for Koukaam NETIO devices -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description netio @@ -660,10 +844,15 @@ via telnet or SSH. %{_sbindir}/fence_netio %{_mandir}/man8/fence_netio.8* +%ifarch x86_64 ppc64le %package openstack License: GPLv2+ and LGPLv2+ Summary: Fence agent for OpenStack's Nova service +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-requests +%else +Requires: python-requests +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description openstack @@ -671,11 +860,16 @@ Fence agent for OpenStack's Nova service. %files openstack %{_sbindir}/fence_openstack %{_mandir}/man8/fence_openstack.8* +%endif %package ovh License: GPLv2+ and LGPLv2+ Summary: Fence agent for OVH provider +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-suds +%else +Requires: python-suds +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description ovh @@ -688,7 +882,11 @@ Fence agent for OVH hosting provider. %package pve License: GPLv2+ and LGPLv2+ Summary: Fence agent for PVE +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-pycurl +%else +Requires: python-pycurl +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description pve @@ -726,8 +924,12 @@ License: GPLv2+ and LGPLv2+ Group: System Environment/Base Summary: Fence agent for Redfish Requires: fence-agents-common >= %{version}-%{release} +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-requests -Obsoletes: fence-agents +%else +Requires: python-requests +%endif +Obsoletes: fence-agents < 3.1.13 %description redfish The fence-agents-redfish package contains a fence agent for Redfish %files redfish @@ -749,7 +951,14 @@ Fence agent for RHEV-M via REST API. %package rsa License: GPLv2+ and LGPLv2+ Summary: Fence agent for IBM RSA II -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description rsa @@ -762,7 +971,14 @@ via telnet or SSH. %package rsb License: GPLv2+ and LGPLv2+ Summary: Fence agent for Fujitsu RSB -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description rsb @@ -838,7 +1054,11 @@ Fence agent for virtual machines that are accessed via SSH. %package vmware License: GPLv2+ and LGPLv2+ Summary: Fence agent for VMWare with VI Perl Toolkit or vmrun +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-pexpect +%else +Requires: pexpect +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description vmware @@ -852,7 +1072,7 @@ License: GPLv2+ and LGPLv2+ Summary: Fence agent for VMWare with REST API Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch -Obsoletes: fence-agents +Obsoletes: fence-agents < 3.1.13 %description vmware-rest Fence agent for VMWare with REST API. %files vmware-rest @@ -862,7 +1082,11 @@ Fence agent for VMWare with REST API. %package vmware-soap License: GPLv2+ and LGPLv2+ Summary: Fence agent for VMWare with SOAP API v4.1+ +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-suds +%else +Requires: python-suds +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description vmware-soap @@ -876,7 +1100,7 @@ License: GPLv2+ and LGPLv2+ Summary: Fence agent for VMWare vCloud Director Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch -Obsoletes: fence-agents +Obsoletes: fence-agents < 3.1.13 %description vmware-vcloud Fence agent for VMWare vCloud Director. %files vmware-vcloud @@ -886,7 +1110,14 @@ Fence agent for VMWare vCloud Director. %package wti License: GPLv2+ and LGPLv2+ Summary: Fence agent for WTI Network power switches -Requires: telnet openssh-clients +Requires: openssh-clients +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: telnet +%else +Recommends: telnet +%endif +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description wti @@ -899,7 +1130,11 @@ via telnet or SSH. %package xenapi License: GPLv2+ and LGPLv2+ Summary: Fence agent for Citrix XenServer over XenAPI +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} Requires: python3-pexpect +%else +Requires: pexpect +%endif Requires: fence-agents-common = %{version}-%{release} BuildArch: noarch %description xenapi @@ -907,7 +1142,9 @@ Fence agent for Citrix XenServer accessed over XenAPI. %files xenapi %{_sbindir}/fence_xenapi %{_datadir}/fence/XenAPI.py* +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 %{_datadir}/fence/__pycache__/XenAPI.* +%endif %{_mandir}/man8/fence_xenapi.8* %package zvm @@ -922,6 +1159,9 @@ Fence agent for IBM z/VM over IP. %{_mandir}/man8/fence_zvmip.8* %changelog +* Wed Dec 9 2020 Oyvind Albrigtsen <oalbrigt(a)redhat.com> - 4.7.0-1 +- new upstream release + * Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.5.2-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index d917956..35aecb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fence-agents-4.5.2.tar.gz) = 2496be44e2820a48e76cd8ce2a859fae6e88fad27dfbfbcf82e9c0f5ccbbf75259f3bc76ba0e9309fb8949edea31fd1a8cf8453ed910b40c2eb2e799320ad84b +SHA512 (fence-agents-4.7.0.tar.gz) = f6bd36806c8c89a5aebb9771087f1bdb6436e4a2668527f3492b5f3671705a6b6cfa7f7ab229766bcf10edc019dcf953f808d410a5f098f699f47a6c6b1804da

3 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes December 2020