Hello community,
here is the log from the commit of package libabw for openSUSE:Factory checked
in at 2014-02-28 07:20:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libabw (Old)
and /work/SRC/openSUSE:Factory/.libabw.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libabw"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libabw/libabw.changes 2014-02-11
19:36:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libabw.new/libabw.changes 2014-02-28
07:20:54.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Feb 25 19:52:49 UTC 2014 - tchva...@suse.com
+
+- Version bump to 0.0.2:
+ * various bugfixes
+ * build fixes with various boost versions.
+
+-------------------------------------------------------------------
Old:
----
libabw-0.0.1.tar.xz
New:
----
libabw-0.0.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libabw.spec ++++++
--- /var/tmp/diff_new_pack.3Ybbna/_old 2014-02-28 07:20:54.000000000 +0100
+++ /var/tmp/diff_new_pack.3Ybbna/_new 2014-02-28 07:20:54.000000000 +0100
@@ -18,7 +18,7 @@
%define libname libabw-0_0-0
Name: libabw
-Version: 0.0.1
+Version: 0.0.2
Release: 0
Summary: Library for parsing the Abiword file format structure
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
++++++ libabw-0.0.1.tar.xz -> libabw-0.0.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/CREDITS new/libabw-0.0.2/CREDITS
--- old/libabw-0.0.1/CREDITS 2013-11-29 08:08:10.000000000 +0100
+++ new/libabw-0.0.2/CREDITS 2014-02-10 15:41:38.000000000 +0100
@@ -7,3 +7,4 @@
Contributors
------------
+David Tardon <dtar...@redhat.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/ChangeLog new/libabw-0.0.2/ChangeLog
--- old/libabw-0.0.1/ChangeLog 2014-01-15 09:42:29.000000000 +0100
+++ new/libabw-0.0.2/ChangeLog 2014-02-10 15:49:47.000000000 +0100
@@ -1,3 +1,64 @@
+2014-02-10 David Tardon <dtar...@redhat.com>
[47057a7fdce703813f41223d908237a180b75b57]
+
+ prepare for a new release
+
+ Change-Id: I387df9a26538bf37248cb2f8a1a1c083e9628b1d
+
+2014-02-07 David Tardon <dtar...@redhat.com>
[b4c2bd396d73204a46cf084bc444d254949920ae]
+
+ CID#1165311 missing break
+
+ There is no need to set ret if we are going to return immediately
+ anyway.
+
+ Change-Id: I390a4f67c907d75c554673f976b952e1008c94ae
+ (cherry picked from commit f16e6cf59bdc681d410cd356e4eff89abd98e372)
+
+2014-02-07 David Tardon <dtar...@redhat.com>
[ed285b772d124ef9a900f9fd9f53a9b72fdb34de]
+
+ add myself to contributors
+
+ Change-Id: I8fea4c66e58690ef808b8ae48bcb1e3186deb07d
+ (cherry picked from commit f3723f79a20de230b3159b8d73debb567bb520f4)
+
+2014-01-23 Fridrich Štrba <fridrich.st...@bluewin.ch>
[d6fcd4af658079dd6399559a0603b9c356b61197]
+
+ Ignore cells if not inside the <table></table> tags
+
+ Change-Id: I5dfc2d05a6191f9cbf97d300a9ca1624b40e21e9
+ (cherry picked from commit 1b941a8b1e2aa1909c1f6a0d2c8aeeb04f8ec4b2)
+
+2014-01-21 Fridrich Štrba <fridrich.st...@bluewin.ch>
[1d98978ccd026b4e2372faf3a373682a1a96605b]
+
+ std::string constructor with null string might crash in some cases
+
+ Change-Id: Ie692ffbece7235fe32abf46e84d4f2a29442e96f
+ (cherry picked from commit 393f2b5bb8bbb802526771baf1087725cf920452)
+
+2014-01-17 Fridrich Štrba <fridrich.st...@bluewin.ch>
[095b595a81cc18f3f16960c202079d2e961d1634]
+
+ Put as much as you can into the try block
+
+ Change-Id: Id9c4193228bc7af7da685edb0db07c91f6c8de24
+
+2014-01-17 Fridrich Štrba <fridrich.st...@bluewin.ch>
[e68f8f29ec365cc07edf6f1b1dc15c7f75f40051]
+
+ All invocation of xmlReaderForStream use the same options
+
+ Change-Id: I6f61c92db22114e3592cd5d24516bcd879422566
+
+2014-01-16 Fridrich Štrba <fridrich.st...@bluewin.ch>
[2b21394e42767ece602741538e485c2ec3cb5c85]
+
+ No need to use the stuff from inttypes here
+
+ Change-Id: Ia8087ed0b18c8ed12ec75d272bf8f409038f33b0
+
+2014-01-15 Fridrich Štrba <fridrich.st...@bluewin.ch>
[54c72c4e27dc26bb74473f2fccaa5dcf9dba01d7]
+
+ Strip first tab in a list text
+
+ Change-Id: I46a4d0f36b2d255a30c669f24dabe65852c35d61
+
2014-01-15 Fridrich Štrba <fridrich.st...@bluewin.ch>
[b0a20439bd67fae0fb1aeb71909e7c48f4ab6979]
Bump version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/NEWS new/libabw-0.0.2/NEWS
--- old/libabw-0.0.1/NEWS 2014-01-15 09:41:21.000000000 +0100
+++ new/libabw-0.0.2/NEWS 2014-02-10 15:46:47.000000000 +0100
@@ -8,3 +8,8 @@
- Fix silly with paragraphs after foot-/endnote
- Fix conversion of embedded images
- Fix shapes of lists.
+
+0.0.1 -> 0.0.2
+ - Do not add extra tab for list indentation
+ - Avoid possible crash on file format detection
+ - Ignore cells that are not inside a table
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/config.guess
new/libabw-0.0.2/config.guess
--- old/libabw-0.0.1/config.guess 2014-01-14 17:01:58.000000000 +0100
+++ new/libabw-0.0.2/config.guess 2014-02-10 15:41:56.000000000 +0100
@@ -1,8 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2013-06-10'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,7 +26,7 @@
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
#
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
@@ -50,7 +52,9 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,37 +136,6 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
- # If the system lacks a compiler, then just pick glibc.
- # We could probably try harder.
- LIBC=gnu
-
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
- #include <features.h>
- #if defined(__UCLIBC__)
- LIBC=uclibc
- #elif defined(__dietlibc__)
- LIBC=dietlibc
- #else
- LIBC=gnu
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- ;;
-esac
-
-case "${UNAME_MACHINE}" in
- i?86)
- test -z "$VENDOR" && VENDOR=pc
- ;;
- *)
- test -z "$VENDOR" && VENDOR=unknown
- ;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -227,23 +200,23 @@
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
exit ;;
*:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
@@ -311,13 +284,13 @@
echo alpha-dec-winnt3.5
exit ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-${VENDOR}-sysv4
+ echo m68k-unknown-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-amigaos
+ echo ${UNAME_MACHINE}-unknown-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-morphos
+ echo ${UNAME_MACHINE}-unknown-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -332,7 +305,7 @@
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-${VENDOR}-riscos
+ echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
@@ -440,7 +413,7 @@
echo m68k-hades-mint${UNAME_RELEASE}
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-${VENDOR}-mint${UNAME_RELEASE}
+ echo m68k-unknown-mint${UNAME_RELEASE}
exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
@@ -751,9 +724,9 @@
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
+ echo ${UNAME_MACHINE}-unknown-osf1mk
else
- echo ${UNAME_MACHINE}-${VENDOR}-osf1
+ echo ${UNAME_MACHINE}-unknown-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -813,18 +786,18 @@
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
case ${UNAME_PROCESSOR} in
amd64)
- echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
*)
- echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo
${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo
${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -852,10 +825,10 @@
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
+ echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
- echo ia64-${VENDOR}-interix${UNAME_RELEASE}
+ echo ia64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -874,31 +847,31 @@
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-${VENDOR}-cygwin
+ echo x86_64-unknown-cygwin
exit ;;
p*:CYGWIN*:*)
- echo powerpcle-${VENDOR}-cygwin
+ echo powerpcle-unknown-cygwin
exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e
's/[^.]*//'`
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e
's/[^.]*//'`
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e
's,[-/].*$,,'`-${VENDOR}-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed
's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,'
| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -911,54 +884,59 @@
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
- exit ;;
- arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabi
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
else
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -977,63 +955,54 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
- exit ;;
or32:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
- echo sparc-${VENDOR}-linux-${LIBC}
+ echo sparc-unknown-linux-gnu
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-${VENDOR}-linux-${LIBC}
+ echo hppa64-unknown-linux-gnu
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-${VENDOR}-linux-${LIBC} ;;
- PA8*) echo hppa2.0-${VENDOR}-linux-${LIBC} ;;
- *) echo hppa-${VENDOR}-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-${VENDOR}-linux-${LIBC}
+ echo powerpc64-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
- echo powerpc-${VENDOR}-linux-${LIBC}
- exit ;;
- ppc64le:Linux:*:*)
- echo powerpc64le-${VENDOR}-linux-${LIBC}
- exit ;;
- ppcle:Linux:*:*)
- echo powerpcle-${VENDOR}-linux-${LIBC}
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1055,16 +1024,16 @@
echo ${UNAME_MACHINE}-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-${VENDOR}-stop
+ echo ${UNAME_MACHINE}-unknown-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-atheos
+ echo ${UNAME_MACHINE}-unknown-atheos
exit ;;
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-${VENODR}-lynxos${UNAME_RELEASE}
+ echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
@@ -1084,7 +1053,7 @@
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo
${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo
${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
@@ -1123,7 +1092,7 @@
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-${VENODR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1160,19 +1129,19 @@
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
@@ -1222,7 +1191,7 @@
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-${VENDOR}-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1238,7 +1207,7 @@
echo i586-pc-haiku
exit ;;
x86_64:Haiku:*:*)
- echo x86_64-${VENDOR}-haiku
+ echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
@@ -1266,21 +1235,19 @@
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
- if test "$UNAME_PROCESSOR" = unknown ; then
- UNAME_PROCESSOR=powerpc
- fi
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
- fi
- fi
+ case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo
'#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1321,13 +1288,13 @@
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-${VENDOR}-plan9
+ echo ${UNAME_MACHINE}-unknown-plan9
exit ;;
*:TOPS-10:*:*)
- echo pdp10-${VENDOR}-tops10
+ echo pdp10-unknown-tops10
exit ;;
*:TENEX:*:*)
- echo pdp10-${VENDOR}-tenex
+ echo pdp10-unknown-tenex
exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
@@ -1336,16 +1303,16 @@
echo pdp10-xkl-tops20
exit ;;
*:TOPS-20:*:*)
- echo pdp10-${VENDOR}-tops20
+ echo pdp10-unknown-tops20
exit ;;
*:ITS:*:*)
- echo pdp10-${VENDOR}-its
+ echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1367,7 +1334,7 @@
echo ${UNAME_MACHINE}-pc-aros
exit ;;
x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-esx
+ echo ${UNAME_MACHINE}-unknown-esx
exit ;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/config.sub new/libabw-0.0.2/config.sub
--- old/libabw-0.0.1/config.sub 2014-01-14 17:01:58.000000000 +0100
+++ new/libabw-0.0.2/config.sub 2014-02-10 15:41:56.000000000 +0100
@@ -1,8 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2013-04-24'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -68,7 +70,9 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -252,7 +256,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
| am33_2.0 \
- | arc | arceb \
+ | arc \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
@@ -286,17 +290,16 @@
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
- | nios | nios2 | nios2eb | nios2el \
+ | nios | nios2 \
| ns16k | ns32k \
| open8 \
- | or1k | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -366,7 +369,7 @@
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
@@ -404,13 +407,12 @@
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* | nios2eb-* | nios2el-* \
+ | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| orion-* \
@@ -1006,7 +1008,7 @@
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed
's/^[^-]*-//'`
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed
's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
@@ -1352,7 +1354,7 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos |
-sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* |
-solaris* \
- | -sym* | -kopensolaris* | -plan9* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1498,6 +1500,9 @@
-aros*)
os=-aros
;;
+ -kaos*)
+ os=-kaos
+ ;;
-zvmoe)
os=-zvmoe
;;
@@ -1589,9 +1594,6 @@
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/configure new/libabw-0.0.2/configure
--- old/libabw-0.0.1/configure 2014-01-15 09:41:42.000000000 +0100
+++ new/libabw-0.0.2/configure 2014-02-10 15:49:16.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libabw 0.0.1.
+# Generated by GNU Autoconf 2.69 for libabw 0.0.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='libabw'
PACKAGE_TARNAME='libabw'
-PACKAGE_VERSION='0.0.1'
-PACKAGE_STRING='libabw 0.0.1'
+PACKAGE_VERSION='0.0.2'
+PACKAGE_STRING='libabw 0.0.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1372,7 +1372,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libabw 0.0.1 to adapt to many kinds of systems.
+\`configure' configures libabw 0.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1442,7 +1442,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libabw 0.0.1:";;
+ short | recursive ) echo "Configuration of libabw 0.0.2:";;
esac
cat <<\_ACEOF
@@ -1574,7 +1574,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libabw configure 0.0.1
+libabw configure 0.0.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2091,7 +2091,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libabw $as_me 0.0.1, which was
+It was created by libabw $as_me 0.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2957,7 +2957,7 @@
# Define the identity of the package.
PACKAGE='libabw'
- VERSION='0.0.1'
+ VERSION='0.0.2'
cat >>confdefs.h <<_ACEOF
@@ -7541,7 +7541,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7559,7 +7559,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -7578,7 +7581,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -11897,10 +11903,14 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s
2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' <
/etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/
/g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15728,10 +15738,14 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s
2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' <
/etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/
/g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -16079,9 +16093,9 @@
ABW_MINOR_VERSION=0
-ABW_MICRO_VERSION=1
+ABW_MICRO_VERSION=2
-ABW_VERSION=0.0.1
+ABW_VERSION=0.0.2
# AC_SUBST(LT_RELEASE, [libabw_version_major.libabw_version_minor])
LT_CURRENT=`expr 100 '*' 0 + 0`
@@ -16089,7 +16103,7 @@
LT_AGE=0
# LT_AGE=libabw_version_minor
-LT_REVISION=1
+LT_REVISION=2
@@ -17787,7 +17801,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libabw $as_me 0.0.1, which was
+This file was extended by libabw $as_me 0.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17853,7 +17867,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libabw config.status 0.0.1
+libabw config.status 0.0.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/configure.ac
new/libabw-0.0.2/configure.ac
--- old/libabw-0.0.1/configure.ac 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/configure.ac 2014-02-10 15:47:05.000000000 +0100
@@ -7,7 +7,7 @@
# ====================
m4_define([libabw_version_major],[0])
m4_define([libabw_version_minor],[0])
-m4_define([libabw_version_micro],[1])
+m4_define([libabw_version_micro],[2])
m4_define([libabw_version],[libabw_version_major.libabw_version_minor.libabw_version_micro])
# =============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/m4/libtool.m4
new/libabw-0.0.2/m4/libtool.m4
--- old/libabw-0.0.1/m4/libtool.m4 2014-01-14 17:01:55.000000000 +0100
+++ new/libabw-0.0.2/m4/libtool.m4 2014-02-10 15:41:46.000000000 +0100
@@ -1312,7 +1312,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1345,7 +1348,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -2669,10 +2675,14 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s
2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' <
/etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/
/g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWCollector.h
new/libabw-0.0.2/src/lib/ABWCollector.h
--- old/libabw-0.0.1/src/lib/ABWCollector.h 2014-01-15 09:41:35.000000000
+0100
+++ new/libabw-0.0.2/src/lib/ABWCollector.h 2014-02-10 15:41:38.000000000
+0100
@@ -128,7 +128,7 @@
virtual void insertLineBreak() = 0;
virtual void insertColumnBreak() = 0;
virtual void insertPageBreak() = 0;
- virtual void insertText(const WPXString &text) = 0;
+ virtual void insertText(const char *text) = 0;
virtual void insertImage(const char *dataid, const char *props) = 0;
virtual void collectList(const char *id, const char *listDecimal, const char
*listDelim,
const char *parentid, const char *startValue, const
char *type) = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWContentCollector.cpp
new/libabw-0.0.2/src/lib/ABWContentCollector.cpp
--- old/libabw-0.0.1/src/lib/ABWContentCollector.cpp 2014-01-15
09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWContentCollector.cpp 2014-02-10
15:41:38.000000000 +0100
@@ -319,6 +319,7 @@
m_isNote(false),
m_currentListLevel(0),
m_currentListId(0),
+ m_isFirstTextInListElement(false),
m_tableStates(),
m_listLevels()
@@ -365,6 +366,7 @@
m_isNote(ps.m_isNote),
m_currentListLevel(ps.m_currentListLevel),
m_currentListId(ps.m_currentListId),
+ m_isFirstTextInListElement(ps.m_isFirstTextInListElement),
m_tableStates(ps.m_tableStates),
m_listLevels(ps.m_listLevels)
@@ -641,7 +643,7 @@
if (!type)
m_ps->m_currentHeaderFooterId = -1;
- std::string sType(type);
+ std::string sType(type ? type : "");
boost::trim(sType);
std::vector<std::string> strVec;
boost::algorithm::split(strVec, sType, boost::is_any_of("-"),
boost::token_compress_on);
@@ -809,14 +811,19 @@
m_ps->m_deferredPageBreak = true;
}
-void libabw::ABWContentCollector::insertText(const WPXString &text)
+void libabw::ABWContentCollector::insertText(const char *text)
{
if (!m_ps->m_inParagraphOrListElement)
return;
if (!m_ps->m_isSpanOpened)
_openSpan();
-
- separateSpacesAndInsertText(m_outputElements, text);
+ if (!text)
+ return;
+ if (m_ps->m_isFirstTextInListElement && text[0] == '\t')
+ separateSpacesAndInsertText(m_outputElements, text+1);
+ else
+ separateSpacesAndInsertText(m_outputElements, text);
+ m_ps->m_isFirstTextInListElement = false;
}
void libabw::ABWContentCollector::_openPageSpan()
@@ -1081,6 +1088,7 @@
m_ps->m_isListElementOpened = true;
if (!m_ps->m_tableStates.empty())
m_ps->m_tableStates.top().m_isCellWithoutParagraph = false;
+ m_ps->m_isFirstTextInListElement = true;
}
}
@@ -1484,26 +1492,32 @@
void libabw::ABWContentCollector::openCell(const char *props)
{
- if (props)
- parsePropString(props, m_ps->m_tableStates.top().m_currentCellProperties);
- int currentRow(0);
- if (!findInt(_findCellProperty("top-attach"), currentRow))
- currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
- while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
+ if (!m_ps->m_tableStates.empty())
{
- if (m_ps->m_tableStates.top().m_currentTableRow >= 0)
- _closeTableRow();
- _openTableRow();
- }
+ if (props)
+ parsePropString(props,
m_ps->m_tableStates.top().m_currentCellProperties);
+ int currentRow(0);
+ if (!findInt(_findCellProperty("top-attach"), currentRow))
+ currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
+ while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
+ {
+ if (m_ps->m_tableStates.top().m_currentTableRow >= 0)
+ _closeTableRow();
+ _openTableRow();
+ }
- if (!findInt(_findCellProperty("left-attach"),
m_ps->m_tableStates.top().m_currentTableCol))
- m_ps->m_tableStates.top().m_currentTableCol++;
+ if (!findInt(_findCellProperty("left-attach"),
m_ps->m_tableStates.top().m_currentTableCol))
+ m_ps->m_tableStates.top().m_currentTableCol++;
+ }
}
void libabw::ABWContentCollector::closeCell()
{
- _closeTableCell();
- m_ps->m_tableStates.top().m_currentCellProperties.clear();
+ if (!m_ps->m_tableStates.empty())
+ {
+ _closeTableCell();
+ m_ps->m_tableStates.top().m_currentCellProperties.clear();
+ }
}
void libabw::ABWContentCollector::collectData(const char *, const char *,
const WPXBinaryData &)
@@ -1625,6 +1639,7 @@
m_outputElements.addCloseListElement();
}
m_ps->m_isListElementOpened = false;
+ m_ps->m_isFirstTextInListElement = false;
}
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWContentCollector.h
new/libabw-0.0.2/src/lib/ABWContentCollector.h
--- old/libabw-0.0.1/src/lib/ABWContentCollector.h 2014-01-15
09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWContentCollector.h 2014-02-10
15:41:38.000000000 +0100
@@ -102,6 +102,7 @@
int m_currentListLevel;
int m_currentListId;
+ bool m_isFirstTextInListElement;
std::stack<ABWContentTableState> m_tableStates;
std::stack<std::pair<int, ABWListElement *> > m_listLevels;
@@ -138,7 +139,7 @@
void insertLineBreak();
void insertColumnBreak();
void insertPageBreak();
- void insertText(const WPXString &text);
+ void insertText(const char *text);
void insertImage(const char *dataid, const char *props);
void collectList(const char *, const char *, const char *, const char *,
const char *, const char *) {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWParser.cpp
new/libabw-0.0.2/src/lib/ABWParser.cpp
--- old/libabw-0.0.1/src/lib/ABWParser.cpp 2014-01-15 09:41:35.000000000
+0100
+++ new/libabw-0.0.2/src/lib/ABWParser.cpp 2014-02-10 15:41:38.000000000
+0100
@@ -143,7 +143,7 @@
if (!input)
return false;
- xmlTextReaderPtr reader = xmlReaderForStream(input, 0, 0,
XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER);
+ xmlTextReaderPtr reader = xmlReaderForStream(input);
if (!reader)
return false;
int ret = xmlTextReaderRead(reader);
@@ -171,8 +171,8 @@
int emptyToken = xmlTextReaderIsEmptyElement(reader);
if (XML_READER_TYPE_TEXT == tokenType)
{
- WPXString text((const char *)xmlTextReaderConstValue(reader));
- ABW_DEBUG_MSG(("ABWParser::processXmlNode: text %s\n", text.cstr()));
+ const char *text = (const char *)xmlTextReaderConstValue(reader);
+ ABW_DEBUG_MSG(("ABWParser::processXmlNode: text %s\n", text));
m_collector->insertText(text);
}
switch (tokenId)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWStylesCollector.cpp
new/libabw-0.0.2/src/lib/ABWStylesCollector.cpp
--- old/libabw-0.0.1/src/lib/ABWStylesCollector.cpp 2014-01-15
09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWStylesCollector.cpp 2014-02-10
15:41:38.000000000 +0100
@@ -49,10 +49,10 @@
NOT_A_LIST = 0xff
};
-static int abw_unichar_to_utf8(uint32_t c, char *outbuf)
+static int abw_unichar_to_utf8(unsigned c, char *outbuf)
{
- uint8_t len = 1;
- uint8_t first = 0;
+ unsigned char len = 1;
+ unsigned char first = 0;
if (c < 0x80)
{
@@ -87,7 +87,7 @@
if (outbuf)
{
- for (uint8_t i = (uint8_t)(len - 1); i > 0; --i)
+ for (unsigned char i = (unsigned char)(len - 1); i > 0; --i)
{
outbuf[i] = (char)((c & 0x3f) | 0x80);
c >>= 6;
@@ -98,7 +98,7 @@
return len;
}
-static void appendUCS4(WPXString &str, uint32_t ucs4)
+static void appendUCS4(WPXString &str, unsigned ucs4)
{
int charLength = abw_unichar_to_utf8(ucs4, 0);
char *utf8 = new char[charLength+1];
@@ -167,28 +167,32 @@
void libabw::ABWStylesCollector::openCell(const char *props)
{
- if (props)
- parsePropString(props, m_ps->m_tableStates.top().m_currentCellProperties);
- int currentRow(0);
- if (!findInt(_findCellProperty("top-attach"), currentRow))
- currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
- while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
- m_ps->m_tableStates.top().m_currentTableRow++;
-
- if (!m_ps->m_tableStates.empty() && 0 ==
m_ps->m_tableStates.top().m_currentTableRow)
- {
- int leftAttach(0);
- int rightAttach(0);
- if (findInt(_findCellProperty("left-attach"), leftAttach) &&
findInt(_findCellProperty("right-attach"), rightAttach))
- m_ps->m_tableStates.top().m_currentTableWidth += rightAttach -
leftAttach;
- else
- m_ps->m_tableStates.top().m_currentTableWidth++;
+ if (!m_ps->m_tableStates.empty())
+ {
+ if (props)
+ parsePropString(props,
m_ps->m_tableStates.top().m_currentCellProperties);
+ int currentRow(0);
+ if (!findInt(_findCellProperty("top-attach"), currentRow))
+ currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
+ while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
+ m_ps->m_tableStates.top().m_currentTableRow++;
+
+ if (0 == m_ps->m_tableStates.top().m_currentTableRow)
+ {
+ int leftAttach(0);
+ int rightAttach(0);
+ if (findInt(_findCellProperty("left-attach"), leftAttach) &&
findInt(_findCellProperty("right-attach"), rightAttach))
+ m_ps->m_tableStates.top().m_currentTableWidth += rightAttach -
leftAttach;
+ else
+ m_ps->m_tableStates.top().m_currentTableWidth++;
+ }
}
}
void libabw::ABWStylesCollector::closeCell()
{
- m_ps->m_tableStates.top().m_currentCellProperties.clear();
+ if (!m_ps->m_tableStates.empty())
+ m_ps->m_tableStates.top().m_currentCellProperties.clear();
}
std::string libabw::ABWStylesCollector::_findCellProperty(const char *name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWStylesCollector.h
new/libabw-0.0.2/src/lib/ABWStylesCollector.h
--- old/libabw-0.0.1/src/lib/ABWStylesCollector.h 2014-01-15
09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWStylesCollector.h 2014-02-10
15:41:38.000000000 +0100
@@ -71,7 +71,7 @@
void insertLineBreak() {}
void insertColumnBreak() {}
void insertPageBreak() {}
- void insertText(const WPXString &) {}
+ void insertText(const char *) {}
void insertImage(const char *, const char *) {}
void collectData(const char *name, const char *mimeType, const WPXBinaryData
&data);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWXMLHelper.cpp
new/libabw-0.0.2/src/lib/ABWXMLHelper.cpp
--- old/libabw-0.0.1/src/lib/ABWXMLHelper.cpp 2014-01-15 09:41:35.000000000
+0100
+++ new/libabw-0.0.2/src/lib/ABWXMLHelper.cpp 2014-02-10 15:41:38.000000000
+0100
@@ -73,9 +73,10 @@
// xmlTextReader helper function
-xmlTextReaderPtr libabw::xmlReaderForStream(WPXInputStream *input, const char
*URL, const char *encoding, int options)
+xmlTextReaderPtr libabw::xmlReaderForStream(WPXInputStream *input)
{
- xmlTextReaderPtr reader = xmlReaderForIO(abwxmlInputReadFunc,
abwxmlInputCloseFunc, (void *)input, URL, encoding, options);
+ xmlTextReaderPtr reader = xmlReaderForIO(abwxmlInputReadFunc,
abwxmlInputCloseFunc, (void *)input, 0, 0,
+
XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER);
xmlTextReaderSetErrorHandler(reader, abwxmlReaderErrorFunc, 0);
return reader;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWXMLHelper.h
new/libabw-0.0.2/src/lib/ABWXMLHelper.h
--- old/libabw-0.0.1/src/lib/ABWXMLHelper.h 2014-01-15 09:41:35.000000000
+0100
+++ new/libabw-0.0.2/src/lib/ABWXMLHelper.h 2014-02-10 15:41:38.000000000
+0100
@@ -19,10 +19,7 @@
// create an xmlTextReader pointer from a WPXInputStream pointer
// needs to be freed using xmlTextReaderFree function.
-xmlTextReaderPtr xmlReaderForStream(WPXInputStream *input,
- const char *URL,
- const char *encoding,
- int options);
+xmlTextReaderPtr xmlReaderForStream(WPXInputStream *input);
} // namespace libabw
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWZlibStream.cpp
new/libabw-0.0.2/src/lib/ABWZlibStream.cpp
--- old/libabw-0.0.1/src/lib/ABWZlibStream.cpp 2014-01-15 09:41:35.000000000
+0100
+++ new/libabw-0.0.2/src/lib/ABWZlibStream.cpp 2014-02-10 15:41:38.000000000
+0100
@@ -54,7 +54,6 @@
switch (ret)
{
case Z_NEED_DICT:
- ret = Z_DATA_ERROR;
case Z_DATA_ERROR:
case Z_MEM_ERROR:
case Z_STREAM_ERROR:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/AbiDocument.cpp
new/libabw-0.0.2/src/lib/AbiDocument.cpp
--- old/libabw-0.0.1/src/lib/AbiDocument.cpp 2014-01-15 09:41:35.000000000
+0100
+++ new/libabw-0.0.2/src/lib/AbiDocument.cpp 2014-02-10 15:41:38.000000000
+0100
@@ -39,13 +39,13 @@
ABW_DEBUG_MSG(("AbiDocument::isFileFormatSupported\n"));
if (!input)
return false;
- input->seek(0, WPX_SEEK_SET);
- libabw::ABWZlibStream stream(input);
xmlTextReaderPtr reader = 0;
try
{
+ input->seek(0, WPX_SEEK_SET);
+ libabw::ABWZlibStream stream(input);
stream.seek(0, WPX_SEEK_SET);
- reader = libabw::xmlReaderForStream(&stream, 0, 0,
XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER);
+ reader = libabw::xmlReaderForStream(&stream);
if (!reader)
return false;
int ret = xmlTextReaderRead(reader);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libabw-0.0.1/src/lib/tokenhash.h
new/libabw-0.0.2/src/lib/tokenhash.h
--- old/libabw-0.0.1/src/lib/tokenhash.h 2014-01-14 17:09:34.000000000
+0100
+++ new/libabw-0.0.2/src/lib/tokenhash.h 2014-02-10 15:49:43.000000000
+0100
@@ -46,143 +46,143 @@
class Perfect_Hash
{
private:
- static inline unsigned int hash(const char *str, unsigned int len);
+ static inline unsigned int hash (const char *str, unsigned int len);
public:
- static const struct xmltoken *in_word_set(const char *str, unsigned int len);
+ static const struct xmltoken *in_word_set (const char *str, unsigned int
len);
};
inline unsigned int
-Perfect_Hash::hash(register const char *str, register unsigned int len)
+Perfect_Hash::hash (register const char *str, register unsigned int len)
{
static const unsigned char asso_values[] =
- {
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 1, 0, 14,
- 27, 3, 5, 21, 23, 0, 34, 34, 26, 8,
- 19, 17, 2, 34, 2, 6, 12, 34, 12, 18,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34
- };
+ {
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 1, 0, 14,
+ 27, 3, 5, 21, 23, 0, 34, 34, 26, 8,
+ 19, 17, 2, 34, 2, 6, 12, 34, 12, 18,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34
+ };
register int hval = len;
switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[1]];
- /*FALLTHROUGH*/
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
+ {
+ default:
+ hval += asso_values[(unsigned char)str[1]];
+ /*FALLTHROUGH*/
+ case 1:
+ hval += asso_values[(unsigned char)str[0]];
+ break;
+ }
return hval;
}
static const struct xmltoken wordlist[] =
-{
- {(char *)0, 0},
+ {
+ {(char*)0, 0},
#line 27 "../../src/lib/tokens.gperf"
- {"i",XML_I},
+ {"i",XML_I},
#line 11 "../../src/lib/tokens.gperf"
- {"a",XML_A},
+ {"a",XML_A},
#line 35 "../../src/lib/tokens.gperf"
- {"p",XML_P},
+ {"p",XML_P},
#line 15 "../../src/lib/tokens.gperf"
- {"br",XML_BR},
+ {"br",XML_BR},
#line 37 "../../src/lib/tokens.gperf"
- {"pbr",XML_PBR},
+ {"pbr",XML_PBR},
#line 22 "../../src/lib/tokens.gperf"
- {"f",XML_F},
+ {"f",XML_F},
#line 39 "../../src/lib/tokens.gperf"
- {"s",XML_S},
+ {"s",XML_S},
#line 12 "../../src/lib/tokens.gperf"
- {"abiword",XML_ABIWORD},
+ {"abiword",XML_ABIWORD},
#line 33 "../../src/lib/tokens.gperf"
- {"m",XML_M},
+ {"m",XML_M},
#line 23 "../../src/lib/tokens.gperf"
- {"field",XML_FIELD},
+ {"field",XML_FIELD},
#line 36 "../../src/lib/tokens.gperf"
- {"pagesize",XML_PAGESIZE},
+ {"pagesize",XML_PAGESIZE},
#line 25 "../../src/lib/tokens.gperf"
- {"frame",XML_FRAME},
+ {"frame",XML_FRAME},
#line 29 "../../src/lib/tokens.gperf"
- {"image",XML_IMAGE},
+ {"image",XML_IMAGE},
#line 38 "../../src/lib/tokens.gperf"
- {"revisions",XML_REVISIONS},
+ {"revisions",XML_REVISIONS},
#line 16 "../../src/lib/tokens.gperf"
- {"c",XML_C},
+ {"c",XML_C},
#line 40 "../../src/lib/tokens.gperf"
- {"section",XML_SECTION},
+ {"section",XML_SECTION},
#line 17 "../../src/lib/tokens.gperf"
- {"cbr",XML_CBR},
+ {"cbr",XML_CBR},
#line 42 "../../src/lib/tokens.gperf"
- {"table",XML_TABLE},
+ {"table",XML_TABLE},
#line 34 "../../src/lib/tokens.gperf"
- {"metadata",XML_METADATA},
+ {"metadata",XML_METADATA},
#line 30 "../../src/lib/tokens.gperf"
- {"iw",XML_IW},
+ {"iw",XML_IW},
#line 18 "../../src/lib/tokens.gperf"
- {"cell",XML_CELL},
+ {"cell",XML_CELL},
#line 43 "../../src/lib/tokens.gperf"
- {"version",XML_VERSION},
+ {"version",XML_VERSION},
#line 13 "../../src/lib/tokens.gperf"
- {"awml",XML_AWML},
+ {"awml",XML_AWML},
#line 41 "../../src/lib/tokens.gperf"
- {"styles",XML_STYLES},
+ {"styles",XML_STYLES},
#line 14 "../../src/lib/tokens.gperf"
- {"bookmark",XML_BOOKMARK},
+ {"bookmark",XML_BOOKMARK},
#line 24 "../../src/lib/tokens.gperf"
- {"foot",XML_FOOT},
+ {"foot",XML_FOOT},
#line 31 "../../src/lib/tokens.gperf"
- {"l",XML_L},
+ {"l",XML_L},
#line 19 "../../src/lib/tokens.gperf"
- {"d",XML_D},
+ {"d",XML_D},
#line 21 "../../src/lib/tokens.gperf"
- {"endnote",XML_ENDNOTE},
+ {"endnote",XML_ENDNOTE},
#line 26 "../../src/lib/tokens.gperf"
- {"history",XML_HISTORY},
+ {"history",XML_HISTORY},
#line 32 "../../src/lib/tokens.gperf"
- {"lists",XML_LISTS},
+ {"lists",XML_LISTS},
#line 20 "../../src/lib/tokens.gperf"
- {"data",XML_DATA},
+ {"data",XML_DATA},
#line 28 "../../src/lib/tokens.gperf"
- {"ignoredwords",XML_IGNOREDWORDS}
-};
+ {"ignoredwords",XML_IGNOREDWORDS}
+ };
const struct xmltoken *
-Perfect_Hash::in_word_set(register const char *str, register unsigned int len)
+Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
{
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash(str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
{
- register const char *s = wordlist[key].name;
+ register int key = hash (str, len);
- if (s && *str == *s && !strncmp(str + 1, s + 1, len - 1) && s[len] ==
'\0')
- return &wordlist[key];
+ if (key <= MAX_HASH_VALUE && key >= 0)
+ {
+ register const char *s = wordlist[key].name;
+
+ if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len]
== '\0')
+ return &wordlist[key];
+ }
}
- }
return 0;
}
#line 44 "../../src/lib/tokens.gperf"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
