libfs: Changes to 'upstream-unstable'
.gitignore | 1
COPYING | 71 ++++++++++++++-
ChangeLog | 56 ------------
Makefile.am | 17 +++
configure.ac | 23 +----
src/FSClServ.c | 3
src/FSCloseFt.c | 6 -
src/FSConnServ.c | 18 +--
src/FSErrDis.c | 26 ++---
src/FSFlush.c | 3
src/FSFontInfo.c | 18 +--
src/FSFtNames.c | 13 +-
src/FSGetCats.c | 6 -
src/FSListCats.c | 13 +-
src/FSListExt.c | 9 -
src/FSMisc.c | 3
src/FSNextEv.c | 6 -
src/FSOpenFont.c | 12 +-
src/FSOpenServ.c | 12 +-
src/FSQGlyphs.c | 37 +++-----
src/FSQXExt.c | 28 +++---
src/FSQXInfo.c | 14 +--
src/FSQuExt.c | 12 +-
src/FSServName.c | 4
src/FSSetCats.c | 8 -
src/FSSync.c | 6 -
src/FSSynchro.c | 6 -
src/FSlibInt.c | 240 +++++++++++++++++++++++++----------------------------
src/Makefile.am | 19 ++++
src/fs_transport.c | 2
30 files changed, 352 insertions(+), 340 deletions(-)
New commits:
commit 9cbdb6ab49d8f9e6174a00d6b509bf6f1e3c1e78
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed May 21 18:40:05 2008 -0700
Version 1.0.1
diff --git a/configure.ac b/configure.ac
index a18e74c..4d6d03a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,16 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-dnl
-dnl Version should match the current XFixes version. XFixesQueryVersion
-dnl returns the version from xfixeswire.h, NOT the version we set here. But we
-dnl try to keep these the same. Note that the library has an extra
-dnl digit in the version number to track changes which don't affect the
-dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n,
-dnl that 'revision' number appears in Xfixes.h and has to be manually
-dnl synchronized.
-dnl
-AC_INIT(libFS, 1.0.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS)
+AC_INIT(libFS, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 16c85877e9754dfc83b7c60c9892a85d1ac14eaa
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed May 21 17:44:21 2008 -0700
Replace sprintf with snprintf
diff --git a/src/FSErrDis.c b/src/FSErrDis.c
index 183f563..244e0a4 100644
--- a/src/FSErrDis.c
+++ b/src/FSErrDis.c
@@ -105,7 +105,7 @@ int FSGetErrorText(
if (nbytes == 0)
return 0;
- sprintf(buf, "%d", code);
+ snprintf(buf, sizeof(buf), "%d", code);
if (code <= (FSErrorListSize / sizeof(char *)) && code > 0) {
defaultp = FSErrorList[code];
FSGetErrorDatabaseText(svr, "FSProtoError", buf, defaultp, buffer, nbytes);
diff --git a/src/FSlibInt.c b/src/FSlibInt.c
index f4e7230..ac0b26c 100644
--- a/src/FSlibInt.c
+++ b/src/FSlibInt.c
@@ -1027,7 +1027,7 @@ _FSPrintDefaultError(
"Request Major code %d", mesg, BUFSIZ);
(void) fprintf(fp, mesg, event->request_code);
if (event->request_code < 128) {
- sprintf(number, "%d", event->request_code);
+ snprintf(number, sizeof(number), "%d", event->request_code);
(void) FSGetErrorDatabaseText(svr, "FSRequest", number, "", buffer,
BUFSIZ);
} else {
@@ -1044,7 +1044,7 @@ _FSPrintDefaultError(
"Request Minor code %d", mesg, BUFSIZ);
(void) fprintf(fp, mesg, event->minor_code);
if (ext) {
- sprintf(mesg, "%s.%d", ext->name, event->minor_code);
+ snprintf(mesg, sizeof(mesg), "%s.%d", ext->name, event->minor_code);
(void) FSGetErrorDatabaseText(svr, "FSRequest", mesg, "", buffer,
BUFSIZ);
(void) fprintf(fp, " (%s)", buffer);
commit 485308a08afe17e9486f8123c775b3e728d8d88f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed May 21 17:31:15 2008 -0700
Add hooks to check code with static analyzers like lint & sparse
diff --git a/Makefile.am b/Makefile.am
index b7b46bb..0062daf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,3 +35,8 @@ ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
+
+if LINT
+lint:
+ (cd src && $(MAKE) $(MFLAGS) lint)
+endif LINT
diff --git a/configure.ac b/configure.ac
index 6268135..a18e74c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,10 @@ 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
@@ -56,10 +60,11 @@ AC_SUBST(XTRANS_LIBS)
XTRANS_CONNECTION_FLAGS
XORG_CHECK_MALLOC_ZERO
-
-# Check fixesext configuration, strip extra digits from package version to
-# find the required protocol version
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([FS])
+
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 50b70b0..a9a347b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,3 +40,22 @@ libFS_la_LDFLAGS = -version-number 6:0:0 -no-undefined
libFSincludedir = $(includedir)/X11/fonts
libFSinclude_HEADERS = \
$(top_srcdir)/include/X11/fonts/FSlib.h
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libFS_la_SOURCES) \
+ $(libFS_la_LIBADD) $(LIBS)
+endif LINT
+
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB)
+
+$(LINTLIB): $(libFS_la_SOURCES)
+ $(LINT) -y -oFS -x $(ALL_LINT_FLAGS) $(libFS_la_SOURCES) \
+ $(libFS_la_LIBADD) $(LIBS)
+endif MAKE_LINT_LIB
commit 0a64482e6dcd636b9c8b2f38ecfed7945adfdb39
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed May 21 17:00:06 2008 -0700
Put all copyright/license notices into COPYING file
diff --git a/COPYING b/COPYING
index e506314..c175e11 100644
--- a/COPYING
+++ b/COPYING
@@ -1,16 +1,81 @@
+Copyright 1987, 1994, 1998 The Open Group
-Copyright © 2001,2003 Keith Packard
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1990 Network Computing Devices;
+Portions Copyright 1987 by Digital Equipment Corporation
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation, and that the names of Network Computing
+Devices or Digital not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission. Network Computing Devices or Digital make no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES
+OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Copyright 2005 Red Hat, Inc
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
+documentation, and that the name of Red Hat not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Red Hat makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2001,2003 Keith Packard
+Copyright 2003 Keith Packard, Noah Levitt
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
documentation, and that the name of Keith Packard not be used in
advertising or publicity pertaining to distribution of the software without
specific, written prior permission. Keith Packard makes no
representations about the suitability of this software for any purpose. It
is provided "as is" without express or implied warranty.
-
+
KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -18,4 +83,3 @@ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-
commit 501f667cca6674704ad623a08918246ba2d2692d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Mar 4 17:41:18 2008 -0300
libFS ansification.
diff --git a/src/FSClServ.c b/src/FSClServ.c
index 1866cfc..3751c28 100644
--- a/src/FSClServ.c
+++ b/src/FSClServ.c
@@ -61,8 +61,7 @@ in this Software without prior written authorization from The Open Group.
extern FSServer *_FSHeadOfServerList;
int
-FSCloseServer(svr)
- FSServer *svr;
+FSCloseServer(FSServer *svr)
{
_FSExtension *ext;
FSServer **sv = &_FSHeadOfServerList;
diff --git a/src/FSCloseFt.c b/src/FSCloseFt.c
index 38ce7e6..9b0dce8 100644
--- a/src/FSCloseFt.c
+++ b/src/FSCloseFt.c
@@ -58,9 +58,9 @@ in this Software without prior written authorization from The Open Group.
int
-FSCloseFont(svr, fid)
- FSServer *svr;
- Font fid;
+FSCloseFont(
+ FSServer *svr,
+ Font fid)
{
fsResourceReq *req;
diff --git a/src/FSConnServ.c b/src/FSConnServ.c
index 6a66d87..d4d1472 100644
--- a/src/FSConnServ.c
+++ b/src/FSConnServ.c
@@ -79,8 +79,7 @@ in this Software without prior written authorization from The Open Group.
#define FS_CONNECTION_RETRIES 5
XtransConnInfo
-_FSConnectServer(server_name)
- char *server_name;
+_FSConnectServer(char *server_name)
{
XtransConnInfo trans_conn = NULL; /* transport connection object */
int retry, connect_stat;
@@ -135,8 +134,7 @@ _FSConnectServer(server_name)
*/
void
-_FSDisconnectServer(trans_conn)
- XtransConnInfo trans_conn;
+_FSDisconnectServer(XtransConnInfo trans_conn)
{
(void) _FSTransClose(trans_conn);
@@ -149,8 +147,7 @@ _FSDisconnectServer(trans_conn)
* 2) if the connection can be read, must enqueue events and handle errors,
* until the connection is writable.
*/
-void _FSWaitForWritable(svr)
- FSServer *svr;
+void _FSWaitForWritable(FSServer *svr)
{
fd_set r_mask;
fd_set w_mask;
@@ -212,8 +209,7 @@ void _FSWaitForWritable(svr)
}
-void _FSWaitForReadable(svr)
- FSServer *svr;
+void _FSWaitForReadable(FSServer *svr)
{
fd_set r_mask;
int result;
@@ -227,9 +223,9 @@ void _FSWaitForReadable(svr)
} while (result <= 0);
}
-void _FSSendClientPrefix(svr, client)
- FSServer *svr;
- fsConnClientPrefix *client;
+void _FSSendClientPrefix(
+ FSServer *svr,
+ fsConnClientPrefix *client)
{
struct iovec iovarray[5],
*iov = iovarray;
diff --git a/src/FSErrDis.c b/src/FSErrDis.c
index cc4abf4..183f563 100644
--- a/src/FSErrDis.c
+++ b/src/FSErrDis.c
@@ -76,13 +76,13 @@ int FSErrorListSize = sizeof(FSErrorList);
/* ARGSUSED */
-int FSGetErrorDatabaseText(svr, name, type, defaultp, buffer, nbytes)
- register char *name,
- *type;
- char *defaultp;
- FSServer *svr;
- char *buffer;
- int nbytes;
+int FSGetErrorDatabaseText(
+ FSServer *svr,
+ register char *name,
+ register char *type,
+ char *defaultp,
+ char *buffer,
+ int nbytes)
{
if (nbytes == 0)
return 0;
@@ -92,11 +92,11 @@ int FSGetErrorDatabaseText(svr, name, type, defaultp, buffer, nbytes)
return 1;
}
-int FSGetErrorText(svr, code, buffer, nbytes)
- register int code;
- register FSServer *svr;
- char *buffer;
- int nbytes;
+int FSGetErrorText(
+ register FSServer *svr,
+ register int code,
+ char *buffer,
+ int nbytes)
{
char *defaultp = NULL;
diff --git a/src/FSFlush.c b/src/FSFlush.c
index e4b1439..924a0bb 100644
--- a/src/FSFlush.c
+++ b/src/FSFlush.c
@@ -55,8 +55,7 @@ in this Software without prior written authorization from The Open Group.
#endif
#include "FSlibint.h"
-int FSFlush(svr)
- FSServer *svr;
+int FSFlush(FSServer *svr)
{
_FSFlush(svr);
return 1;
diff --git a/src/FSFontInfo.c b/src/FSFontInfo.c
index d79ad9e..0b79613 100644
--- a/src/FSFontInfo.c
+++ b/src/FSFontInfo.c
@@ -56,15 +56,15 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
char **
-FSListFontsWithXInfo(svr, pattern, maxNames, count, info, pprops, offsets, prop_data)
- FSServer *svr;
- char *pattern;
- int maxNames;
- int *count;
- FSXFontInfoHeader ***info;
- FSPropInfo ***pprops;
- FSPropOffset ***offsets;
- unsigned char ***prop_data;
+FSListFontsWithXInfo(
+ FSServer *svr,
+ char *pattern,
+ int maxNames,
+ int *count,
+ FSXFontInfoHeader ***info,
+ FSPropInfo ***pprops,
+ FSPropOffset ***offsets,
+ unsigned char ***prop_data)
{
long nbytes;
int i,
diff --git a/src/FSFtNames.c b/src/FSFtNames.c
index 2d512e4..733da35 100644
--- a/src/FSFtNames.c
+++ b/src/FSFtNames.c
@@ -57,11 +57,11 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
char **
-FSListFonts(svr, pattern, maxNames, actualCount)
- FSServer *svr;
- char *pattern;
- int maxNames;
- int *actualCount;
+FSListFonts(
+ FSServer *svr,
+ char *pattern,
+ int maxNames,
+ int *actualCount)
{
long nbytes;
int i,
@@ -120,8 +120,7 @@ FSListFonts(svr, pattern, maxNames, actualCount)
}
-int FSFreeFontNames(list)
- char **list;
+int FSFreeFontNames(char **list)
{
if (list) {
FSfree(list[0] - 1);
diff --git a/src/FSGetCats.c b/src/FSGetCats.c
index 39792f6..36a134b 100644
--- a/src/FSGetCats.c
+++ b/src/FSGetCats.c
@@ -57,9 +57,9 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
char **
-FSGetCatalogues(svr, num)
- FSServer *svr;
- int *num;
+FSGetCatalogues(
+ FSServer *svr,
+ int *num)
{
fsGetCataloguesReply rep;
char **list;
diff --git a/src/FSListCats.c b/src/FSListCats.c
index 99b5400..36c5326 100644
--- a/src/FSListCats.c
+++ b/src/FSListCats.c
@@ -57,11 +57,11 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
char **
-FSListCatalogues(svr, pattern, maxNames, actualCount)
- FSServer *svr;
- char *pattern;
- int maxNames;
- int *actualCount;
+FSListCatalogues(
+ FSServer *svr,
+ char *pattern,
+ int maxNames,
+ int *actualCount)
{
long nbytes;
int i,
@@ -121,8 +121,7 @@ FSListCatalogues(svr, pattern, maxNames, actualCount)
}
-int FSFreeCatalogues(list)
- char **list;
+int FSFreeCatalogues(char **list)
{
if (list) {
FSfree(list[0] - 1);
diff --git a/src/FSListExt.c b/src/FSListExt.c
index 0f42f59..4eab13d 100644
--- a/src/FSListExt.c
+++ b/src/FSListExt.c
@@ -58,9 +58,9 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
char **
-FSListExtensions(svr, next)
- FSServer *svr;
- int *next;
+FSListExtensions(
+ FSServer *svr,
+ int *next)
{
fsListExtensionsReply rep;
char **list;
@@ -114,8 +114,7 @@ FSListExtensions(svr, next)
}
-int FSFreeExtensionList(list)
- char **list;
+int FSFreeExtensionList(char **list)
{
if (list != NULL) {
FSfree(list[0] - 1);
diff --git a/src/FSMisc.c b/src/FSMisc.c
index af0e78c..fd17440 100644
--- a/src/FSMisc.c
+++ b/src/FSMisc.c
@@ -57,8 +57,7 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
long
-FSMaxRequestSize(svr)
- FSServer *svr;
+FSMaxRequestSize(FSServer *svr)
{
return svr->max_request_size;
}
diff --git a/src/FSNextEv.c b/src/FSNextEv.c
index 69e009d..8a80fd9 100644
--- a/src/FSNextEv.c
+++ b/src/FSNextEv.c
@@ -58,9 +58,9 @@ in this Software without prior written authorization from The Open Group.
extern _FSQEvent *_FSqfree;
-int FSNextEvent(svr, event)
- FSServer *svr;
- FSEvent *event;
+int FSNextEvent(
+ FSServer *svr,
+ FSEvent *event)
{
_FSQEvent *qelt;
diff --git a/src/FSOpenFont.c b/src/FSOpenFont.c
index da6889a..b2097fa 100644
--- a/src/FSOpenFont.c
+++ b/src/FSOpenFont.c
@@ -58,12 +58,12 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
Font
-FSOpenBitmapFont(svr, hint, fmask, name, otherid)
- FSServer *svr;
- FSBitmapFormat hint;
- FSBitmapFormatMask fmask;
- char *name;
- Font *otherid;
+FSOpenBitmapFont(
+ FSServer *svr,
+ FSBitmapFormat hint,
+ FSBitmapFormatMask fmask,
+ char *name,
+ Font *otherid)
{
unsigned int nbytes;
fsOpenBitmapFontReq *req;
diff --git a/src/FSOpenServ.c b/src/FSOpenServ.c
index 6625779..d547fa4 100644
--- a/src/FSOpenServ.c
+++ b/src/FSOpenServ.c
@@ -73,8 +73,7 @@ static void OutOfMemory ( FSServer *svr, char *setup );
FSServer *_FSHeadOfServerList = NULL;
-void _FSFreeServerStructure(svr)
- FSServer *svr;
+void _FSFreeServerStructure(FSServer *svr)
{
if (svr->server_name)
FSfree(svr->server_name);
@@ -88,9 +87,9 @@ void _FSFreeServerStructure(svr)
}
static
-void OutOfMemory(svr, setup)
- FSServer *svr;
- char *setup;
+void OutOfMemory(
+ FSServer *svr,
+ char *setup)
{
_FSDisconnectServer(svr->trans_conn);
@@ -105,8 +104,7 @@ void OutOfMemory(svr, setup)
*/
FSServer *
-FSOpenServer(server)
- char *server;
+FSOpenServer(char *server)
{
FSServer *svr;
int i;
diff --git a/src/FSQGlyphs.c b/src/FSQGlyphs.c
index 5ba2eb0..0b3b5bd 100644
--- a/src/FSQGlyphs.c
+++ b/src/FSQGlyphs.c
@@ -57,15 +57,15 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
int
-FSQueryXBitmaps8(svr, fid, format, range_type, str, str_len, offsets, glyphdata)
- FSServer *svr;
- Font fid;
- FSBitmapFormat format;
- Bool range_type;
- unsigned char *str;
- unsigned long str_len;
- FSOffset **offsets;
- unsigned char **glyphdata;
+FSQueryXBitmaps8(
+ FSServer *svr,
+ Font fid,
+ FSBitmapFormat format,
+ Bool range_type,
+ unsigned char *str,
+ unsigned long str_len,
+ FSOffset **offsets,
+ unsigned char **glyphdata)
{
fsQueryXBitmaps8Req *req;
fsQueryXBitmaps8Reply reply;
@@ -126,16 +126,15 @@ FSQueryXBitmaps8(svr, fid, format, range_type, str, str_len, offsets, glyphdata)
}
int
-FSQueryXBitmaps16(svr, fid, format, range_type, str, str_len,
- offsets, glyphdata)
- FSServer *svr;
- Font fid;
- FSBitmapFormat format;
- Bool range_type;
- FSChar2b *str;
- unsigned long str_len;
- FSOffset **offsets;
- unsigned char **glyphdata;
+FSQueryXBitmaps16(
+ FSServer *svr,
+ Font fid,
+ FSBitmapFormat format,
+ Bool range_type,
+ FSChar2b *str,
+ unsigned long str_len,
+ FSOffset **offsets,
+ unsigned char **glyphdata)
{
fsQueryXBitmaps16Req *req;
fsQueryXBitmaps16Reply reply;
diff --git a/src/FSQXExt.c b/src/FSQXExt.c
index e240d3a..fd182d3 100644
--- a/src/FSQXExt.c
+++ b/src/FSQXExt.c
@@ -69,13 +69,13 @@ _FS_convert_char_info(fsXCharInfo *src, FSXCharInfo *dst)
}
int
-FSQueryXExtents8(svr, fid, range_type, str, str_len, extents)
- FSServer *svr;
- Font fid;
- Bool range_type;
- unsigned char *str;
- unsigned long str_len;
- FSXCharInfo **extents;
+FSQueryXExtents8(
+ FSServer *svr,
+ Font fid,
+ Bool range_type,
+ unsigned char *str,
+ unsigned long str_len,
+ FSXCharInfo **extents)
{
fsQueryXExtents8Req *req;
fsQueryXExtents8Reply reply;
@@ -115,13 +115,13 @@ FSQueryXExtents8(svr, fid, range_type, str, str_len, extents)
}
int
-FSQueryXExtents16(svr, fid, range_type, str, str_len, extents)
- FSServer *svr;
- Font fid;
- Bool range_type;
- FSChar2b *str;
- unsigned long str_len;
- FSXCharInfo **extents;
+FSQueryXExtents16(
+ FSServer *svr,
+ Font fid,
+ Bool range_type,
+ FSChar2b *str,
+ unsigned long str_len,
+ FSXCharInfo **extents)
{
fsQueryXExtents16Req *req;
fsQueryXExtents16Reply reply;
diff --git a/src/FSQXInfo.c b/src/FSQXInfo.c
index 083f95d..d3dabf4 100644
--- a/src/FSQXInfo.c
+++ b/src/FSQXInfo.c
@@ -62,13 +62,13 @@ in this Software without prior written authorization from The Open Group.
*/
int
-FSQueryXInfo(svr, fid, info, props, offsets, prop_data)
- FSServer *svr;
- Font fid;
- FSXFontInfoHeader *info;
- FSPropInfo *props;
- FSPropOffset **offsets;
- unsigned char **prop_data;
+FSQueryXInfo(
+ FSServer *svr,
+ Font fid,
+ FSXFontInfoHeader *info,
+ FSPropInfo *props,
+ FSPropOffset **offsets,
+ unsigned char **prop_data)
{
fsQueryXInfoReq *req;
fsQueryXInfoReply reply;
diff --git a/src/FSQuExt.c b/src/FSQuExt.c
index 198bcee..8ba8080 100644
--- a/src/FSQuExt.c
+++ b/src/FSQuExt.c
@@ -57,12 +57,12 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
Bool
-FSQueryExtension(svr, name, major_opcode, first_event, first_error)
- FSServer *svr;
- char *name;
- int *major_opcode;
- int *first_event;
- int *first_error;
+FSQueryExtension(
+ FSServer *svr,
+ char *name,
+ int *major_opcode,
+ int *first_event,
+ int *first_error)
{
fsQueryExtensionReply rep;
fsQueryExtensionReq *req;
diff --git a/src/FSServName.c b/src/FSServName.c
index 886ffa5..7fadd9c 100644
--- a/src/FSServName.c
+++ b/src/FSServName.c
@@ -58,10 +58,10 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h>
#include <X11/Xosdefs.h>
#include <stdlib.h>
+#include "FSlib.h"
char *
-FSServerName(server)
- char *server;
+FSServerName(char *server)
{
char *s;
diff --git a/src/FSSetCats.c b/src/FSSetCats.c
index 194ce45..a2c0142 100644
--- a/src/FSSetCats.c
+++ b/src/FSSetCats.c
@@ -58,10 +58,10 @@ in this Software without prior written authorization from The Open Group.
#include "FSlibint.h"
int
-FSSetCatalogues(svr, num, cats)
- FSServer *svr;
- int num;
- char **cats;
+FSSetCatalogues(
+ FSServer *svr,
+ int num,
+ char **cats)
{
int nbytes;
fsSetCataloguesReq *req;
diff --git a/src/FSSync.c b/src/FSSync.c
index eefd031..4991bd3 100644
--- a/src/FSSync.c
+++ b/src/FSSync.c
@@ -60,9 +60,9 @@ extern _FSQEvent *_FSqfree;
/* synchronize with errors and events */
-int FSSync(svr, discard)
- FSServer *svr;
- Bool discard;
+int FSSync(
+ FSServer *svr,
+ Bool discard)
{
fsListExtensionsReply rep;
fsReq *req;
diff --git a/src/FSSynchro.c b/src/FSSynchro.c
index c1c2d31..79c0f40 100644
--- a/src/FSSynchro.c
+++ b/src/FSSynchro.c
@@ -79,9 +79,9 @@ FSSynchronize(FSServer *svr, int onoff)
}
FSSyncHandler
-FSSetAfterFunction(svr, func)
- FSServer *svr;
- FSSyncHandler func;
+FSSetAfterFunction(
+ FSServer *svr,
+ FSSyncHandler func)
{
FSSyncHandler temp;
diff --git a/src/FSlibInt.c b/src/FSlibInt.c
index 3e1ac54..f4e7230 100644
--- a/src/FSlibInt.c
+++ b/src/FSlibInt.c
@@ -131,8 +131,7 @@ static fsReq _dummy_request = {
* This routine may have to be reworked if int < long.
*/
void
-_FSFlush(svr)
- register FSServer *svr;
+_FSFlush(register FSServer *svr)
{
register long size,
todo;
@@ -177,9 +176,9 @@ _FSFlush(svr)
}
int
-_FSEventsQueued(svr, mode)
- register FSServer *svr;
- int mode;
+_FSEventsQueued(
+ register FSServer *svr,
+ int mode)
{
register BytesReadable_t len;
BytesReadable_t pend;
@@ -216,8 +215,7 @@ _FSEventsQueued(svr, mode)
* then read as many events as possible (but at least 1) and enqueue them
*/
void
-_FSReadEvents(svr)
- register FSServer *svr;
+_FSReadEvents(register FSServer *svr)
{
char buf[BUFSIZE];
BytesReadable_t pend_not_register; /* because can't "&" a register
@@ -274,10 +272,10 @@ _FSReadEvents(svr)
* reads. This routine may have to be reworked if int < long.
*/
void
-_FSRead(svr, data, size)
- register FSServer *svr;
- register char *data;
- register long size;
+_FSRead(
+ register FSServer *svr,
+ register char *data,
+ register long size)
{
register long bytes_read;
#if defined(SVR4) && defined(i386)
@@ -349,11 +347,11 @@ _FSRead(svr, data, size)
*
*/
static void
-_doFSRead32(svr, data, size, packbuffer)
- register FSServer *svr;
- register long *data;
- register long size;
- register char *packbuffer;
+_doFSRead32(
+ register FSServer *svr,
+ register long *data,
+ register long size,
+ register char *packbuffer)
{
long *lpack,
*lp;
@@ -381,10 +379,10 @@ _doFSRead32(svr, data, size, packbuffer)
}
void
-_FSRead32(svr, data, len)
- FSServer *svr;
- long *data;
- long len;
+_FSRead32(
+ FSServer *svr,
+ long *data,
+ long len)
{
char packbuffer[PACKBUFFERSIZE];
unsigned nwords = (PACKBUFFERSIZE >> 2); /* bytes to CARD32 */
@@ -403,11 +401,11 @@ _FSRead32(svr, data, len)
*
*/
static void
-_doFSRead16(svr, data, size, packbuffer)
- register FSServer *svr;
- register short *data;
- register long size;
- char *packbuffer;
+_doFSRead16(
+ register FSServer *svr,
+ register short *data,
+ register long size,
+ char *packbuffer)
{
long *lpack,
*lp;
@@ -435,10 +433,10 @@ _doFSRead16(svr, data, size, packbuffer)
}
void
-_FSRead16(svr, data, len)
- FSServer *svr;
- short *data;
- long len;
+_FSRead16(
+ FSServer *svr,
+ short *data,
+ long len)
{
char packbuffer[PACKBUFFERSIZE];
unsigned nwords = (PACKBUFFERSIZE >> 1); /* bytes to CARD16 */
@@ -450,10 +448,10 @@ _FSRead16(svr, data, len)
}
void
-_FSRead16Pad(svr, data, size)
- FSServer *svr;
- short *data;
- long size;
Reply to: