Hello community,
here is the log from the commit of package xorg-x11-libfontenc
checked in at Mon Oct 16 19:13:12 CEST 2006.
--------
--- xorg-x11-libfontenc/xorg-x11-libfontenc.changes 2006-08-15 18:46:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libfontenc/xorg-x11-libfontenc.changes 2006-10-14 06:20:23.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Oct 14 06:20:16 CEST 2006 - sndirsch@suse.de
+
+- updated to X.Org 7.2RC1
+
+-------------------------------------------------------------------
Old:
----
libfontenc-X11R7.1-1.0.2.tar.bz2
New:
----
libfontenc-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libfontenc.spec ++++++
--- /var/tmp/diff_new_pack.zxXtwg/_old 2006-10-16 19:13:08.000000000 +0200
+++ /var/tmp/diff_new_pack.zxXtwg/_new 2006-10-16 19:13:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11-libfontenc (Version 7.1)
+# spec file for package xorg-x11-libfontenc (Version 7.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,11 +11,11 @@
# norootforbuild
Name: xorg-x11-libfontenc
-%define dirsuffix X11R7.1-1.0.2
+%define dirsuffix 1.0.3
BuildRequires: pkgconfig xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
-Version: 7.1
-Release: 6
+Version: 7.2
+Release: 1
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -77,6 +77,8 @@
/usr/%{_lib}/pkgconfig/*.pc
%changelog -n xorg-x11-libfontenc
+* Sat Oct 14 2006 - sndirsch@suse.de
+- updated to X.Org 7.2RC1
* Tue Aug 15 2006 - sndirsch@suse.de
- fixed encodings dir
* Wed Aug 02 2006 - sndirsch@suse.de
++++++ libfontenc-X11R7.1-1.0.2.tar.bz2 -> libfontenc-1.0.3.tar.bz2 ++++++
++++ 2587 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-X11R7.1-1.0.2/COPYING new/libfontenc-1.0.3/COPYING
--- old/libfontenc-X11R7.1-1.0.2/COPYING 2005-12-19 17:28:28.000000000 +0100
+++ new/libfontenc-1.0.3/COPYING 2006-10-12 00:32:24.000000000 +0200
@@ -1,12 +1,19 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1998-2001 by Juliusz Chroboczek
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-X11R7.1-1.0.2/ChangeLog new/libfontenc-1.0.3/ChangeLog
--- old/libfontenc-X11R7.1-1.0.2/ChangeLog 2006-04-27 01:55:31.000000000 +0200
+++ new/libfontenc-1.0.3/ChangeLog 2006-10-13 21:18:06.000000000 +0200
@@ -1,68 +1,293 @@
-2006-04-26 Adam Jackson
+commit fc19e19275c213f5122b120e7b45f63c302916a1
+Author: Adam Jackson
+Date: Thu Oct 12 18:35:04 2006 -0400
- * configure.ac:
- Bump to 1.0.2
+ Fix ChangeLog hook to distcheck.
-2006-04-10 Alan Coopersmith
+commit 2de626b53827fa1365c149c3fd2e1e280f8691e2
+Author: Alan Coopersmith
+Date: Wed Oct 4 19:31:23 2006 -0700
- * src/encparse.c (FontEncReallyReallyLoad):
- Fix another file descriptor leak (related to previous Coverity #544)
+ Mark character mapping data tables as const
-2006-04-06 Adam Jackson
+commit 2daccee698507b27113e89b07af371905aa2bcd4
+Author: Alan Coopersmith
+Date: Wed Oct 4 19:13:17 2006 -0700
- * src/encparse.c:
- Coverity #544: File a file descriptor leak.
+ Clear sparse warnings: Using plain integer as NULL pointer
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b00dcc90e490454fdd983b4bf6d0fa92ab91d0be
+Author: Alan Coopersmith
+Date: Wed Oct 4 18:50:44 2006 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ Add XORG_WITH_LINT support for checking source code with lint/sparse/etc.
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5d18f978c9085c3c9d9a44c90e73055125e11a68
+Author: Alan Coopersmith
+Date: Wed Oct 4 18:50:07 2006 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Clear sparse warning: non-ANSI function declaration of function 'FontEncDirectory'
-2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 1dc8867f53a81d6e1c413d393039747668d27bd4
+Author: Alan Coopersmith
+Date: Wed Oct 4 18:34:20 2006 -0700
- * configure.ac:
- * src/Makefile.am:
- Bug #5175: Make encodingsdir configurable (David Coulthart and
- Kevin E. Martin)
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 81b27280717dc7e06a9ebbd196fae03a9e719db3
+Author: Alan Coopersmith
+Date: Wed Oct 4 18:32:38 2006 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add *~ to .gitignore to skip over emacs droppings
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 187ec5a0cd96c3b6b13b9ccae51e2828db7c6d3e
+Author: Alan Coopersmith
+Date: Wed Oct 4 18:32:07 2006 -0700
- * fontenc.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
+ Copy copyright notice/license from source to COPYING
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 1a9f5d7cb1aba4d65b28b5cdcaa7b68053b733ee
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:59:16 2006 -0700
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ renamed: .cvsignore -> .gitignore
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 2c2f63d0f17106964c808f8f0ec5bb58f35b4fe5
+Author: Alan Coopersmith
+Date: Sat Jun 3 06:33:40 2006 +0000
- * configure.ac:
- Update package version number for RC1 release.
+ Coverity #1523: Dereferencing freed pointer "mapping"
-2005-07-09 Keith Packard
+commit f991560c0f599d82b23380de4a681b0d218f5cef
+Author: Adam Jackson
+Date: Wed Apr 26 23:55:31 2006 +0000
- * .cvsignore:
- * encodings/.cvsignore:
- * encodings/large/.cvsignore:
- * src/.cvsignore:
- Add .cvsignore files
-
- * configure.ac:
- Depend on xproto, not x11 so we do not link against -X11
+ Bump to 1.0.2
-2005-06-30 Alexander Gottwald <ago at freedesktop dot org>
+commit a9604c242f7f53a8cd26a2764c1a96e25ea2e1a7
+Author: Alan Coopersmith
+Date: Mon Apr 10 16:15:12 2006 +0000
- * configure.ac:
- Check for zlib
+ Fix another file descriptor leak (related to previous Coverity #544)
+
+commit d86b38b96854bc60d4a2c4595e73cf53aa36d85c
+Author: Adam Jackson
+Date: Fri Apr 7 00:35:36 2006 +0000
+
+ Coverity #544: File a file descriptor leak.
+
+commit 78f355698128454370590040699c2141ae69d7d9
+Author: Kevin E Martin
+Date: Wed Dec 21 02:30:06 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit c7a14086fbe226169f7ea5df80c4d885082fb732
+Author: Adam Jackson
+Date: Mon Dec 19 16:28:28 2005 +0000
+
+ Stub COPYING files
+
+commit 55035bfbae0ca22399623d78411cc50bfdee2705
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:36 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit d146b3a17228204ce0fe3bcca72de53cedebf5fb
+Author: Kevin E Martin
+Date: Fri Dec 9 06:07:14 2005 +0000
+
+ Bug #5175: Make encodingsdir configurable (David Coulthart and Kevin E.
+ Martin)
+
+commit acb0d67e5f0293f960a923cda6eb359a82f7036e
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:46 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit c2e139f8726cde5bbae609865b609f087b3f651b
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:44 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 21b115927640683b90fc1304f7b921da51aabf64
+Author: Kevin E Martin
+Date: Wed Nov 9 21:19:14 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit d9ece44e76f0c2dcfacb5ff00e59cae2741e3c96
+Author: Kean Johnson
+Date: Tue Nov 8 06:33:26 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit 632f53206e104b372db255c5171c3479d87b683b
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:12 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 49e4c36c1bf2ccc3af576c489abf76bea4bf64b1
+Author: Adam Jackson
+Date: Wed Aug 3 03:28:03 2005 +0000
+
+ Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
+ a global configure cache don't get confused.
+
+commit 8a6fb4344eb5c13198125996e43a0898a19818f8
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:54 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 9e8be492f61095813f5e9b01c8d54ffb1550f339
+Author: Daniel Stone
+Date: Sat Jul 16 07:51:05 2005 +0000
+
+ Set soversion to 1.0 using -version-number.
+
+commit 11b206733618d73946a8c298d2d5f2183075657f
+Author: Alan Coopersmith
+Date: Wed Jul 13 16:51:34 2005 +0000
+
+ Update INCLUDES to find
+
+commit 85094af610ba990c6bc2377eff1f6f31dffd48e2
+Author: Søren Sandmann Pedersen
+Date: Tue Jul 12 21:05:28 2005 +0000
+
+ Remove encodings build system from libfontenc
+
+commit 8deaa94831b1a5926db928a68a6acbbe3ee9a904
+Author: Keith Packard
+Date: Sat Jul 9 23:31:40 2005 +0000
+
+ Switch from monolithic configuration symbols to modular ones, add backward
+ compatibility for monolithic symbols
+
+commit ec602c9639e4eedb36a570943999fea0a07b5f8c
+Author: Keith Packard
+Date: Sat Jul 9 21:15:50 2005 +0000
+
+ Add .cvsignore files
+ Depend on xproto, not x11 so we do not link against -X11
+
+commit 0767d4880359983cbe83a4ea396d81efb5d6882b
+Author: Daniel Stone
+Date: Sun Jul 3 07:01:00 2005 +0000
+
+ Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
+ Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
+ Add #include or , as appropriate, to all
+ source files in the xserver/xorg tree, predicated on defines of
+ HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
+ .
+
+commit f6c6acf593686015fa639e3583f70cc6d5f5d7b3
+Author: Alexander Gottwald
+Date: Thu Jun 30 13:21:11 2005 +0000
+
+ Check for zlib
+
+commit 092271385632708fb5dd53dca3dcfc3ead06ef6c
+Author: Søren Sandmann Pedersen
+Date: Tue Jun 28 15:40:27 2005 +0000
+
+ modularizeapp.sh: initialize LAST to "" symlink.sh: Add bitmaps for oclock,
+ and an extra textfile for pclcomp
+
+commit 21e552451c095c5668a57765c2eb941750e00ecd
+Author: Søren Sandmann Pedersen
+Date: Tue Jun 28 14:48:02 2005 +0000
+
+ Add generation of encodings.dir
+
+commit a18d9ec0c4bfa36460d5e3eba1c5fb8a90086500
+Author: Søren Sandmann Pedersen
+Date: Tue Jun 28 14:17:12 2005 +0000
+
+ Add encodings to fontenc build system, plus various fixes to make it
+ distcheck.
+
+commit bcdcaebcd2127f4e7e1c368f341a781b4cf8af6b
+Author: Søren Sandmann Pedersen
+Date: Mon Jun 27 16:09:14 2005 +0000
+
+ - Remove fontenc from Xfont
+ - Add a dependency from Xfont on libfontenc
+ - Add build system for lib/fontenc
+ - xc/lib/font: Change #include "fontenc.h" to #include
+ in some places.
+ - Remove dpsinfo and dpsexec from the app section of symlink.sh
+ - Fix xp.pc.in to add XPRINT_LIBS/CFLAGS instead of X_LIBS/CFLAGS
+
+commit e80fd1617092d128d54a9400a4974ffafbb3083e
+Author: Egbert Eich
+Date: Fri Apr 23 18:44:23 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 072f90aeb09035953b966233059139d161d3a5f0
+Author: Egbert Eich
+Date: Sun Mar 14 08:32:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 7fb87aa305856f07d7a57b3296ade04b1f012f1a
+Author: Egbert Eich
+Date: Wed Mar 3 12:11:43 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 993a15d0255a72bdfbc6c2c43e9c164f0919e682
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:35 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit eec99218eac07b50f0d25c2789abb5dfcc8f6c9d
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:53 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit faa2a922a0dbd16844055f83a159dab92a383376
+Author: Kaleb Keithley
+Date: Mon Feb 23 20:34:43 2004 +0000
+
+ Import most of XFree86 4.4RC3. This import excludes files which have the
+ new license. If we want to, later we can import 4.4RC3 again and pick
+ up the files that have the new license, but for now the vendor branch
+ is "pure."
+
+commit 7ea6ca71ac6825b9a28510f23c35d8b480752c41
+Author: Kaleb Keithley
+Date: Fri Dec 19 20:54:44 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit f431cd8bc5d7fb3a385609c9ac99deabb79ab023
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:50 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit f1b010ee7ae89b23af8fe4c92103db775ae35aed
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:50 2003 +0000
+
+ Initial revision
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-X11R7.1-1.0.2/Makefile.am new/libfontenc-1.0.3/Makefile.am
--- old/libfontenc-X11R7.1-1.0.2/Makefile.am 2005-07-12 23:05:28.000000000 +0200
+++ new/libfontenc-1.0.3/Makefile.am 2006-10-13 00:34:31.000000000 +0200
@@ -24,5 +24,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontenc.pc
-EXTRA_DIST = fontenc.pc.in autogen.sh
+EXTRA_DIST = fontenc.pc.in autogen.sh ChangeLog
+CLEANFILES = ChangeLog
+ChangeLog: FORCE
+ git-log > ChangeLog
+FORCE:
+
+if LINT
+lint:
+ (cd src && $(MAKE) $(MFLAGS) lint)
+endif LINT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-X11R7.1-1.0.2/configure.ac new/libfontenc-1.0.3/configure.ac
--- old/libfontenc-X11R7.1-1.0.2/configure.ac 2006-04-27 01:55:31.000000000 +0200
+++ new/libfontenc-1.0.3/configure.ac 2006-10-13 20:57:56.000000000 +0200
@@ -23,12 +23,16 @@
AC_PREREQ([2.57])
-AC_INIT(libfontenc, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libfontenc)
+AC_INIT(libfontenc, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libfontenc)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -51,6 +55,10 @@
AC_SUBST(FONTENC_CFLAGS)
AC_SUBST(FONTENC_LIBS)
+
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+LINT_FLAGS="${LINT_FLAGS} ${FONTENC_CFLAGS}"
XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-X11R7.1-1.0.2/src/Makefile.am new/libfontenc-1.0.3/src/Makefile.am
--- old/libfontenc-X11R7.1-1.0.2/src/Makefile.am 2005-12-09 07:07:14.000000000 +0100
+++ new/libfontenc-1.0.3/src/Makefile.am 2006-10-12 00:32:24.000000000 +0200
@@ -20,3 +20,10 @@
libfontencinclude_HEADERS = \
$(top_srcdir)/include/X11/fonts/fontenc.h
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libfontenc_la_SOURCES) $(libfontenc_la_LIBADD) $(LIBS)
+endif LINT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-X11R7.1-1.0.2/src/encparse.c new/libfontenc-1.0.3/src/encparse.c
--- old/libfontenc-X11R7.1-1.0.2/src/encparse.c 2006-04-10 18:15:12.000000000 +0200
+++ new/libfontenc-1.0.3/src/encparse.c 2006-10-12 00:32:24.000000000 +0200
@@ -548,10 +548,10 @@
mapping->type = FONT_ENCODING_UNICODE;
mapping->pid = 0;
mapping->eid = 0;
- mapping->recode = 0;
- mapping->name = 0;
- mapping->client_data = 0;
- mapping->next = 0;
+ mapping->recode = NULL;
+ mapping->name = NULL;
+ mapping->client_data = NULL;
+ mapping->next = NULL;
goto mapping;
} else if(!strcasecmp(keyword_value, "cmap")) {
mapping = (FontMapPtr)xalloc(sizeof(FontMapRec));
@@ -560,10 +560,10 @@
mapping->type = FONT_ENCODING_TRUETYPE;
mapping->pid = value1;
mapping->eid = value2;
- mapping->recode = 0;
- mapping->name = 0;
- mapping->client_data = 0;
- mapping->next = 0;
+ mapping->recode = NULL;
+ mapping->name = NULL;
+ mapping->client_data = NULL;
+ mapping->next = NULL;
goto mapping;
} else if(!strcasecmp(keyword_value, "postscript")) {
mapping = (FontMapPtr)xalloc(sizeof(FontMapRec));
@@ -572,10 +572,10 @@
mapping->type = FONT_ENCODING_POSTSCRIPT;
mapping->pid = 0;
mapping->eid = 0;
- mapping->recode = 0;
- mapping->name = 0;
- mapping->client_data = 0;
- mapping->next = 0;
+ mapping->recode = NULL;
+ mapping->name = NULL;
+ mapping->client_data = NULL;
+ mapping->next = NULL;
goto string_mapping;
} else { /* unknown mapping type -- ignore */
goto skipmapping;
@@ -609,24 +609,27 @@
goto error;
sm->row_size = encoding->row_size;
if(first <= last) {
+ unsigned short *newmap;
+
sm->first = first;
sm->len=last-first+1;
- sm->map =
+ newmap =
(unsigned short*)xalloc(sm->len * sizeof(unsigned short));
- if(sm->map == NULL) {
+ if(newmap == NULL) {
xfree(sm);
mapping->client_data = sm = NULL;
goto error;
}
+ for(i=0; i < sm->len; i++)
+ newmap[i] = enc[first+i];
+ sm->map = newmap;
} else {
sm->first = 0;
sm->len = 0;
- sm->map = 0;
+ sm->map = NULL;
}
- for(i=0; i < sm->len; i++)
- sm -> map[i] = enc[first+i];
install_mapping(encoding, mapping);
- mapping = 0;
+ mapping = NULL;
first = 0xFFFF; last=0;
goto no_mapping;
@@ -702,7 +705,7 @@
for(i = 0; i < sn->len; i++)
sn->map[i] = nam[first+i];
install_mapping(encoding,mapping);
- mapping = 0;
+ mapping = NULL;
first = 0xFFFF; last=0;
goto no_mapping;
case NAME_LINE:
@@ -773,21 +776,23 @@
xfree(mapping);
}
if(encoding) {
- if(encoding->name) xfree(encoding->name);
- for(mapping = encoding->mappings; mapping; mapping = mapping->next) {
- if(mapping->client_data) xfree(mapping->client_data);
- xfree(mapping);
- }
- xfree(encoding);
+ FontMapPtr nextmap;
+ if (encoding->name) xfree(encoding->name);
+ for (mapping = encoding->mappings; mapping; mapping = nextmap) {
+ if (mapping->client_data) xfree(mapping->client_data);
+ nextmap = mapping->next;
+ xfree(mapping);
+ }
+ xfree(encoding);
}
for(i = 0; i < numaliases; i++)
xfree(aliases[i]);
/* We don't need to free sn and sm as they handled locally in the body.*/
- return 0;
+ return NULL;
}
char*
-FontEncDirectory()
+FontEncDirectory(void)
{
static char* dir = NULL;
@@ -959,7 +964,7 @@
for(alias = encoding->aliases; *alias; alias++, name++)
*name = *alias;
- *name = 0;
+ *name = NULL;
xfree(encoding->aliases);
xfree(encoding);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-X11R7.1-1.0.2/src/fontenc.c new/libfontenc-1.0.3/src/fontenc.c
--- old/libfontenc-X11R7.1-1.0.2/src/fontenc.c 2005-11-08 07:33:26.000000000 +0100
+++ new/libfontenc-1.0.3/src/fontenc.c 2006-10-12 00:32:24.000000000 +0200
@@ -20,7 +20,7 @@
THE SOFTWARE.
*/
-/* $XdotOrg: lib/fontenc/src/fontenc.c,v 1.5 2005/11/08 06:33:26 jkj Exp $ */
+/* $XdotOrg: xc/lib/font/fontfile/fontenc.c,v 1.3 2005/07/03 07:01:00 daniels Exp $ */
/* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.15 2003/02/20 03:25:19 dawes Exp $ */
/* Backend-independent encoding code */
@@ -64,8 +64,8 @@
static FontMapRec iso10646[]=
{
- {FONT_ENCODING_UNICODE,0,0,0,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,NULL,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
/* Notice that the Apple encodings do not have all the characters in
@@ -73,7 +73,7 @@
There's not much more we can do with fonts without a Unicode cmap
unless we are willing to combine cmaps (which we are not). */
-static unsigned short
+static const unsigned short
iso8859_1_apple_roman[]=
{ 0xCA, 0xC1, 0xA2, 0xA3, 0xDB, 0xB4, 0x00, 0xA4,
0xAC, 0xA9, 0xBB, 0xC7, 0xC2, 0x00, 0xA8, 0xF8,
@@ -102,13 +102,13 @@
static FontMapRec iso8859_1[]=
{
- {FONT_ENCODING_TRUETYPE,2,2,0,0,0,0}, /* ISO 8859-1 */
- {FONT_ENCODING_UNICODE,0,0,0,0,0,0}, /* ISO 8859-1 coincides with Unicode*/
- {FONT_ENCODING_TRUETYPE,1,0,iso8859_1_to_apple_roman,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_TRUETYPE,2,2,NULL,NULL,NULL,NULL,NULL}, /* ISO 8859-1 */
+ {FONT_ENCODING_UNICODE,0,0,NULL,NULL,NULL,NULL,NULL}, /* ISO 8859-1 coincides with Unicode*/
+ {FONT_ENCODING_TRUETYPE,1,0,iso8859_1_to_apple_roman,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
-static unsigned short iso8859_2_tophalf[]=
+static const unsigned short iso8859_2_tophalf[]=
{ 0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7,
0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7,
@@ -125,7 +125,7 @@
static FontEncSimpleMapRec iso8859_2_to_unicode_map=
{0x60, 0, 0xA0, iso8859_2_tophalf };
-static unsigned short iso8859_2_apple_centeuro[]=
+static const unsigned short iso8859_2_apple_centeuro[]=
{ 0xCA, 0x84, 0x00, 0xFC, 0x00, 0xBB, 0xE5, 0xA4,
0xAC, 0xE1, 0x00, 0xE8, 0x8F, 0x00, 0xEB, 0xFB,
0xA1, 0x88, 0x00, 0xB8, 0x00, 0xBC, 0xE6, 0xFF,
@@ -154,12 +154,12 @@
static FontMapRec iso8859_2[]=
{
{FONT_ENCODING_UNICODE,0,0,
- FontEncSimpleRecode,0,&iso8859_2_to_unicode_map,0},
- {FONT_ENCODING_TRUETYPE,1,29,iso8859_2_to_apple_centeuro,0,0,0},
- {0,0,0,0,0,0,0}
+ FontEncSimpleRecode,NULL,&iso8859_2_to_unicode_map,NULL,NULL},
+ {FONT_ENCODING_TRUETYPE,1,29,iso8859_2_to_apple_centeuro,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
-static unsigned short iso8859_3_tophalf[]=
+static const unsigned short iso8859_3_tophalf[]=
{ 0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0x0000, 0x0124, 0x00A7,
0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0x0000, 0x017B,
0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7,
@@ -179,12 +179,12 @@
static FontMapRec iso8859_3[]=
{
{FONT_ENCODING_UNICODE,0,0,
- FontEncSimpleRecode,0,&iso8859_3_to_unicode_map,0},
- {0,0,0,0,0,0,0}
+ FontEncSimpleRecode,NULL,&iso8859_3_to_unicode_map,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
-static unsigned short iso8859_4_tophalf[]=
+static const unsigned short iso8859_4_tophalf[]=
{ 0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7,
0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF,
0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7,
@@ -204,12 +204,12 @@
static FontMapRec iso8859_4[]=
{
- {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,0,
- &iso8859_4_to_unicode_map,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,NULL,
+ &iso8859_4_to_unicode_map,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
-static unsigned short iso8859_5_tophalf[]=
+static const unsigned short iso8859_5_tophalf[]=
{ 0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407,
0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F,
0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
@@ -226,7 +226,7 @@
static FontEncSimpleMapRec iso8859_5_to_unicode_map=
{ 0x60, 0, 0xA0, iso8859_5_tophalf };
-static unsigned short
+static const unsigned short
iso8859_5_apple_cyrillic[]=
{ 0xCA, 0xDD, 0xAB, 0xAE, 0xB8, 0xC1, 0xA7, 0xBA,
0xB7, 0xBC, 0xBE, 0xCB, 0xCD, 0x00, 0xD8, 0xDA,
@@ -253,10 +253,10 @@
static FontMapRec iso8859_5[]=
{
- {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,0,
- &iso8859_5_to_unicode_map,0},
- {FONT_ENCODING_TRUETYPE,1,7,iso8859_5_to_apple_cyrillic,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,NULL,
+ &iso8859_5_to_unicode_map,NULL,NULL},
+ {FONT_ENCODING_TRUETYPE,1,7,iso8859_5_to_apple_cyrillic,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
/* ISO 8859-6 seems useless for serving fonts (not enough presentation
@@ -278,8 +278,8 @@
static FontMapRec iso8859_6[]=
{
- {FONT_ENCODING_UNICODE,0,0,iso8859_6_to_unicode,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,iso8859_6_to_unicode,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
static unsigned
@@ -304,8 +304,8 @@
static FontMapRec iso8859_7[]=
{
- {FONT_ENCODING_UNICODE,0,0,iso8859_7_to_unicode,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,iso8859_7_to_unicode,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
static unsigned
@@ -325,8 +325,8 @@
static FontMapRec iso8859_8[]=
{
- {FONT_ENCODING_UNICODE,0,0,iso8859_8_to_unicode,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,iso8859_8_to_unicode,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
static unsigned
@@ -345,11 +345,11 @@
static FontMapRec iso8859_9[]=
{
- {FONT_ENCODING_UNICODE,0,0,iso8859_9_to_unicode,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,iso8859_9_to_unicode,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
-static unsigned short iso8859_10_tophalf[]=
+static const unsigned short iso8859_10_tophalf[]=
{ 0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7,
0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A,
0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7,
@@ -368,9 +368,9 @@
static FontMapRec iso8859_10[]=
{
- {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,0,
- &iso8859_10_to_unicode_map,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,NULL,
+ &iso8859_10_to_unicode_map,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
static unsigned
@@ -391,11 +391,11 @@
static FontMapRec iso8859_15[]=
{
- {FONT_ENCODING_UNICODE,0,0,iso8859_15_to_unicode,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,iso8859_15_to_unicode,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
-static unsigned short koi8_r_tophalf[]=
+static const unsigned short koi8_r_tophalf[]=
{ 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2022, 0x221A, 0x2248,
@@ -419,9 +419,9 @@
static FontMapRec koi8_r[]=
{
- {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,0,
- &koi8_r_to_unicode_map,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,NULL,
+ &koi8_r_to_unicode_map,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
static unsigned
@@ -453,13 +453,13 @@
static FontMapRec koi8_ru[]=
{
- {FONT_ENCODING_UNICODE,0,0,koi8_ru_to_unicode,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,koi8_ru_to_unicode,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
/* koi8-e, ISO-IR-111 or ECMA-Cyrillic */
-static unsigned short koi8_e_A0_BF[]=
+static const unsigned short koi8_e_A0_BF[]=
{ 0x00A0, 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457,
0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00AD, 0x045E, 0x045F,
0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407,
@@ -478,13 +478,13 @@
static FontMapRec koi8_e[]=
{
- {FONT_ENCODING_UNICODE,0,0,koi8_e_to_unicode,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,koi8_e_to_unicode,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
/* Koi8 unified */
-static unsigned short koi8_uni_80_BF[]=
+static const unsigned short koi8_uni_80_BF[]=
{ 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
0x2591, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
@@ -507,8 +507,8 @@
static FontMapRec koi8_uni[]=
{
- {FONT_ENCODING_UNICODE,0,0,koi8_uni_to_unicode,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,koi8_uni_to_unicode,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
/* Ukrainian variant of Koi8-R; see RFC 2319 */
@@ -531,8 +531,8 @@
static FontMapRec koi8_u[]=
{
- {FONT_ENCODING_UNICODE,0,0,koi8_u_to_unicode,0,0,0},
- {0,0,0,0,0,0,0}
+ {FONT_ENCODING_UNICODE,0,0,koi8_u_to_unicode,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}
};
/* Microsoft Symbol, which is only meaningful for TrueType fonts, is
@@ -540,41 +540,42 @@
the glyph index before applying the cmap. Lovely design. */
static FontMapRec microsoft_symbol[]=
-{{FONT_ENCODING_TRUETYPE,3,0,0,0,0,0},
+{{FONT_ENCODING_TRUETYPE,3,0,NULL,NULL,NULL,NULL,NULL},
/* You never know */
- {FONT_ENCODING_TRUETYPE,3,1,0,0,0,0},
- {0,0,0,0,0,0,0}};
+ {FONT_ENCODING_TRUETYPE,3,1,NULL,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}};
static FontMapRec apple_roman[]=
-{{FONT_ENCODING_TRUETYPE,1,0,0,0,0,0}, {0,0,0,0,0,0,0}};
+{{FONT_ENCODING_TRUETYPE,1,0,NULL,NULL,NULL,NULL,NULL},
+ {0,0,0,NULL,NULL,NULL,NULL,NULL}};
/* The data for recodings */
/* For compatibility with X11R6.4. Losers. */
-static char *iso8859_15_aliases[2]={"fcd8859-15",0};
+static char *iso8859_15_aliases[2]={"fcd8859-15",NULL};
static FontEncRec initial_encodings[]=
{
- {"iso10646-1",0,256*256,0,iso10646,0,0,0}, /* Unicode */
- {"iso8859-1",0,256,0,iso8859_1,0,0,0}, /* Latin 1 (West European) */
- {"iso8859-2",0,256,0,iso8859_2,0,0,0}, /* Latin 2 (East European) */
- {"iso8859-3",0,256,0,iso8859_3,0,0,0}, /* Latin 3 (South European) */
- {"iso8859-4",0,256,0,iso8859_4,0,0,0}, /* Latin 4 (North European) */
- {"iso8859-5",0,256,0,iso8859_5,0,0,0}, /* Cyrillic */
- {"iso8859-6",0,256,0,iso8859_6,0,0,0}, /* Arabic */
- {"iso8859-7",0,256,0,iso8859_7,0,0,0}, /* Greek */
- {"iso8859-8",0,256,0,iso8859_8,0,0,0}, /* Hebrew */
- {"iso8859-9",0,256,0,iso8859_9,0,0,0}, /* Latin 5 (Turkish) */
- {"iso8859-10",0,256,0,iso8859_10,0,0,0}, /* Latin 6 (Nordic) */
- {"iso8859-15",iso8859_15_aliases,256,0,iso8859_15,0,0,0}, /* Latin 9 */
- {"koi8-r",0,256,0,koi8_r,0,0,0}, /* Russian */
- {"koi8-ru",0,256,0,koi8_ru,0,0,0}, /* Ukrainian */
- {"koi8-uni",0,256,0,koi8_uni,0,0,0}, /* Russian/Ukrainian/Bielorussian */
- {"koi8-e",0,256,0,koi8_e,0,0,0}, /* ``European'' */
- {"koi8-u",0,256,0,koi8_u,0,0,0}, /* Ukrainian too */
- {"microsoft-symbol",0,256,0,microsoft_symbol,0,0,0},
- {"apple-roman",0,256,0,apple_roman,0,0,0},
- {0,0,0,0,0,0,0}
+ {"iso10646-1",NULL,256*256,0,iso10646,NULL,0,0}, /* Unicode */
+ {"iso8859-1",NULL,256,0,iso8859_1,NULL,0,0}, /* Latin 1 (West European) */
+ {"iso8859-2",NULL,256,0,iso8859_2,NULL,0,0}, /* Latin 2 (East European) */
+ {"iso8859-3",NULL,256,0,iso8859_3,NULL,0,0}, /* Latin 3 (South European) */
+ {"iso8859-4",NULL,256,0,iso8859_4,NULL,0,0}, /* Latin 4 (North European) */
+ {"iso8859-5",NULL,256,0,iso8859_5,NULL,0,0}, /* Cyrillic */
+ {"iso8859-6",NULL,256,0,iso8859_6,NULL,0,0}, /* Arabic */
+ {"iso8859-7",NULL,256,0,iso8859_7,NULL,0,0}, /* Greek */
+ {"iso8859-8",NULL,256,0,iso8859_8,NULL,0,0}, /* Hebrew */
+ {"iso8859-9",NULL,256,0,iso8859_9,NULL,0,0}, /* Latin 5 (Turkish) */
+ {"iso8859-10",NULL,256,0,iso8859_10,NULL,0,0}, /* Latin 6 (Nordic) */
+ {"iso8859-15",iso8859_15_aliases,256,0,iso8859_15,NULL,0,0}, /* Latin 9 */
+ {"koi8-r",NULL,256,0,koi8_r,NULL,0,0}, /* Russian */
+ {"koi8-ru",NULL,256,0,koi8_ru,NULL,0,0}, /* Ukrainian */
+ {"koi8-uni",NULL,256,0,koi8_uni,NULL,0,0}, /* Russian/Ukrainian/Bielorussian */
+ {"koi8-e",NULL,256,0,koi8_e,NULL,0,0}, /* ``European'' */
+ {"koi8-u",NULL,256,0,koi8_u,NULL,0,0}, /* Ukrainian too */
+ {"microsoft-symbol",NULL,256,0,microsoft_symbol,NULL,0,0},
+ {"apple-roman",NULL,256,0,apple_roman,NULL,0,0},
+ {NULL,NULL,0,0,NULL,NULL,0,0}
};
static FontEncPtr font_encodings=NULL;
@@ -613,7 +614,7 @@
int len;
if(length > MAXFONTNAMELEN - 1)
- return 0;
+ return NULL;
if(name == NULL)
p = NULL;
@@ -625,13 +626,13 @@
while(p >= name && *p != '-')
p--;
if(p <= name)
- p = 0;
+ p = NULL;
}
/* now p either is null or points at the '-' before the charset registry */
if(p == 0)
- return 0;
+ return NULL;
len = length - (p - name) - 1;
memcpy(charset, p+1, len);
@@ -674,10 +675,10 @@
(encoding->row_size != 0 &&
(code/0x100 >= encoding->size ||
(code&0xFF) >= encoding->row_size)))
- return 0;
+ return NULL;
return (*mapping->name)(code, mapping->client_data);
} else
- return 0;
+ return NULL;
}
FontEncPtr
@@ -741,7 +742,7 @@
encoding = FontEncReallyLoad(encoding_name, filename);
if (encoding == NULL) {
- return 0;
+ return NULL;
} else {
char **alias;
int found = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-X11R7.1-1.0.2/src/fontencI.h new/libfontenc-1.0.3/src/fontencI.h
--- old/libfontenc-X11R7.1-1.0.2/src/fontencI.h 2004-04-23 20:44:21.000000000 +0200
+++ new/libfontenc-1.0.3/src/fontencI.h 2006-10-12 00:32:24.000000000 +0200
@@ -29,7 +29,7 @@
unsigned len; /* might be 0x10000 */
unsigned short row_size;
unsigned short first;
- unsigned short *map;
+ const unsigned short *map;
} FontEncSimpleMapRec, *FontEncSimpleMapPtr;
typedef struct _FontEncSimpleName {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org