Hello community,
here is the log from the commit of package libFS for openSUSE:Factory checked in at 2015-05-06 07:47:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libFS (Old)
and /work/SRC/openSUSE:Factory/.libFS.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libFS"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libFS/libFS.changes 2014-05-10 08:32:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libFS.new/libFS.changes 2015-05-06 07:47:31.000000000 +0200
@@ -1,0 +2,11 @@
+Mon May 4 13:59:39 UTC 2015 - sndirsch@suse.com
+
+- Update to version 1.0.7
+ * Constify pattern argument to FSListCatalogues
+ * Constify some more strings in API arguments
+ * Fix some sign/size conversion warnings from clang
+ * Fix typos & wording issues in source comments
+ * Remove unneeded checks for #ifndef X_NOT_POSIX
+ * Use 'imdent' to realign cpp indentation levels in FSlibos.h
+
+-------------------------------------------------------------------
Old:
----
libFS-1.0.6.tar.bz2
New:
----
libFS-1.0.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libFS.spec ++++++
--- /var/tmp/diff_new_pack.Vk6Is0/_old 2015-05-06 07:47:32.000000000 +0200
+++ /var/tmp/diff_new_pack.Vk6Is0/_new 2015-05-06 07:47:32.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libFS
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: libFS
%define lname libFS6
-Version: 1.0.6
+Version: 1.0.7
Release: 0
Summary: X Font Service client library
License: MIT
++++++ libFS-1.0.6.tar.bz2 -> libFS-1.0.7.tar.bz2 ++++++
++++ 3515 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/libFS-1.0.6/ChangeLog new/libFS-1.0.7/ChangeLog
--- old/libFS-1.0.6/ChangeLog 2014-03-16 19:04:02.000000000 +0100
+++ new/libFS-1.0.7/ChangeLog 2015-05-01 06:34:25.000000000 +0200
@@ -1,3 +1,76 @@
+commit a9db12661e7412dd935706c92db6d7bc46238782
+Author: Alan Coopersmith
+Date: Thu Apr 30 21:14:46 2015 -0700
+
+ libFS 1.0.7
+
+ Signed-off-by: Alan Coopersmith
+
+commit f1c9c18e2601151e3dfa7f83b4748edd2a5a3a6e
+Author: Alan Coopersmith
+Date: Wed Nov 5 17:49:30 2014 -0800
+
+ Use 'imdent' to realign cpp indentation levels in FSlibos.h
+
+ Parts were indented, others weren't, now is more consistent.
+ 'git diff -w' shows no non-whitespace changes in this commit
+
+ Signed-off-by: Alan Coopersmith
+
+commit f2c0bb056dbfbc2ca5b753b8de87b6c73742a990
+Author: Alan Coopersmith
+Date: Wed Nov 5 17:48:18 2014 -0800
+
+ Remove unneeded checks for #ifndef X_NOT_POSIX
+
+ Signed-off-by: Alan Coopersmith
+
+commit aef4c4f1330dc01d535cd88b9805c3d5d164b070
+Author: Alan Coopersmith
+Date: Fri Jul 11 20:24:22 2014 -0700
+
+ Fix typos & wording issues in source comments
+
+ Signed-off-by: Alan Coopersmith
+
+commit dcf25b1ed387d7019d2cf7703eeb33554987d63f
+Author: Alan Coopersmith
+Date: Thu Jun 5 14:20:07 2014 -0700
+
+ Fix some sign/size conversion warnings from clang
+
+ Signed-off-by: Alan Coopersmith
+
+commit fa577a18f189fe454995306d38059570e1ad8bf2
+Author: Alan Coopersmith
+Date: Wed Jun 4 23:36:45 2014 -0700
+
+ Constify some more strings in API arguments
+
+ Signed-off-by: Alan Coopersmith
+
+commit 5e0f1b91edb97759e2c07ec233c2ce8639c8e0fe
+Author: Alan Coopersmith
+Date: Fri May 23 23:20:03 2014 -0700
+
+ Constify pattern argument to FSListCatalogues
+
+ The contents of pattern are simply copied to the request sent to
+ the font server and never touched again, so can be labeled read-only.
+
+ Fixes compiler warning building xfsinfo:
+
+ xfsinfo.c: In function ‘print_catalogue_info’:
+ xfsinfo.c:158:5: warning: passing argument 2 of ‘FSListCatalogues’ discards
+ ‘const’ qualifier from pointer target type [enabled by default]
+ char **cats = FSListCatalogues(svr, "*", 1000, &n);
+ ^
+ In file included from xfsinfo.c:66:0:
+ FSlib.h:255:16: note: expected ‘char *’ but argument is of type ‘const char *’
+ extern char ** FSListCatalogues ( FSServer *svr, char *pattern,
+
+ Signed-off-by: Alan Coopersmith
+
commit 88be5c37c40070305e64c4b8dc0a1c1f6ca80440
Author: Alan Coopersmith
Date: Sun Mar 16 10:44:14 2014 -0700
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/libFS-1.0.6/INSTALL new/libFS-1.0.7/INSTALL
--- old/libFS-1.0.6/INSTALL 2014-03-16 19:04:02.000000000 +0100
+++ new/libFS-1.0.7/INSTALL 2015-05-01 06:34:25.000000000 +0200
@@ -1,11 +1,13 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
@@ -13,7 +15,11 @@
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -42,7 +48,7 @@
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
- 5. You can remove the program binaries and object files from the
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -67,8 +83,15 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
Compilers and Options
=====================
@@ -93,7 +116,8 @@
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
@@ -120,7 +144,8 @@
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -131,15 +156,46 @@
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
Particular systems
==================
@@ -159,10 +222,15 @@
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
- ./configure CC="cc -Ae"
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
@@ -174,6 +242,16 @@
./configure CC="cc -nodtk"
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
@@ -189,7 +267,8 @@
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
@@ -277,7 +356,7 @@
`configure' can determine that directory automatically.
`--prefix=DIR'
- Use DIR as the installation prefix. *Note Installation Names::
+ Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
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/libFS-1.0.6/compile new/libFS-1.0.7/compile
--- old/libFS-1.0.6/compile 2014-03-16 19:03:52.000000000 +0100
+++ new/libFS-1.0.7/compile 2015-05-01 06:33:27.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
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/libFS-1.0.6/configure.ac new/libFS-1.0.7/configure.ac
--- old/libFS-1.0.6/configure.ac 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/configure.ac 2015-05-01 06:33:13.000000000 +0200
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libFS], [1.0.6],
+AC_INIT([libFS], [1.0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libFS])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
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/libFS-1.0.6/include/X11/fonts/FSlib.h new/libFS-1.0.7/include/X11/fonts/FSlib.h
--- old/libFS-1.0.6/include/X11/fonts/FSlib.h 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/include/X11/fonts/FSlib.h 2015-05-01 06:33:13.000000000 +0200
@@ -249,10 +249,10 @@
extern const char * FSServerName ( const char *server );
extern char ** FSListExtensions ( FSServer *svr, int *next );
-extern int FSQueryExtension ( FSServer *svr, char *name, int *major_opcode,
+extern int FSQueryExtension ( FSServer *svr, const char *name, int *major_opcode,
int *first_event, int *first_error );
-extern char ** FSListCatalogues ( FSServer *svr, char *pattern,
+extern char ** FSListCatalogues ( FSServer *svr, const char *pattern,
int maxNames, int *actualCount );
extern char ** FSGetCatalogues ( FSServer *svr, int *num );
@@ -267,7 +267,7 @@
FSPropOffset ***offsets,
unsigned char ***prop_data );
extern Font FSOpenBitmapFont ( FSServer *svr, FSBitmapFormat hint,
- FSBitmapFormatMask fmask, char *name,
+ FSBitmapFormatMask fmask, const char *name,
Font *otherid );
extern int FSSync ( FSServer *svr, Bool discard );
@@ -278,7 +278,6 @@
const char *type, const char *defaultp,
char *buffer, int nbytes );
extern int FSGetErrorText ( FSServer *svr, int code, char *buffer,
-
int nbytes );
extern int FSFlush ( FSServer *svr );
extern int FSFreeFontNames ( char **list );
@@ -286,18 +285,18 @@
extern int FSFreeExtensionList ( char **list );
extern int FSNextEvent ( FSServer *svr, FSEvent *event );
extern int FSQueryXBitmaps8 ( FSServer *svr, Font fid, FSBitmapFormat format,
- int range_type, unsigned char *str,
+ int range_type, const unsigned char *str,
unsigned long str_len, FSOffset **offsets,
unsigned char **glyphdata );
extern int FSQueryXBitmaps16 ( FSServer *svr, Font fid, FSBitmapFormat format,
- int range_type, FSChar2b *str,
+ int range_type, const FSChar2b *str,
unsigned long str_len, FSOffset **offsets,
unsigned char **glyphdata );
extern int FSQueryXExtents8 ( FSServer *svr, Font fid, int range_type,
- unsigned char *str, unsigned long str_len,
+ const unsigned char *str, unsigned long str_len,
FSXCharInfo **extents );
extern int FSQueryXExtents16 ( FSServer *svr, Font fid, int range_type,
- FSChar2b *str, unsigned long str_len,
+ const FSChar2b *str, unsigned long str_len,
FSXCharInfo **extents );
extern int FSQueryXInfo ( FSServer *svr, Font fid, FSXFontInfoHeader *info,
FSPropInfo *props, FSPropOffset **offsets,
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/libFS-1.0.6/missing new/libFS-1.0.7/missing
--- old/libFS-1.0.6/missing 2014-03-16 19:03:53.000000000 +0100
+++ new/libFS-1.0.7/missing 2015-05-01 06:33:27.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
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/libFS-1.0.6/src/FSErrDis.c new/libFS-1.0.7/src/FSErrDis.c
--- old/libFS-1.0.6/src/FSErrDis.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSErrDis.c 2015-05-01 06:33:13.000000000 +0200
@@ -70,7 +70,7 @@
/* FSBadLength */ "BadLength, request too large or internal FSlib length error",
/* FSBadImplementation */ "BadImplementation, request unsupported",
};
-static int FSErrorListSize = sizeof(FSErrorList);
+#define FSErrorListSize sizeof(FSErrorList)
/* ARGSUSED */
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/libFS-1.0.6/src/FSFtNames.c new/libFS-1.0.7/src/FSFtNames.c
--- old/libFS-1.0.6/src/FSFtNames.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSFtNames.c 2015-05-01 06:33:13.000000000 +0200
@@ -62,13 +62,13 @@
int *actualCount)
{
long nbytes;
- int i,
+ unsigned int i,
length;
char **flist;
char *c;
fsListFontsReply rep;
fsListFontsReq *req;
- long rlen;
+ unsigned long rlen;
GetReq(ListFonts, req);
req->maxNames = maxNames;
@@ -94,11 +94,11 @@
FSfree(flist);
if (c)
FSfree(c);
- _FSEatData(svr, (unsigned long) rlen);
+ _FSEatData(svr, rlen);
SyncHandle();
return (char **) NULL;
}
- _FSReadPad(svr, c, rlen);
+ _FSReadPad(svr, c, (long) rlen);
/* unpack */
length = *(unsigned char *)c;
for (i = 0; i < rep.nFonts; i++) {
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/libFS-1.0.6/src/FSGetCats.c new/libFS-1.0.7/src/FSGetCats.c
--- old/libFS-1.0.6/src/FSGetCats.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSGetCats.c 2015-05-01 06:33:13.000000000 +0200
@@ -65,7 +65,7 @@
int i,
length;
fsReq *req;
- long rlen;
+ unsigned long rlen;
GetEmptyReq(GetCatalogues, req);
@@ -87,11 +87,11 @@
FSfree(list);
if (c)
FSfree(c);
- _FSEatData(svr, (unsigned long) rlen);
+ _FSEatData(svr, rlen);
SyncHandle();
return (char **) NULL;
}
- _FSReadPad(svr, c, rlen);
+ _FSReadPad(svr, c, (long) rlen);
/*
* unpack the strings
*/
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/libFS-1.0.6/src/FSListCats.c new/libFS-1.0.7/src/FSListCats.c
--- old/libFS-1.0.6/src/FSListCats.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSListCats.c 2015-05-01 06:33:13.000000000 +0200
@@ -57,7 +57,7 @@
char **
FSListCatalogues(
FSServer *svr,
- char *pattern,
+ const char *pattern,
int maxNames,
int *actualCount)
{
@@ -68,7 +68,7 @@
char *c;
fsListCataloguesReply rep;
fsListCataloguesReq *req;
- long rlen;
+ unsigned long rlen;
GetReq(ListCatalogues, req);
req->maxNames = maxNames;
@@ -94,11 +94,11 @@
FSfree(clist);
if (c)
FSfree(c);
- _FSEatData(svr, (unsigned long) rlen);
+ _FSEatData(svr, rlen);
SyncHandle();
return (char **) NULL;
}
- _FSReadPad(svr, c, rlen);
+ _FSReadPad(svr, c, (long) rlen);
/* unpack */
length = *c;
for (i = 0; i < rep.num_catalogues; i++) {
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/libFS-1.0.6/src/FSListExt.c new/libFS-1.0.7/src/FSListExt.c
--- old/libFS-1.0.6/src/FSListExt.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSListExt.c 2015-05-01 06:33:13.000000000 +0200
@@ -65,7 +65,7 @@
int i,
length;
fsReq *req;
- long rlen;
+ unsigned long rlen;
GetEmptyReq(ListExtensions, req);
@@ -87,11 +87,11 @@
FSfree(list);
if (c)
FSfree(c);
- _FSEatData(svr, (unsigned long) rlen);
+ _FSEatData(svr, rlen);
SyncHandle();
return (char **) NULL;
}
- _FSReadPad(svr, c, rlen);
+ _FSReadPad(svr, c, (long) rlen);
/*
* unpack the strings
*/
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/libFS-1.0.6/src/FSOpenFont.c new/libFS-1.0.7/src/FSOpenFont.c
--- old/libFS-1.0.6/src/FSOpenFont.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSOpenFont.c 2015-05-01 06:33:13.000000000 +0200
@@ -59,7 +59,7 @@
FSServer *svr,
FSBitmapFormat hint,
FSBitmapFormatMask fmask,
- char *name,
+ const char *name,
Font *otherid)
{
unsigned int nbytes;
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/libFS-1.0.6/src/FSQGlyphs.c new/libFS-1.0.7/src/FSQGlyphs.c
--- old/libFS-1.0.6/src/FSQGlyphs.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSQGlyphs.c 2015-05-01 06:33:13.000000000 +0200
@@ -60,7 +60,7 @@
Font fid,
FSBitmapFormat format,
Bool range_type,
- unsigned char *str,
+ const unsigned char *str,
unsigned long str_len,
FSOffset **offsets,
unsigned char **glyphdata)
@@ -129,7 +129,7 @@
Font fid,
FSBitmapFormat format,
Bool range_type,
- FSChar2b *str,
+ const FSChar2b *str,
unsigned long str_len,
FSOffset **offsets,
unsigned char **glyphdata)
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/libFS-1.0.6/src/FSQXExt.c new/libFS-1.0.7/src/FSQXExt.c
--- old/libFS-1.0.6/src/FSQXExt.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSQXExt.c 2015-05-01 06:33:13.000000000 +0200
@@ -70,7 +70,7 @@
FSServer *svr,
Font fid,
Bool range_type,
- unsigned char *str,
+ const unsigned char *str,
unsigned long str_len,
FSXCharInfo **extents)
{
@@ -116,7 +116,7 @@
FSServer *svr,
Font fid,
Bool range_type,
- FSChar2b *str,
+ const FSChar2b *str,
unsigned long str_len,
FSXCharInfo **extents)
{
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/libFS-1.0.6/src/FSQuExt.c new/libFS-1.0.7/src/FSQuExt.c
--- old/libFS-1.0.6/src/FSQuExt.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSQuExt.c 2015-05-01 06:33:13.000000000 +0200
@@ -57,7 +57,7 @@
Bool
FSQueryExtension(
FSServer *svr,
- char *name,
+ const char *name,
int *major_opcode,
int *first_event,
int *first_error)
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/libFS-1.0.6/src/FSlibInt.c new/libFS-1.0.7/src/FSlibInt.c
--- old/libFS-1.0.6/src/FSlibInt.c 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSlibInt.c 2015-05-01 06:33:13.000000000 +0200
@@ -316,7 +316,7 @@
if (size == 0)
return;
- iov[0].iov_len = (int) size;
+ iov[0].iov_len = size;
iov[0].iov_base = data;
/*
* The following hack is used to provide 32 bit long-word aligned padding.
@@ -462,7 +462,7 @@
#ifdef undef
/*
* _FSAllocID - normal resource ID allocation routine. A client
- * can roll his own and instatantiate it if he wants, but must
+ * can roll their own and instantiate it if they want, but must
* follow the rules.
*/
FSID
@@ -707,7 +707,7 @@
}
/*
- * EventToWire in seperate file in that often not needed.
+ * EventToWire in separate file that is often not needed.
*/
/*ARGSUSED*/
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/libFS-1.0.6/src/FSlibint.h new/libFS-1.0.7/src/FSlibint.h
--- old/libFS-1.0.6/src/FSlibint.h 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSlibint.h 2015-05-01 06:33:13.000000000 +0200
@@ -152,7 +152,7 @@
req = (fsResourceReq *) (svr->last_req = svr->bufptr);\
req->reqType = FS_##name;\
req->length = 2;\
- req->id = (rid);\
+ req->id = (CARD32) (rid);\
svr->bufptr += SIZEOF(fsResourceReq);\
svr->request++
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/libFS-1.0.6/src/FSlibos.h new/libFS-1.0.7/src/FSlibos.h
--- old/libFS-1.0.6/src/FSlibos.h 2014-03-16 19:03:42.000000000 +0100
+++ new/libFS-1.0.7/src/FSlibos.h 2015-05-01 06:33:13.000000000 +0200
@@ -58,203 +58,201 @@
#ifndef WIN32
-#if defined(__SCO__) || defined(__UNIXWARE__)
-#include /* For SIZE_MAX */
-#endif
+# if defined(__SCO__) || defined(__UNIXWARE__)
+# include /* For SIZE_MAX */
+# endif
/*
* makedepend screws up on #undef OPEN_MAX, so we define a new symbol
*/
-#ifndef FS_OPEN_MAX
-
-#ifndef X_NOT_POSIX
-#ifdef _POSIX_SOURCE
-#include
-#else
-#define _POSIX_SOURCE
-#include
-#undef _POSIX_SOURCE
-#endif
-#endif
-#ifndef SIZE_MAX
-# ifdef ULONG_MAX
-# define SIZE_MAX ULONG_MAX
-# else
-# define SIZE_MAX UINT_MAX
-# endif
-#endif
-#ifndef OPEN_MAX
-#ifdef SVR4
-#define OPEN_MAX 256
-#else
-#include
-#ifndef OPEN_MAX
-#ifdef __OSF1__
-#define OPEN_MAX 256
-#else
-#ifdef NOFILE
-#define OPEN_MAX NOFILE
-#else
-#if !defined(__UNIXOS2__) && !defined(__QNX__)
-#ifdef __GNU__
-#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
-#else /* !__GNU__ */
-#define OPEN_MAX NOFILES_MAX
-#endif /* __GNU__ */
-#else /* !__UNIXOS2__ && !__QNX__ */
-#define OPEN_MAX 256
-#endif /* __UNIXOS2__ */
-#endif
-#endif
-#endif
-#endif
-#endif
+# ifndef FS_OPEN_MAX
-#ifdef __GNU__
-#define FS_OPEN_MAX 256
-#else /*!__GNU__*/
-#if OPEN_MAX > 256
-#define FS_OPEN_MAX 256
-#else
-#define FS_OPEN_MAX OPEN_MAX
-#endif
-#endif /*__GNU__*/
+# ifdef _POSIX_SOURCE
+# include
+# else
+# define _POSIX_SOURCE
+# include
+# undef _POSIX_SOURCE
+# endif
+# ifndef SIZE_MAX
+# ifdef ULONG_MAX
+# define SIZE_MAX ULONG_MAX
+# else
+# define SIZE_MAX UINT_MAX
+# endif
+# endif
+# ifndef OPEN_MAX
+# ifdef SVR4
+# define OPEN_MAX 256
+# else
+# include
+# ifndef OPEN_MAX
+# ifdef __OSF1__
+# define OPEN_MAX 256
+# else
+# ifdef NOFILE
+# define OPEN_MAX NOFILE
+# else
+# if !defined(__UNIXOS2__) && !defined(__QNX__)
+# ifdef __GNU__
+# define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+# else /* !__GNU__ */
+# define OPEN_MAX NOFILES_MAX
+# endif /* __GNU__ */
+# else /* !__UNIXOS2__ && !__QNX__ */
+# define OPEN_MAX 256
+# endif /* __UNIXOS2__ */
+# endif
+# endif
+# endif
+# endif
+# endif
+
+# ifdef __GNU__
+# define FS_OPEN_MAX 256
+# else /*!__GNU__*/
+# if OPEN_MAX > 256
+# define FS_OPEN_MAX 256
+# else
+# define FS_OPEN_MAX OPEN_MAX
+# endif
+# endif /*__GNU__*/
-#endif /* FS_OPEN_MAX */
+# endif /* FS_OPEN_MAX */
/* Utek leaves kernel macros around in include files (bleah) */
-#ifdef dirty
-#undef dirty
-#endif
+# ifdef dirty
+# undef dirty
+# endif
-#define NMSKBITS 32
-#define MSKCNT ((FS_OPEN_MAX + NMSKBITS - 1) / NMSKBITS)
+# define NMSKBITS 32
+# define MSKCNT ((FS_OPEN_MAX + NMSKBITS - 1) / NMSKBITS)
-#ifdef LONG64
+# ifdef LONG64
typedef unsigned int FdSet[MSKCNT];
-#else
+# else
typedef unsigned long FdSet[MSKCNT];
-#endif
+# endif
-#if (MSKCNT==1)
-#define BITMASK(i) (1 << (i))
-#define MASKIDX(i) 0
-#endif
+# if (MSKCNT==1)
+# define BITMASK(i) (1 << (i))
+# define MASKIDX(i) 0
+# endif
-#if (MSKCNT>1)
-#define BITMASK(i) (1 << ((i) & (NMSKBITS - 1)))
-#define MASKIDX(i) ((i) / NMSKBITS)
-#endif
+# if (MSKCNT>1)
+# define BITMASK(i) (1 << ((i) & (NMSKBITS - 1)))
+# define MASKIDX(i) ((i) / NMSKBITS)
+# endif
-#define MASKWORD(buf, i) buf[MASKIDX(i)]
-#define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i)
-#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i)
-#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
-
-#if (MSKCNT==1)
-#define COPYBITS(src, dst) dst[0] = src[0]
-#define CLEARBITS(buf) buf[0] = 0
-#define MASKANDSETBITS(dst, b1, b2) dst[0] = (b1[0] & b2[0])
-#define ORBITS(dst, b1, b2) dst[0] = (b1[0] | b2[0])
-#define UNSETBITS(dst, b1) (dst[0] &= ~b1[0])
-#define _FSANYSET(src) (src[0])
-#endif
+# define MASKWORD(buf, i) buf[MASKIDX(i)]
+# define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i)
+# define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i)
+# define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
+
+# if (MSKCNT==1)
+# define COPYBITS(src, dst) dst[0] = src[0]
+# define CLEARBITS(buf) buf[0] = 0
+# define MASKANDSETBITS(dst, b1, b2) dst[0] = (b1[0] & b2[0])
+# define ORBITS(dst, b1, b2) dst[0] = (b1[0] | b2[0])
+# define UNSETBITS(dst, b1) (dst[0] &= ~b1[0])
+# define _FSANYSET(src) (src[0])
+# endif
-#if (MSKCNT==2)
-#define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; }
-#define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; }
-#define MASKANDSETBITS(dst, b1, b2) {\
+# if (MSKCNT==2)
+# define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; }
+# define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; }
+# define MASKANDSETBITS(dst, b1, b2) {\
dst[0] = (b1[0] & b2[0]);\
dst[1] = (b1[1] & b2[1]); }
-#define ORBITS(dst, b1, b2) {\
+# define ORBITS(dst, b1, b2) {\
dst[0] = (b1[0] | b2[0]);\
dst[1] = (b1[1] | b2[1]); }
-#define UNSETBITS(dst, b1) {\
+# define UNSETBITS(dst, b1) {\
dst[0] &= ~b1[0]; \
dst[1] &= ~b1[1]; }
-#define _FSANYSET(src) (src[0] || src[1])
-#endif
+# define _FSANYSET(src) (src[0] || src[1])
+# endif
-#if (MSKCNT==3)
-#define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; \
+# if (MSKCNT==3)
+# define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; \
dst[2] = src[2]; }
-#define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; buf[2] = 0; }
-#define MASKANDSETBITS(dst, b1, b2) {\
+# define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; buf[2] = 0; }
+# define MASKANDSETBITS(dst, b1, b2) {\
dst[0] = (b1[0] & b2[0]);\
dst[1] = (b1[1] & b2[1]);\
dst[2] = (b1[2] & b2[2]); }
-#define ORBITS(dst, b1, b2) {\
+# define ORBITS(dst, b1, b2) {\
dst[0] = (b1[0] | b2[0]);\
dst[1] = (b1[1] | b2[1]);\
dst[2] = (b1[2] | b2[2]); }
-#define UNSETBITS(dst, b1) {\
+# define UNSETBITS(dst, b1) {\
dst[0] &= ~b1[0]; \
dst[1] &= ~b1[1]; \
dst[2] &= ~b1[2]; }
-#define _FSANYSET(src) (src[0] || src[1] || src[2])
-#endif
+# define _FSANYSET(src) (src[0] || src[1] || src[2])
+# endif
-#if (MSKCNT==4)
-#define COPYBITS(src, dst) dst[0] = src[0]; dst[1] = src[1]; \
+# if (MSKCNT==4)
+# define COPYBITS(src, dst) dst[0] = src[0]; dst[1] = src[1]; \
dst[2] = src[2]; dst[3] = src[3]
-#define CLEARBITS(buf) buf[0] = 0; buf[1] = 0; buf[2] = 0; buf[3] = 0
-#define MASKANDSETBITS(dst, b1, b2) \
+# define CLEARBITS(buf) buf[0] = 0; buf[1] = 0; buf[2] = 0; buf[3] = 0
+# define MASKANDSETBITS(dst, b1, b2) \
dst[0] = (b1[0] & b2[0]);\
dst[1] = (b1[1] & b2[1]);\
dst[2] = (b1[2] & b2[2]);\
dst[3] = (b1[3] & b2[3])
-#define ORBITS(dst, b1, b2) \
+# define ORBITS(dst, b1, b2) \
dst[0] = (b1[0] | b2[0]);\
dst[1] = (b1[1] | b2[1]);\
dst[2] = (b1[2] | b2[2]);\
dst[3] = (b1[3] | b2[3])
-#define UNSETBITS(dst, b1) \
+# define UNSETBITS(dst, b1) \
dst[0] &= ~b1[0]; \
dst[1] &= ~b1[1]; \
dst[2] &= ~b1[2]; \
dst[3] &= ~b1[3]
-#define _FSANYSET(src) (src[0] || src[1] || src[2] || src[3])
-#endif
+# define _FSANYSET(src) (src[0] || src[1] || src[2] || src[3])
+# endif
-#if (MSKCNT>4)
-#define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src, sizeof(FdSet))
-#define CLEARBITS(buf) bzero((caddr_t) buf, sizeof(FdSet))
-#define MASKANDSETBITS(dst, b1, b2) \
+# if (MSKCNT>4)
+# define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src, sizeof(FdSet))
+# define CLEARBITS(buf) bzero((caddr_t) buf, sizeof(FdSet))
+# define MASKANDSETBITS(dst, b1, b2) \
{ int cri; \
for (cri=0; cri4 and not 8, then _FSANYSET is a routine defined in FSlibInt.c.
*
* #define _FSANYSET(src) (src[0] || src[1] || src[2] || src[3] || src[4] ...)
*/
-#endif
+# endif
#else
-#include
-#include
+# include
+# include
typedef fd_set FdSet;
-#define CLEARBITS(set) FD_ZERO(&set)
-#define BITSET(set,s) FD_SET(s,&set)
-#define _FSANYSET(set) set.fd_count
+# define CLEARBITS(set) FD_ZERO(&set)
+# define BITSET(set,s) FD_SET(s,&set)
+# define _FSANYSET(set) set.fd_count
#endif
@@ -281,15 +279,15 @@
*/
#ifdef MALLOC_0_RETURNS_NULL
-#define FSmalloc(size) malloc(((size) > 0 ? (size) : 1))
-#define FSrealloc(ptr, size) realloc((ptr), ((size) > 0 ? (size) : 1))
-#define FScalloc(nelem, elsize) calloc(((nelem) > 0 ? (nelem) : 1), (elsize))
+# define FSmalloc(size) malloc(((size) > 0 ? (size) : 1))
+# define FSrealloc(ptr, size) realloc((ptr), ((size) > 0 ? (size) : 1))
+# define FScalloc(nelem, elsize) calloc(((nelem) > 0 ? (nelem) : 1), (elsize))
#else
-#define FSmalloc(size) malloc((size))
-#define FSrealloc(ptr, size) realloc((ptr), (size))
-#define FScalloc(nelem, elsize) calloc((nelem), (elsize))
+# define FSmalloc(size) malloc((size))
+# define FSrealloc(ptr, size) realloc((ptr), (size))
+# define FScalloc(nelem, elsize) calloc((nelem), (elsize))
#endif
#define SearchString(string, char) index((string), (char))
