summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-16 19:38:12 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-16 19:38:12 -0200
commitc39bd2f1085bb34493dc6e5ad8328ee106619e26 (patch)
tree4227913fabdadfa0240dd45faaee33d01638a7a9
parent40785f14202c645d9a2c99efa0356c00e8dd16ea (diff)
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects make distcheck and all gcc 4.3 and sparse warnings. To avoid warnings, several changes in the pseudo patch format - static int foo(); - static int foo(type *arg) { ... } + static int foo(void *); + static int foo(void *_arg) { type *arg = _arg; ... } were made, and all function pointer structure fields and arguments were also "ansified".
Diffstat
-rw-r--r--.gitignore4
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac9
-rw-r--r--di/atomcache.c31
-rw-r--r--di/cache.c47
-rw-r--r--di/cmap.c179
-rw-r--r--di/cmaputil.c130
-rw-r--r--di/dispatch.c44
-rw-r--r--di/extensions.c46
-rw-r--r--di/gfx.c177
-rw-r--r--di/init.c19
-rw-r--r--di/lbxfuncs.c147
-rw-r--r--di/lbxutil.c68
-rw-r--r--di/main.c11
-rw-r--r--di/options.c223
-rw-r--r--di/pm.c38
-rw-r--r--di/props.c30
-rw-r--r--di/reqtype.c8
-rw-r--r--di/resource.c51
-rw-r--r--di/swaprep.c68
-rw-r--r--di/swapreq.c65
-rw-r--r--di/tables.c56
-rw-r--r--di/tags.c46
-rw-r--r--di/unsquish.c10
-rw-r--r--di/utils.c92
-rw-r--r--di/wire.c184
-rw-r--r--di/zeropad.c282
-rw-r--r--include/cache.h2
-rw-r--r--include/lbx.h140
-rw-r--r--include/lbxext.h19
-rw-r--r--include/os.h24
-rw-r--r--include/proxyopts.h4
-rw-r--r--include/tags.h4
-rw-r--r--include/util.h4
-rw-r--r--include/wire.h8
-rw-r--r--os/WaitFor.c4
-rw-r--r--os/connection.c101
-rw-r--r--os/io.c84
-rw-r--r--os/lbxproxytrans.c8
-rw-r--r--os/osdep.h21
-rw-r--r--os/osinit.c3
41 files changed, 887 insertions, 1606 deletions
diff --git a/.gitignore b/.gitignore
index 671c88f..fe83abc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ lbxproxy.1
missing
stamp-h1
*~
+*.o
+lbxproxy-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index ab5329f..a66b895 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -125,6 +125,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 96de6c7..53b4702 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,12 +26,18 @@ AC_INIT(lbxproxy,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
AC_CANONICAL_HOST
+XORG_CWARNFLAGS
+
case $host_os in
linux*|gnu*|*-gnu)
OS_CFLAGS="-D_XOPEN_SOURCE"
@@ -43,7 +49,7 @@ esac
# Checks for pkg-config packages
PKG_CHECK_MODULES(LBXPROXY, xtrans xext lbxutil x11 ice xproxymngproto bigreqsproto)
-LBXPROXY_CFLAGS="$LBXPROXY_CFLAGS $OS_CFLAGS"
+LBXPROXY_CFLAGS="$CWARNFLAGS $LBXPROXY_CFLAGS $OS_CFLAGS"
AC_SUBST(LBXPROXY_CFLAGS)
AC_SUBST(LBXPROXY_LIBS)
@@ -54,5 +60,6 @@ AC_CHECK_LIB(z,deflate)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])
diff --git a/di/atomcache.c b/di/atomcache.c
index 5cb214c..697b1c0 100644
--- a/di/atomcache.c
+++ b/di/atomcache.c
@@ -75,9 +75,7 @@ in this Software without prior written authorization from The Open Group.
#include "atomcache.h"
static int
-Hash(string, len)
- char *string;
- int len;
+Hash(char *string, int len)
{
int h;
@@ -90,8 +88,7 @@ Hash(string, len)
}
static Bool
-ResizeHashTable(server)
- XServerPtr server;
+ResizeHashTable(XServerPtr server)
{
int newHashSize;
int newHashMask;
@@ -134,9 +131,7 @@ ResizeHashTable(server)
}
static Bool
-ResizeReverseMap(server, atom)
- XServerPtr server;
- Atom atom;
+ResizeReverseMap(XServerPtr server, Atom atom)
{
int oldMapSize = 0;
@@ -167,12 +162,8 @@ ResizeReverseMap(server, atom)
}
Atom
-LbxMakeAtom(server, string, len, atom, makeit)
- XServerPtr server;
- char *string;
- Atom atom;
- unsigned len;
- int makeit;
+LbxMakeAtom(XServerPtr server, char *string, unsigned len,
+ Atom atom, int makeit)
{
AtomListPtr a;
int hash;
@@ -243,19 +234,15 @@ LbxMakeAtom(server, string, len, atom, makeit)
}
char *
-NameForAtom(server, atom)
- XServerPtr server;
- Atom atom;
+NameForAtom(XServerPtr server, Atom atom)
{
if (atom != None && atom <= server->lastAtom && server->reverseMap[atom])
return server->reverseMap[atom]->name;
- return 0;
+ return NULL;
}
unsigned
-FlagsForAtom(server, atom)
- XServerPtr server;
- Atom atom;
+FlagsForAtom(XServerPtr server, Atom atom)
{
if (atom != None && atom <= server->lastAtom && server->reverseMap[atom])
return server->reverseMap[atom]->flags;
@@ -263,7 +250,7 @@ FlagsForAtom(server, atom)
}
void
-FreeAtoms()
+FreeAtoms(void)
{
int i;
diff --git a/di/cache.c b/di/cache.c
index c3a3a4f..65e4c1a 100644
--- a/di/cache.c
+++ b/di/cache.c
@@ -96,9 +96,7 @@ typedef struct _cache {
*/
Cache
-CacheInit(server, maxsize)
- XServerPtr server;
- unsigned long maxsize;
+CacheInit(XServerPtr server, unsigned long maxsize)
{
Cache id;
CachePtr cache;
@@ -126,9 +124,7 @@ CacheInit(server, maxsize)
}
void
-CacheFreeCache(server, cid)
- XServerPtr server;
- Cache cid;
+CacheFreeCache(XServerPtr server, Cache cid)
{
CachePtr cache = server->caches[cid];
int i;
@@ -150,10 +146,7 @@ CacheFreeCache(server, cid)
}
static int
-hash(server, cid, id)
- XServerPtr server;
- Cache cid;
- CacheID id;
+hash(XServerPtr server, Cache cid, CacheID id)
{
CachePtr cache = server->caches[cid];
@@ -185,9 +178,7 @@ hash(server, cid, id)
}
static void
-rebuild_cache(server, cache)
- XServerPtr server;
- CachePtr cache;
+rebuild_cache(XServerPtr server, CachePtr cache)
{
int j;
CacheEntryPtr cp, next, **tails, *entries, **tptr, *cptr;
@@ -250,9 +241,7 @@ flush_cache(CachePtr cache, unsigned long needed)
}
Bool
-CacheTrimNeeded(server, cid)
- XServerPtr server;
- Cache cid;
+CacheTrimNeeded(XServerPtr server, Cache cid)
{
CachePtr cache = server->caches[cid];
@@ -260,22 +249,14 @@ CacheTrimNeeded(server, cid)
}
void
-CacheTrim(server, cid)
- XServerPtr server;
- Cache cid;
+CacheTrim(XServerPtr server, Cache cid)
{
flush_cache(server->caches[cid], 0);
}
Bool
-CacheStoreMemory(server, cid, id, data, size, free_func, can_flush)
- XServerPtr server;
- Cache cid;
- CacheID id;
- pointer data;
- unsigned long size;
- CacheFree free_func;
- Bool can_flush;
+CacheStoreMemory(XServerPtr server, Cache cid, CacheID id, pointer data,
+ unsigned long size, CacheFree free_func, Bool can_flush)
{
CacheEntryPtr cp, *head;
CachePtr cache = server->caches[cid];
@@ -305,11 +286,7 @@ CacheStoreMemory(server, cid, id, data, size, free_func, can_flush)
}
pointer
-CacheFetchMemory(server, cid, id, update)
- XServerPtr server;
- Cache cid;
- CacheID id;
- Bool update;
+CacheFetchMemory(XServerPtr server, Cache cid, CacheID id, Bool update)
{
CachePtr cache = server->caches[cid];
CacheEntryPtr cp,
@@ -327,11 +304,7 @@ CacheFetchMemory(server, cid, id, update)
}
void
-CacheFreeMemory(server, cacheid, cid, notify)
- XServerPtr server;
- Cache cacheid;
- CacheID cid;
- Bool notify;
+CacheFreeMemory(XServerPtr server, Cache cacheid, CacheID cid, Bool notify)
{
CachePtr cache = server->caches[cacheid];
CacheEntryPtr cp, *prev;
diff --git a/di/cmap.c b/di/cmap.c
index 1102ab5..3a499a7 100644
--- a/di/cmap.c
+++ b/di/cmap.c
@@ -65,13 +65,24 @@ from The Open Group.
#include "reqtype.h"
#include "lbxext.h"
-static void LocalAllocColor ();
-static void FoundPixel ();
-static Bool grab_cmap_reply();
-static Bool alloc_named_color_reply();
-static Bool alloc_color_cells_reply();
-static Bool alloc_color_planes_reply();
-static Bool lookup_color_reply();
+static void
+LocalAllocColor(ClientPtr client, Bool in_reply, ColormapPtr pmap,
+ CARD16 red, CARD16 green, CARD16 blue, Bool alloc_named,
+ CARD16 xred, CARD16 xgreen, CARD16 xblue);
+static void
+FoundPixel (ClientPtr client, Bool in_reply, ColormapPtr pmap, Entry *pent,
+ Bool alloc_named, CARD16 xred, CARD16 xgreen, CARD16 xblue);
+static Bool
+grab_cmap_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+alloc_named_color_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+alloc_color_cells_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+alloc_color_planes_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+lookup_color_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+
/* ------------------------------------------------------------------------- */
@@ -80,9 +91,7 @@ static Bool lookup_color_reply();
*/
void
-ResolveColor (pVisual, red, green, blue)
- LbxVisualPtr pVisual;
- CARD16 *red, *green, *blue;
+ResolveColor (LbxVisualPtr pVisual, CARD16 *red, CARD16 *green, CARD16 *blue)
{
int shift = 16 - pVisual->bitsPerRGB;
unsigned lim = (1 << pVisual->bitsPerRGB) - 1;
@@ -132,11 +141,7 @@ void (* LbxResolveColor)(
) = ResolveColor;
static Pixel
-find_cell(pent, num, rgb, channel)
- Entry *pent;
- int num;
- CARD32 rgb;
- int channel;
+find_cell(Entry *pent, int num, CARD32 rgb, int channel)
{
Pixel pixel, freep;
@@ -169,9 +174,7 @@ find_cell(pent, num, rgb, channel)
*/
Pixel
-FindFreePixel (pmap, red, green, blue)
- ColormapPtr pmap;
- CARD32 red, green, blue;
+FindFreePixel (ColormapPtr pmap, CARD32 red, CARD32 green, CARD32 blue)
{
Entry *pent;
Pixel pixel, p;
@@ -234,8 +237,7 @@ typedef struct _bignum {
((r)->lower = BIGNUMLOWER-1))
static void
-BigNumAdd (x, y, r)
- BigNumPtr x, y, r;
+BigNumAdd (BigNumPtr x, BigNumPtr y, BigNumPtr r)
{
BigNumLower lower, carry = 0;
@@ -249,12 +251,8 @@ BigNumAdd (x, y, r)
}
Entry *
-FindBestPixel(pmap, red, green, blue, channels)
- ColormapPtr pmap;
- CARD32 red,
- green,
- blue;
- int channels;
+FindBestPixel(ColormapPtr pmap, CARD32 red, CARD32 green, CARD32 blue,
+ int channels)
{
Entry *pent;
int num;
@@ -346,12 +344,8 @@ Entry * (* LbxFindBestPixel)(
dst = (*ptr++ * 65535) / lim
static CARD8 *
-DecodeChannel(pmap, pent, flags, channels, data)
- ColormapPtr pmap;
- Entry *pent;
- CARD8 flags;
- CARD8 channels;
- CARD8 *data;
+DecodeChannel(ColormapPtr pmap, Entry *pent, CARD8 flags,
+ CARD8 channels, CARD8 *data)
{
Bool px2;
Bool rgb2;
@@ -479,10 +473,7 @@ DecodeChannel(pmap, pent, flags, channels, data)
}
static void
-GotColormapGrab (pmap, flags, data)
- ColormapPtr pmap;
- CARD8 flags;
- CARD8 *data;
+GotColormapGrab (ColormapPtr pmap, CARD8 flags, CARD8 *data)
{
pmap->grab_status = CMAP_GRABBED;
@@ -525,12 +516,10 @@ GotColormapGrab (pmap, flags, data)
}
static void
-GrabCmap (client, pmap, red, green, blue, alloc_named, xred, xgreen, xblue)
- ClientPtr client;
- ColormapPtr pmap;
- CARD16 red, green, blue;
- Bool alloc_named;
- CARD16 xred, xgreen, xblue;
+GrabCmap (ClientPtr client, ColormapPtr pmap,
+ CARD16 red, CARD16 green, CARD16 blue,
+ Bool alloc_named,
+ CARD16 xred, CARD16 xgreen, CARD16 xblue)
{
xLbxGrabCmapReq req;
ReplyStuffPtr nr;
@@ -572,10 +561,7 @@ GrabCmap (client, pmap, red, green, blue, alloc_named, xred, xgreen, xblue)
}
static Bool
-grab_cmap_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+grab_cmap_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLbxGrabCmapReply *reply;
Entry *pent;
@@ -651,9 +637,7 @@ grab_cmap_reply(client, nr, data)
*/
void
-ReleaseCmap (client, pmap)
- ClientPtr client;
- ColormapPtr pmap;
+ReleaseCmap (ClientPtr client, ColormapPtr pmap)
{
xLbxReleaseCmapReq req;
@@ -675,11 +659,8 @@ ReleaseCmap (client, pmap)
/* ------------------------------------------------------------------------- */
static void
-DoAllocColorReply (client, in_reply, red, green, blue, pixel)
- ClientPtr client;
- Bool in_reply;
- CARD16 red, green, blue;
- Pixel pixel;
+DoAllocColorReply (ClientPtr client, Bool in_reply,
+ CARD16 red, CARD16 green, CARD16 blue, Pixel pixel)
{
/*
* Prepare the AllocColor reply for the client.
@@ -735,13 +716,9 @@ DoAllocColorReply (client, in_reply, red, green, blue, pixel)
}
static void
-DoAllocNamedColorReply (client, in_reply, red, green, blue, pixel,
- xred, xgreen, xblue)
- ClientPtr client;
- Bool in_reply;
- CARD16 red, green, blue;
- Pixel pixel;
- CARD16 xred, xgreen, xblue;
+DoAllocNamedColorReply (ClientPtr client, Bool in_reply,
+ CARD16 red, CARD16 green, CARD16 blue, Pixel pixel,
+ CARD16 xred, CARD16 xgreen, CARD16 xblue)
{
/*
* Prepare the AllocNamedColor reply for the client.
@@ -819,14 +796,9 @@ DoAllocNamedColorReply (client, in_reply, red, green, blue, pixel,
*/
static void
-LocalAllocColor (client, in_reply, pmap, red, green, blue, alloc_named,
- xred, xgreen, xblue)
- ClientPtr client;
- Bool in_reply;
- ColormapPtr pmap;
- CARD16 red, green, blue;
- Bool alloc_named;
- CARD16 xred, xgreen, xblue;
+LocalAllocColor (ClientPtr client, Bool in_reply, ColormapPtr pmap,
+ CARD16 red, CARD16 green, CARD16 blue, Bool alloc_named,
+ CARD16 xred, CARD16 xgreen, CARD16 xblue)
{
Pixel pixel;
@@ -886,13 +858,8 @@ LocalAllocColor (client, in_reply, pmap, red, green, blue, alloc_named,
static void
-FoundPixel (client, in_reply, pmap, pent, alloc_named, xred, xgreen, xblue)
- ClientPtr client;
- Bool in_reply;
- ColormapPtr pmap;
- Entry *pent;
- Bool alloc_named;
- CARD16 xred, xgreen, xblue;
+FoundPixel (ClientPtr client, Bool in_reply, ColormapPtr pmap, Entry *pent,
+ Bool alloc_named, CARD16 xred, CARD16 xgreen, CARD16 xblue)
{
#ifdef COLOR_DEBUG
if (LBXCacheSafe (client))
@@ -936,8 +903,7 @@ FoundPixel (client, in_reply, pmap, pent, alloc_named, xred, xgreen, xblue)
/* ------------------------------------------------------------------------- */
int
-ProcLBXCreateColormap(client)
- ClientPtr client;
+ProcLBXCreateColormap(ClientPtr client)
{
REQUEST(xCreateColormapReq);
Colormap cmap;
@@ -959,9 +925,7 @@ ProcLBXCreateColormap(client)
}
static ColormapPtr
-create_colormap(cmap, visual)
- Colormap cmap;
- VisualID visual;
+create_colormap(Colormap cmap, VisualID visual)
{
ColormapPtr pmap;
LbxVisualPtr pvis;
@@ -1030,10 +994,7 @@ create_colormap(cmap, visual)
/* ARGSUSED */
Bool
-CreateColormap(client, cmap, visual)
- ClientPtr client;
- Colormap cmap;
- VisualID visual;
+CreateColormap(ClientPtr client, Colormap cmap, VisualID visual)
{
ColormapPtr pmap;
@@ -1047,8 +1008,7 @@ CreateColormap(client, cmap, visual)
int
-ProcLBXFreeColormap(client)
- ClientPtr client;
+ProcLBXFreeColormap(ClientPtr client)
{
REQUEST(xResourceReq);
Colormap cmap;
@@ -1065,9 +1025,7 @@ ProcLBXFreeColormap(client)
/* ARGSUSED */
Bool
-FreeColormap(client, cmap)
- ClientPtr client;
- Colormap cmap;
+FreeColormap(ClientPtr client, Colormap cmap)
{
ColormapPtr pmap;
@@ -1084,8 +1042,7 @@ FreeColormap(client, cmap)
* cop out: don't try to track the new colormap
*/
int
-ProcLBXCopyColormapAndFree(client)
- ClientPtr client;
+ProcLBXCopyColormapAndFree(ClientPtr client)
{
REQUEST(xCopyColormapAndFreeReq);
Colormap srcmap;
@@ -1106,8 +1063,7 @@ ProcLBXCopyColormapAndFree(client)
/* ------------------------------------------------------------------------- */
int
-ProcLBXFreeColors(client)
- ClientPtr client;
+ProcLBXFreeColors(ClientPtr client)
{
REQUEST(xFreeColorsReq);
int num;
@@ -1161,8 +1117,7 @@ ProcLBXFreeColors(client)
/* ------------------------------------------------------------------------- */
int
-ProcLBXAllocColor(client)
- ClientPtr client;
+ProcLBXAllocColor(ClientPtr client)
{
REQUEST(xAllocColorReq);
Entry *pent;
@@ -1241,8 +1196,7 @@ ProcLBXAllocColor(client)
/* ------------------------------------------------------------------------- */
int
-ProcLBXAllocNamedColor(client)
- ClientPtr client;
+ProcLBXAllocNamedColor(ClientPtr client)
{
REQUEST(xAllocNamedColorReq);
Entry *pent;
@@ -1338,10 +1292,7 @@ ProcLBXAllocNamedColor(client)
}
static Bool
-alloc_named_color_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+alloc_named_color_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xAllocNamedColorReply *reply;
Pixel pixel;
@@ -1387,8 +1338,7 @@ alloc_named_color_reply(client, nr, data)
/* ------------------------------------------------------------------------- */
int
-ProcLBXAllocColorCells(client)
- ClientPtr client;
+ProcLBXAllocColorCells(ClientPtr client)
{
REQUEST(xAllocColorCellsReq);
ReplyStuffPtr nr;
@@ -1436,10 +1386,7 @@ ProcLBXAllocColorCells(client)
}
static Bool
-alloc_color_cells_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+alloc_color_cells_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xAllocColorCellsReply *reply;
CARD16 nPixels, nMasks;
@@ -1520,8 +1467,7 @@ alloc_color_cells_reply(client, nr, data)
/* ------------------------------------------------------------------------- */
int
-ProcLBXAllocColorPlanes(client)
- ClientPtr client;
+ProcLBXAllocColorPlanes(ClientPtr client)
{
REQUEST(xAllocColorPlanesReq);
ReplyStuffPtr nr;
@@ -1569,10 +1515,7 @@ ProcLBXAllocColorPlanes(client)
}
static Bool
-alloc_color_planes_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+alloc_color_planes_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xAllocColorPlanesReply *reply;
CARD32 redMask, greenMask, blueMask, mask;
@@ -1650,8 +1593,7 @@ alloc_color_planes_reply(client, nr, data)
/* ------------------------------------------------------------------------- */
int
-ProcLBXLookupColor(client)
- ClientPtr client;
+ProcLBXLookupColor(ClientPtr client)
{
REQUEST(xLookupColorReq);
xLookupColorReply reply;
@@ -1736,10 +1678,7 @@ ProcLBXLookupColor(client)
static Bool
-lookup_color_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+lookup_color_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLookupColorReply *reply;
RGBEntryRec rgbe;
diff --git a/di/cmaputil.c b/di/cmaputil.c
index a932c2b..e408aa0 100644
--- a/di/cmaputil.c
+++ b/di/cmaputil.c
@@ -68,13 +68,11 @@ typedef struct {
static int num_visuals = 0;
-LbxVisualPtr *visuals;
+static LbxVisualPtr *visuals;
int
-CreateVisual(depth, vis)
- int depth;
- xVisualType *vis;
+CreateVisual(int depth, xVisualType *vis)
{
LbxVisualPtr pvis;
@@ -112,8 +110,7 @@ CreateVisual(depth, vis)
}
LbxVisualPtr
-GetVisual(vid)
- VisualID vid;
+GetVisual(VisualID vid)
{
LbxVisualPtr pvis;
int i;
@@ -136,9 +133,8 @@ GetVisual(vid)
*/
static void
-CopyISOLatin1Lowered(dest, source, length)
- register unsigned char *dest, *source;
- int length;
+CopyISOLatin1Lowered(register unsigned char *dest,
+ register unsigned char *source, int length)
{
register int i;
@@ -228,7 +224,7 @@ extern char *rgbPath;
static Bool have_rgb_db = FALSE;
Bool
-InitColors()
+InitColors(void)
{
FILE *rgb;
char *path;
@@ -291,10 +287,8 @@ InitColors()
static Bool
-OsLookupColor(name, len, pred, pgreen, pblue)
- char *name;
- unsigned len;
- unsigned short *pred, *pgreen, *pblue;
+OsLookupColor(char *name, unsigned len, unsigned short *pred,
+ unsigned short *pgreen, unsigned short *pblue)
{
dbEntryPtr entry;
@@ -316,9 +310,7 @@ OsLookupColor(name, len, pred, pgreen, pblue)
static int
-Hash(name, len)
- char *name;
- int len;
+Hash(char *name, int len)
{
int hash = 0;
@@ -330,11 +322,7 @@ Hash(name, len)
}
RGBEntryPtr
-FindColorName(server, name, len, pVisual)
- XServerPtr server;
- char *name;
- int len;
- LbxVisualPtr pVisual;
+FindColorName(XServerPtr server, char *name, int len, LbxVisualPtr pVisual)
{
RGBCacheEntryPtr ce;
int hash;
@@ -375,11 +363,7 @@ FindColorName(server, name, len, pVisual)
}
Bool
-AddColorName(server, name, len, rgbe)
- XServerPtr server;
- char *name;
- int len;
- RGBEntryRec *rgbe;
+AddColorName(XServerPtr server, char *name, int len, RGBEntryRec *rgbe)
{
RGBCacheEntryPtr new;
int hash;
@@ -401,7 +385,7 @@ AddColorName(server, name, len, rgbe)
void
-FreeColors()
+FreeColors(void)
{
RGBCacheEntryPtr ce,
nce;
@@ -425,10 +409,7 @@ FreeColors()
/* ARGSUSED */
int
-DestroyColormap(client, value, id)
- ClientPtr client;
- pointer value;
- XID id;
+DestroyColormap(ClientPtr client, pointer value, XID id)
{
ColormapPtr pmap = (ColormapPtr)value;
xfree(pmap);
@@ -438,14 +419,8 @@ DestroyColormap(client, value, id)
/* ------------------------------------------------------------------------- */
static int
-find_matching_pixel(pent, num, channels, red, green, blue, pe)
- Entry *pent;
- int num;
- int channels;
- CARD32 red,
- green,
- blue;
- Entry **pe;
+find_matching_pixel(Entry *pent, int num, int channels,
+ CARD32 red, CARD32 green, CARD32 blue, Entry **pe)
{
int i;
@@ -492,13 +467,8 @@ find_matching_pixel(pent, num, channels, red, green, blue, pe)
/* ARGSUSED */
int
-FindPixel(client, pmap, red, green, blue, pent)
- ClientPtr client;
- ColormapPtr pmap;
- CARD32 red,
- green,
- blue;
- Entry **pent;
+FindPixel(ClientPtr client, ColormapPtr pmap, CARD32 red, CARD32 green,
+ CARD32 blue, Entry **pent)
{
Entry *p;
@@ -563,10 +533,7 @@ FindPixel(client, pmap, red, green, blue, pent)
}
static int
-AddPixel(pclient, pmap, pixel)
- ClientPtr pclient;
- ColormapPtr pmap;
- Pixel pixel;
+AddPixel(ClientPtr pclient, ColormapPtr pmap, Pixel pixel)
{
colorResource *pcr;
int npix;
@@ -620,11 +587,8 @@ AddPixel(pclient, pmap, pixel)
}
int
-IncrementPixel(pclient, pmap, pent, from_server)
- ClientPtr pclient;
- ColormapPtr pmap;
- Entry *pent;
- Bool from_server;
+IncrementPixel(ClientPtr pclient, ColormapPtr pmap,
+ Entry *pent, Bool from_server)
{
if (!AddPixel(pclient, pmap, pent->pixel))
@@ -650,10 +614,7 @@ IncrementPixel(pclient, pmap, pent, from_server)
}
int
-AllocCell(client, pmap, pixel)
- ClientPtr client;
- ColormapPtr pmap;
- Pixel pixel;
+AllocCell(ClientPtr client, ColormapPtr pmap, Pixel pixel)
{
Entry *pent;
Pixel p;
@@ -694,14 +655,8 @@ AllocCell(client, pmap, pixel)
}
int
-StorePixel (client, pmap, red, green, blue, pixel, from_server)
- ClientPtr client;
- ColormapPtr pmap;
- CARD32 red,
- green,
- blue;
- Pixel pixel;
- Bool from_server;
+StorePixel (ClientPtr client, ColormapPtr pmap, CARD32 red, CARD32 green,
+ CARD32 blue, Pixel pixel, Bool from_server)
{
Entry *pent;
Pixel p;
@@ -762,9 +717,7 @@ StorePixel (client, pmap, red, green, blue, pixel, from_server)
/* ARGSUSED */
static void
-FreeCell(pent, pixel)
- Entry *pent;
- Pixel pixel;
+FreeCell(Entry *pent, Pixel pixel)
{
pent = &pent[pixel];
if (pent->status == PIXEL_PRIVATE) {
@@ -779,9 +732,7 @@ FreeCell(pent, pixel)
}
static void
-FreeServerCell(pent, pixel)
- Entry *pent;
- Pixel pixel;
+FreeServerCell(Entry *pent, Pixel pixel)
{
pent = &pent[pixel];
if (pent->status == PIXEL_PRIVATE && pent->server_ref)
@@ -795,10 +746,7 @@ FreeServerCell(pent, pixel)
}
void
-GotServerFreeCellsEvent(pmap, pixel_start, pixel_end)
- ColormapPtr pmap;
- Pixel pixel_start;
- Pixel pixel_end;
+GotServerFreeCellsEvent(ColormapPtr pmap, Pixel pixel_start, Pixel pixel_end)
{
Pixel pixel;
@@ -815,9 +763,7 @@ GotServerFreeCellsEvent(pmap, pixel_start, pixel_end)
}
void
-FreeAllClientPixels(pmap, client)
- ColormapPtr pmap;
- int client;
+FreeAllClientPixels(ColormapPtr pmap, int client)
{
Pixel *ppix, *ppst;
int n;
@@ -846,10 +792,7 @@ FreeAllClientPixels(pmap, client)
/* ARGSUSED */
int
-FreeClientPixels(client, value, id)
- ClientPtr client;
- pointer value;
- XID id;
+FreeClientPixels(ClientPtr client, pointer value, XID id)
{
colorResource *pcr = (colorResource *)value;
ColormapPtr pmap;
@@ -870,13 +813,8 @@ FreeClientPixels(client, value, id)
(bits) += ((bits) & ~(mask))
static void
-FreeCells(client, pmap, num, pixels, mask, channels)
- ClientPtr client;
- ColormapPtr pmap;
- int num;
- Pixel *pixels;
- Pixel mask;
- int channels;
+FreeCells(ClientPtr client, ColormapPtr pmap, int num,
+ Pixel *pixels, Pixel mask, int channels)
{
Pixel pix, base, bits, cmask;
int i, zapped, npix, npixnew, offset;
@@ -961,12 +899,8 @@ FreeCells(client, pmap, num, pixels, mask, channels)
}
int
-FreePixels(client, pmap, num, pixels, mask)
- ClientPtr client;
- ColormapPtr pmap;
- int num;
- Pixel *pixels;
- Pixel mask;
+FreePixels(ClientPtr client, ColormapPtr pmap,
+ int num, Pixel *pixels, Pixel mask)
{
if ((pmap->pVisual->class | DynamicClass) != DirectColor)
diff --git a/di/dispatch.c b/di/dispatch.c
index a5705cc..919d1cc 100644
--- a/di/dispatch.c
+++ b/di/dispatch.c
@@ -33,8 +33,6 @@
#include "resource.h"
#include "pm.h"
-extern int (* InitialVector[3]) ();
-
static void KillAllClients(
void
);
@@ -46,7 +44,7 @@ HandleLargeRequest(
int nextFreeClientID; /* always MIN free client ID */
int nClients; /* number active clients */
-char *display_name = 0;
+char *display_name = NULL;
volatile char dispatchException = 0;
volatile char isItTimeToYield;
Bool lbxUseLbx = TRUE;
@@ -62,7 +60,7 @@ extern char *atomsFile;
#define MINOROP ((xReq *)client->requestBuffer)->data
int
-Dispatch ()
+Dispatch (void)
{
register int *clientReady; /* array of request ready clients */
register int result = 0;
@@ -158,12 +156,8 @@ Dispatch ()
}
void
-SendErrorToClient(client, majorCode, minorCode, resId, errorCode)
- ClientPtr client;
- unsigned int majorCode;
- unsigned int minorCode;
- XID resId;
- int errorCode;
+SendErrorToClient(ClientPtr client, unsigned int majorCode,
+ unsigned int minorCode, XID resId, int errorCode)
{
xError rep;
int n;
@@ -200,9 +194,7 @@ SendErrorToClient(client, majorCode, minorCode, resId, errorCode)
*************************/
ClientPtr
-NextAvailableClient(ospriv, connect_fd)
- pointer ospriv;
- int connect_fd;
+NextAvailableClient(pointer ospriv, int connect_fd)
{
register int i;
register ClientPtr client;
@@ -281,8 +273,7 @@ NextAvailableClient(ospriv, connect_fd)
}
int
-ProcInitialConnection(client)
- register ClientPtr client;
+ProcInitialConnection(register ClientPtr client)
{
REQUEST(xReq);
register xConnClientPrefix *prefix;
@@ -308,8 +299,7 @@ ProcInitialConnection(client)
}
int
-ProcEstablishConnection(client)
- register ClientPtr client;
+ProcEstablishConnection(register ClientPtr client)
{
register xConnClientPrefix *prefix;
register int i;
@@ -365,8 +355,7 @@ Bool resetAfterLastClient = FALSE;
Bool terminateAfterLastClient = FALSE;
void
-CloseDownClient(client)
- register ClientPtr client;
+CloseDownClient(register ClientPtr client)
{
if (!client->clientGone)
{
@@ -426,7 +415,7 @@ CloseDownClient(client)
}
static void
-KillAllClients()
+KillAllClients(void)
{
int i;
for (i=1; i<currentMaxClients; i++)
@@ -439,15 +428,13 @@ KillAllClients()
}
}
-extern void (*ZeroPadReqVector[128]) ();
+extern void (*ZeroPadReqVector[128])(void *);
int
-ProcStandardRequest (client)
- ClientPtr client;
+ProcStandardRequest (ClientPtr client)
{
REQUEST(xReq);
- void (*zeroPadProc)();
- extern int lbxZeroPad;
+ void (*zeroPadProc)(void *);
if (lbxZeroPad &&
(MAJOROP < 128) && (zeroPadProc = ZeroPadReqVector[MAJOROP]))
@@ -459,8 +446,7 @@ ProcStandardRequest (client)
/* ARGSUSED */
int
-ProcBadRequest (client)
- ClientPtr client;
+ProcBadRequest (ClientPtr client)
{
return BadRequest;
}
@@ -471,7 +457,7 @@ ProcBadRequest (client)
*/
void
-AdjustProcVector()
+AdjustProcVector(void)
{
int i;
@@ -537,7 +523,7 @@ AdjustProcVector()
static void
-HandleLargeRequest ()
+HandleLargeRequest (void)
{
LbxLargeRequestRec *largeRequest = largeRequestQueue[0];
diff --git a/di/extensions.c b/di/extensions.c
index a26edb4..f8c0de9 100644
--- a/di/extensions.c
+++ b/di/extensions.c
@@ -70,12 +70,8 @@ typedef struct _extinfo {
} ExtensionInfoRec;
static Bool
-AddExtension(server, name, reply, rep_mask, ev_mask)
- XServerPtr server;
- char *name;
- xLbxQueryExtensionReplyPtr reply;
- CARD8 *rep_mask,
- *ev_mask;
+AddExtension(XServerPtr server, char *name, xLbxQueryExtensionReplyPtr reply,
+ CARD8 *rep_mask, CARD8 *ev_mask)
{
ExtensionInfoPtr eip = NULL;
int req_mask_len;
@@ -118,8 +114,7 @@ AddExtension(server, name, reply, rep_mask, ev_mask)
}
void
-DeleteExtensions(server)
- XServerPtr server;
+DeleteExtensions(XServerPtr server)
{
ExtensionInfoPtr eip;
@@ -134,25 +129,18 @@ DeleteExtensions(server)
/*ARGSUSED*/
void
-HandleExtensionError(client, err, nr)
- ClientPtr client;
- xError *err;
- ReplyStuffPtr nr;
+HandleExtensionError(ClientPtr client, xError *err, ReplyStuffPtr nr)
{
}
/*ARGSUSED*/
void
-HandleExtensionEvent(client, ev)
- ClientPtr client;
- xEvent *ev;
+HandleExtensionEvent(ClientPtr client, xEvent *ev)
{
}
static Bool
-check_mask(mask, minorop)
- CARD8 *mask;
- int minorop;
+check_mask(CARD8 *mask, int minorop)
{
if (mask[minorop >> 3] & (1 << (minorop & 7)))
return REQ_TYPE_YES;
@@ -161,9 +149,7 @@ check_mask(mask, minorop)
}
Bool
-CheckExtensionForEvents(client, req)
- ClientPtr client;
- xReq *req;
+CheckExtensionForEvents(ClientPtr client, xReq *req)
{
int opcode = req->reqType;
int minorop = req->data;
@@ -181,9 +167,7 @@ CheckExtensionForEvents(client, req)
}
Bool
-CheckExtensionForReplies(client, req)
- ClientPtr client;
- xReq *req;
+CheckExtensionForReplies(ClientPtr client, xReq *req)
{
int opcode = req->reqType;
int minorop = req->data;
@@ -201,10 +185,7 @@ CheckExtensionForReplies(client, req)
}
static Bool
-HandleLbxQueryExtensionReply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+HandleLbxQueryExtensionReply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLbxQueryExtensionReply *reply;
xQueryExtensionReply crep;
@@ -240,10 +221,8 @@ HandleLbxQueryExtensionReply(client, nr, data)
}
static int
-QueryExtensionReply(client, present, opcode, event, error)
- ClientPtr client;
- Bool present;
- int opcode, event, error;
+QueryExtensionReply(ClientPtr client, Bool present,
+ int opcode, int event, int error)
{
xQueryExtensionReply reply;
@@ -269,8 +248,7 @@ QueryExtensionReply(client, present, opcode, event, error)
}
int
-ProcLBXQueryExtension(client)
- ClientPtr client;
+ProcLBXQueryExtension(ClientPtr client)
{
REQUEST(xQueryExtensionReq);
char n;
diff --git a/di/gfx.c b/di/gfx.c
index 8c345c6..58f3fb1 100644
--- a/di/gfx.c
+++ b/di/gfx.c
@@ -62,8 +62,10 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/lbximage.h>
#include "proxyopts.h"
#include "swap.h"
+#include "lbxext.h"
-static Bool GetLbxImageReply();
+static Bool
+GetLbxImageReply(ClientPtr client, ReplyStuffPtr nr, char *data);
static int pad[4] = {0, 3, 2, 1};
@@ -71,11 +73,11 @@ static int pad[4] = {0, 3, 2, 1};
* Routines for re-encoding line, rectangle and arc requests
*/
-#define REENCODE_PSHORT(val, out) \
+#define REENCODE_PSHORT(val, out, zero) \
if ((val) >= 0 && (val) < 0xf0) \
*(out)++ = (val); \
else if ((val) >= 0xef0 || (val) < (short)0xfe00) \
- return 0; \
+ return zero; \
else if ((val) < 0) { \
*(out)++ = 0xf0 | (((val) + 0x1000) >> 8); \
*(out)++ = (val) + 0x1000; \
@@ -98,11 +100,11 @@ static int pad[4] = {0, 3, 2, 1};
*(out)++ = (val) - 0x80; \
}
-#define REENCODE_USHORT(val, out) \
+#define REENCODE_USHORT(val, out, zero) \
if ((val) < 0xf0) \
*(out)++ = (val); \
else if ((unsigned short)(val) >= 0x10f0) \
- return 0; \
+ return zero; \
else { \
*(out)++ = 0xf0 | (((val) - 0xf0) >> 8); \
*(out)++ = (val) - 0xf0; \
@@ -133,12 +135,12 @@ static int pad[4] = {0, 3, 2, 1};
swaps(&(oval), n); \
}
-#define SWAP_REENCODE_PSHORT(ival, out) { \
+#define SWAP_REENCODE_PSHORT(ival, out, zero) { \
register int _n; \
short _val; \
_val = (ival); \
if (client->swapped) swaps (&_val, _n); \
- REENCODE_PSHORT(_val, out); \
+ REENCODE_PSHORT(_val, out, zero); \
}
#define SWAP_REENCODE_SHORT(ival, out) { \
@@ -149,12 +151,12 @@ static int pad[4] = {0, 3, 2, 1};
REENCODE_SHORT(_val, out); \
}
-#define SWAP_REENCODE_USHORT(ival, out) { \
+#define SWAP_REENCODE_USHORT(ival, out, zero) { \
register int _n; \
unsigned short _val; \
_val = (ival); \
if (client->swapped) swaps (&_val, _n); \
- REENCODE_USHORT(_val, out); \
+ REENCODE_USHORT(_val, out, zero); \
}
int gfx_gc_hit;
@@ -164,18 +166,14 @@ int gfx_draw_miss;
int gfx_total;
static void
-push(cache, xid)
- XID cache[GFX_CACHE_SIZE];
- XID xid;
+push(XID cache[GFX_CACHE_SIZE], XID xid)
{
memmove(cache + 1, cache, (GFX_CACHE_SIZE - 1) * sizeof(cache[0]));
cache[0] = xid;
}
static void
-use(cache, i)
- XID cache[GFX_CACHE_SIZE];
- int i;
+use(XID cache[GFX_CACHE_SIZE], int i)
{
XID tmp;
@@ -187,9 +185,7 @@ use(cache, i)
}
static int
-match(cache, xid)
- XID cache[GFX_CACHE_SIZE];
- XID xid;
+match(XID cache[GFX_CACHE_SIZE], XID xid)
{
int j;
@@ -313,10 +309,8 @@ match(cache, xid)
}
static int
-reencode_poly(client, lbxreq, reencode_rtn)
- ClientPtr client;
- CARD8 lbxreq;
- int (*reencode_rtn) ();
+reencode_poly(ClientPtr client, CARD8 lbxreq,
+ int (*reencode_rtn)(ClientPtr, short *, char *out, int))
{
REQUEST(xPolyPointReq);
XServerPtr server = client->server;
@@ -361,11 +355,8 @@ bail:
/* ARGSUSED */
static int
-reencode_points_origin(client, in, out, count)
- ClientPtr client;
- register short *in;
- register char *out;
- int count;
+reencode_points_origin(ClientPtr client, register short *in,
+ register char *out, int count)
{
register short diff;
int i;
@@ -389,11 +380,8 @@ reencode_points_origin(client, in, out, count)
/* ARGSUSED */
static int
-reencode_points_previous(client, in, out, count)
- ClientPtr client;
- register short *in;
- register char *out;
- int count;
+reencode_points_previous(ClientPtr client, register short *in,
+ register char *out, int count)
{
int i;
short inval;
@@ -410,11 +398,8 @@ reencode_points_previous(client, in, out, count)
/* ARGSUSED */
static int
-reencode_segment(client, in, out, count)
- ClientPtr client;
- register short *in;
- register char *out;
- int count;
+reencode_segment(ClientPtr client, register short *in,
+ register char *out, int count)
{
register short diff;
int i;
@@ -448,11 +433,8 @@ reencode_segment(client, in, out, count)
/* ARGSUSED */
static int
-reencode_rectangle(client, in, out, count)
- ClientPtr client;
- register short *in;
- register char *out;
- int count;
+reencode_rectangle(ClientPtr client, register short *in,
+ register char *out, int count)
{
register short diff;
int i;
@@ -475,20 +457,17 @@ reencode_rectangle(client, in, out, count)
/* reencode (width, height) */
COPY_AND_SWAPS(inval, in[2]);
- REENCODE_USHORT(inval, out);
+ REENCODE_USHORT(inval, out, 0);
COPY_AND_SWAPS(inval, in[3]);
- REENCODE_USHORT(inval, out);
+ REENCODE_USHORT(inval, out, 0);
}
return out - start_out;
}
/* ARGSUSED */
static int
-reencode_arc(client, in, out, count)
- ClientPtr client;
- register short *in;
- register char *out;
- int count;
+reencode_arc(ClientPtr client, register short *in,
+ register char *out, int count)
{
register short diff;
int i;
@@ -511,9 +490,9 @@ reencode_arc(client, in, out, count)
/* reencode (width, height) */
COPY_AND_SWAPS(inval, in[2]);
- REENCODE_USHORT(inval, out);
+ REENCODE_USHORT(inval, out, 0);
COPY_AND_SWAPS(inval, in[3]);
- REENCODE_USHORT(inval, out);
+ REENCODE_USHORT(inval, out, 0);
/* reencode (angle1, angle2) */
COPY_AND_SWAPS(inval, in[4]);
@@ -525,11 +504,10 @@ reencode_arc(client, in, out, count)
}
int
-ProcLBXPolyPoint(client)
- ClientPtr client;
+ProcLBXPolyPoint(ClientPtr client)
{
REQUEST(xPolyPointReq);
- int (*reencode_rtn) ();
+ int (*reencode_rtn)(ClientPtr, short *, char *, int);
reencode_rtn = (stuff->coordMode) ? reencode_points_previous :
reencode_points_origin;
@@ -537,11 +515,10 @@ ProcLBXPolyPoint(client)
}
int
-ProcLBXPolyLine(client)
- ClientPtr client;
+ProcLBXPolyLine(ClientPtr client)
{
REQUEST(xPolyLineReq);
- int (*reencode_rtn) ();
+ int (*reencode_rtn)(ClientPtr, short *, char *, int);
reencode_rtn = (stuff->coordMode) ? reencode_points_previous :
reencode_points_origin;
@@ -549,29 +526,25 @@ ProcLBXPolyLine(client)
}
int
-ProcLBXPolySegment(client)
- ClientPtr client;
+ProcLBXPolySegment(ClientPtr client)
{
return reencode_poly(client, X_LbxPolySegment, reencode_segment);
}
int
-ProcLBXPolyRectangle(client)
- ClientPtr client;
+ProcLBXPolyRectangle(ClientPtr client)
{
return reencode_poly(client, X_LbxPolyRectangle, reencode_rectangle);
}
int
-ProcLBXPolyArc(client)
- ClientPtr client;
+ProcLBXPolyArc(ClientPtr client)
{
return reencode_poly(client, X_LbxPolyArc, reencode_arc);
}
int
-ProcLBXFillPoly(client)
- ClientPtr client;
+ProcLBXFillPoly(ClientPtr client)
{
REQUEST(xFillPolyReq);
XServerPtr server = client->server;
@@ -580,7 +553,7 @@ ProcLBXFillPoly(client)
char *after;
int bytes;
int space;
- int (*reencode_rtn) ();
+ int (*reencode_rtn)(ClientPtr, short *, char *, int);
GFX_CACHE_DECLARE;
@@ -618,39 +591,33 @@ bail:
}
int
-ProcLBXPolyFillRectangle(client)
- ClientPtr client;
+ProcLBXPolyFillRectangle(ClientPtr client)
{
return reencode_poly(client, X_LbxPolyFillRectangle, reencode_rectangle);
}
int
-ProcLBXPolyFillArc(client)
- ClientPtr client;
+ProcLBXPolyFillArc(ClientPtr client)
{
return reencode_poly(client, X_LbxPolyFillArc, reencode_arc);
}
static int
-reencode_copy(client, in, out)
- ClientPtr client;
- register xCopyAreaReq *in;
- register char *out;
+reencode_copy(ClientPtr client, register xCopyAreaReq *in, register char *out)
{
char *start_out = out;
- SWAP_REENCODE_PSHORT(in->srcX, out);
- SWAP_REENCODE_PSHORT(in->srcY, out);
- SWAP_REENCODE_PSHORT(in->dstX, out);
- SWAP_REENCODE_PSHORT(in->dstY, out);
- SWAP_REENCODE_USHORT(in->width, out);
- SWAP_REENCODE_USHORT(in->height, out);
+ SWAP_REENCODE_PSHORT(in->srcX, out, 0);
+ SWAP_REENCODE_PSHORT(in->srcY, out, 0);
+ SWAP_REENCODE_PSHORT(in->dstX, out, 0);
+ SWAP_REENCODE_PSHORT(in->dstY, out, 0);
+ SWAP_REENCODE_USHORT(in->width, out, 0);
+ SWAP_REENCODE_USHORT(in->height, out, 0);
return out - start_out;
}
int
-ProcLBXCopyArea(client)
- ClientPtr client;
+ProcLBXCopyArea(ClientPtr client)
{
REQUEST(xCopyAreaReq);
XServerPtr server = client->server;
@@ -685,8 +652,7 @@ bail:
}
int
-ProcLBXCopyPlane(client)
- ClientPtr client;
+ProcLBXCopyPlane(ClientPtr client)
{
REQUEST(xCopyPlaneReq);
XServerPtr server = client->server;
@@ -722,22 +688,18 @@ bail:
}
static int
-reencode_text_pos(client, in, out)
- ClientPtr client;
- xPolyTextReq *in;
- char *out;
+reencode_text_pos(ClientPtr client, xPolyTextReq *in, char *out)
{
char *start_out;
start_out = out;
- SWAP_REENCODE_PSHORT(in->x, out);
- SWAP_REENCODE_PSHORT(in->y, out);
+ SWAP_REENCODE_PSHORT(in->x, out, 0);
+ SWAP_REENCODE_PSHORT(in->y, out, 0);
return out - start_out;
}
int
-ProcLBXPolyText(client)
- ClientPtr client;
+ProcLBXPolyText(ClientPtr client)
{
REQUEST(xPolyTextReq);
XServerPtr server = client->server;
@@ -782,8 +744,7 @@ bail:
}
int
-ProcLBXImageText(client)
- ClientPtr client;
+ProcLBXImageText(ClientPtr client)
{
REQUEST(xImageTextReq);
XServerPtr server = client->server;
@@ -829,8 +790,7 @@ bail:
}
static void
-SwapXPutImage(req)
- xPutImageReq *req;
+SwapXPutImage(xPutImageReq *req)
{
char n;
@@ -841,16 +801,14 @@ SwapXPutImage(req)
}
static char *
-reencode_putimage(stuff, newreq)
- xPutImageReq *stuff;
- xLbxPutImageReq *newreq;
+reencode_putimage(xPutImageReq *stuff, xLbxPutImageReq *newreq)
{
char *out;
if (stuff->format > ZPixmap || stuff->leftPad > 31 ||
!stuff->depth || stuff->depth > 32 ||
(stuff->format == ZPixmap && stuff->leftPad != 0))
- return 0;
+ return NULL;
out = (char *)newreq + sz_xLbxPutImageReq;
if (!stuff->leftPad && stuff->depth <= 8)
@@ -860,10 +818,10 @@ reencode_putimage(stuff, newreq)
newreq->bitPacked = ((stuff->depth - 1) << 2);
*out++ = (stuff->format << 5) | stuff->leftPad;
}
- REENCODE_USHORT(stuff->width, out);
- REENCODE_USHORT(stuff->height, out);
- REENCODE_PSHORT(stuff->dstX, out);
- REENCODE_PSHORT(stuff->dstY, out);
+ REENCODE_USHORT(stuff->width, out, NULL);
+ REENCODE_USHORT(stuff->height, out, NULL);
+ REENCODE_PSHORT(stuff->dstX, out, NULL);
+ REENCODE_PSHORT(stuff->dstY, out, NULL);
return out;
}
@@ -871,8 +829,7 @@ reencode_putimage(stuff, newreq)
#define MaxPutImageSz sz_xLbxPutImageReq + 1 + 2 + 2 + 2 + 2 + GFX_REQ_PAD
int
-ProcLBXPutImage(client)
- ClientPtr client;
+ProcLBXPutImage(ClientPtr client)
{
REQUEST(xPutImageReq);
XServerPtr server = client->server;
@@ -1070,8 +1027,7 @@ ProcLBXPutImage(client)
int
-ProcLBXGetImage(client)
- ClientPtr client;
+ProcLBXGetImage(ClientPtr client)
{
REQUEST(xGetImageReq);
ReplyStuffPtr nr;
@@ -1110,10 +1066,7 @@ ProcLBXGetImage(client)
}
static Bool
-GetLbxImageReply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+GetLbxImageReply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLbxGetImageReply *rep;
xGetImageReply reply;
diff --git a/di/init.c b/di/init.c
index e805b48..1207b6e 100644
--- a/di/init.c
+++ b/di/init.c
@@ -62,13 +62,12 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xutil.h>
#include <stdio.h>
#include <X11/extensions/XLbx.h>
+#include "init.h"
/* Hook up to an X server and set up a multiplexing LBX encoded connection */
struct _XDisplay*
-DisplayOpen (dpy_name, requestp, eventp, errorp, sequencep)
- char *dpy_name;
- int *requestp, *eventp, *errorp;
- int *sequencep;
+DisplayOpen(char *dpy_name, int *requestp, int *eventp,
+ int *errorp, int *sequencep)
{
Display *dpy;
int lbxMajor, lbxMinor;
@@ -103,19 +102,13 @@ DisplayOpen (dpy_name, requestp, eventp, errorp, sequencep)
return dpy;
}
-int DisplayConnectionNumber (dpy)
- struct _XDisplay* dpy;
+int DisplayConnectionNumber(struct _XDisplay* dpy)
{
return ConnectionNumber (dpy);
}
-void DisplayGetConnSetup (dpy, cs, cs_len, change_type, changes, change_len)
- struct _XDisplay* dpy;
- xConnSetup** cs;
- int* cs_len;
- int change_type;
- CARD32* changes;
- int change_len;
+void DisplayGetConnSetup(struct _XDisplay* dpy, xConnSetup** cs, int* cs_len,
+ int change_type, CARD32* changes, int change_len)
{
char* datap;
xConnSetup setup;
diff --git a/di/lbxfuncs.c b/di/lbxfuncs.c
index 0ecb9b6..97b793f 100644
--- a/di/lbxfuncs.c
+++ b/di/lbxfuncs.c
@@ -56,13 +56,20 @@
extern int lbxDebug;
#endif
-static Bool intern_atom_reply();
-static Bool get_atom_name_reply();
-static Bool get_mod_map_reply();
-static Bool get_key_map_reply();
-static Bool sync_reply();
-static Bool get_queryfont_reply();
-static Bool GetWinAttrAndGeomReply();
+static Bool
+intern_atom_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+get_atom_name_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+get_mod_map_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+get_key_map_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+sync_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+get_queryfont_reply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+GetWinAttrAndGeomReply (ClientPtr client, ReplyStuffPtr nr, char *data);
#define reply_length(cp,rep) ((rep)->type==X_Reply ? \
32 + (HostUnswapLong((cp),(rep)->length) << 2) \
@@ -72,13 +79,8 @@ char protocolMode = PROTOCOL_FULL;
/* ARGSUSED */
static void
-get_connection_info(client, cs, cs_len, change_type, changes, changes_len)
- ClientPtr client;
- xConnSetup *cs;
- int cs_len;
- int change_type;
- CARD32 *changes;
- int changes_len;
+get_connection_info(ClientPtr client, xConnSetup *cs, int cs_len,
+ int change_type, CARD32 *changes, int changes_len)
{
xWindowRoot *root;
xDepth *depth;
@@ -162,15 +164,9 @@ send_setup_reply(ClientPtr client, Bool success, int majorVer, int minorVer,
}
static void
-finish_setup_reply(client, cs, cs_len, change_type, changes, changes_len, majorVer, minorVer)
- ClientPtr client;
- xConnSetup *cs;
- int cs_len;
- int change_type;
- CARD32* changes;
- int changes_len;
- int majorVer,
- minorVer;
+finish_setup_reply(ClientPtr client, xConnSetup *cs, int cs_len,
+ int change_type, CARD32* changes, int changes_len,
+ int majorVer, int minorVer)
{
get_connection_info(client, cs, cs_len, change_type, changes, changes_len);
client->minKeyCode = cs->minKeyCode;
@@ -192,10 +188,7 @@ finish_setup_reply(client, cs, cs_len, change_type, changes, changes_len, majorV
*/
static void
-get_setup_reply(client, data, len)
- ClientPtr client;
- char *data;
- int len;
+get_setup_reply(ClientPtr client, char *data, int len)
{
register xLbxConnSetupPrefix *rep;
TagData td;
@@ -270,8 +263,7 @@ get_setup_reply(client, data, len)
}
int
-ProcLBXInternAtom(client)
- ClientPtr client;
+ProcLBXInternAtom(ClientPtr client)
{
REQUEST(xInternAtomReq);
char *s;
@@ -333,10 +325,7 @@ ProcLBXInternAtom(client)
}
static Bool
-intern_atom_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+intern_atom_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
Atom atom;
char *str;
@@ -360,8 +349,7 @@ intern_atom_reply(client, nr, data)
}
int
-ProcLBXGetAtomName(client)
- ClientPtr client;
+ProcLBXGetAtomName(ClientPtr client)
{
REQUEST(xResourceReq);
char *str;
@@ -416,10 +404,7 @@ ProcLBXGetAtomName(client)
}
static Bool
-get_atom_name_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+get_atom_name_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
Atom atom;
char *s;
@@ -453,8 +438,7 @@ get_atom_name_reply(client, nr, data)
*/
void
-SendLbxSync (client)
- ClientPtr client;
+SendLbxSync(ClientPtr client)
{
xLbxSyncReq req;
ReplyStuffPtr nr;
@@ -475,22 +459,15 @@ SendLbxSync (client)
/* ARGSUSED */
static Bool
-sync_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+sync_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
/* do nothing; just here to catch and discard the reply */
return TRUE;
}
void
-WriteError(client, majorCode, minorCode, resId, errorCode)
- ClientPtr client;
- unsigned int majorCode;
- unsigned int minorCode;
- XID resId;
- int errorCode;
+WriteError(ClientPtr client, unsigned int majorCode, unsigned int minorCode,
+ XID resId, int errorCode)
{
xError rep;
int n;
@@ -512,8 +489,7 @@ WriteError(client, majorCode, minorCode, resId, errorCode)
}
int
-ProcLBXGetModifierMapping(client)
- ClientPtr client;
+ProcLBXGetModifierMapping(ClientPtr client)
{
ReplyStuffPtr nr;
@@ -529,10 +505,7 @@ ProcLBXGetModifierMapping(client)
/*ARGSUSED*/
static Bool
-get_mod_map_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+get_mod_map_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLbxGetModifierMappingReply *rep;
int len;
@@ -599,8 +572,7 @@ get_mod_map_reply(client, nr, data)
}
int
-ProcLBXGetKeyboardMapping(client)
- ClientPtr client;
+ProcLBXGetKeyboardMapping(ClientPtr client)
{
REQUEST(xGetKeyboardMappingReq);
ReplyStuffPtr nr;
@@ -624,10 +596,7 @@ ProcLBXGetKeyboardMapping(client)
*/
static Bool
-get_key_map_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+get_key_map_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLbxGetKeyboardMappingReply *rep;
int len;
@@ -722,8 +691,7 @@ get_key_map_reply(client, nr, data)
}
int
-ProcLBXQueryFont(client)
- ClientPtr client;
+ProcLBXQueryFont(ClientPtr client)
{
REQUEST(xResourceReq);
ReplyStuffPtr nr;
@@ -745,11 +713,7 @@ ProcLBXQueryFont(client)
}
static INT16
-unpack_val(val, mask, sft, bts)
- CARD32 val;
- CARD32 mask;
- int sft,
- bts;
+unpack_val(CARD32 val, CARD32 mask, int sft, int bts)
{
CARD16 utmp;
INT16 sval;
@@ -841,10 +805,7 @@ UnsquishFontInfo(int compression, xLbxFontInfo *fdata, int dlen, pointer *qfr)
/*ARGSUSED*/
static Bool
-get_queryfont_reply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+get_queryfont_reply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLbxQueryFontReply *rep;
int len,
@@ -939,8 +900,7 @@ get_queryfont_reply(client, nr, data)
int
-ProcLBXGetWindowAttributes(client)
- ClientPtr client;
+ProcLBXGetWindowAttributes(ClientPtr client)
{
REQUEST(xResourceReq);
xLbxGetWinAttrAndGeomReq newreq;
@@ -984,10 +944,7 @@ ProcLBXGetWindowAttributes(client)
static Bool
-GetWinAttrAndGeomReply (client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+GetWinAttrAndGeomReply (ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLbxGetWinAttrAndGeomReply *lbxrep;
xGetWindowAttributesReply reply;
@@ -1082,8 +1039,7 @@ GetWinAttrAndGeomReply (client, nr, data)
int
-ProcLBXGetGeometry(client)
- ClientPtr client;
+ProcLBXGetGeometry(ClientPtr client)
{
/* REQUEST(xResourceReq); */
xGetGeometryReply reply;
@@ -1151,8 +1107,7 @@ ProcLBXGetGeometry(client)
/* We're just looking for signs of the window manager here */
int
-ProcLBXChangeWindowAttributes(client)
- ClientPtr client;
+ProcLBXChangeWindowAttributes(ClientPtr client)
{
REQUEST(xChangeWindowAttributesReq);
Window win;
@@ -1177,9 +1132,7 @@ ProcLBXChangeWindowAttributes(client)
}
void
-FinishLBXRequest(client, yank)
- ClientPtr client;
- int yank;
+FinishLBXRequest(ClientPtr client, int yank)
{
REQUEST(xReq);
char n;
@@ -1249,10 +1202,7 @@ FinishLBXRequest(client, yank)
* QueryFont regularly hits this in normal operation
*/
static int
-patchup_error(client, err, nr)
- ClientPtr client;
- xError *err;
- ReplyStuffPtr nr;
+patchup_error(ClientPtr client, xError *err, ReplyStuffPtr nr)
{
int retval = 1;
CARD16 minor_code;
@@ -1303,10 +1253,7 @@ patchup_error(client, err, nr)
}
static Bool
-error_matches(client, nr, err)
- ClientPtr client;
- ReplyStuffPtr nr;
- xError *err;
+error_matches(ClientPtr client, ReplyStuffPtr nr, xError *err)
{
CARD16 mc;
char n;
@@ -1323,10 +1270,7 @@ error_matches(client, nr, err)
* FALSE if data is replaced
*/
static Bool
-HandleReply(client, data, len)
- ClientPtr client;
- char *data;
- int len;
+HandleReply(ClientPtr client, char *data, int len)
{
xGenericReply *reply;
xError *err;
@@ -1419,10 +1363,7 @@ HandleReply(client, data, len)
}
void
-DoLBXReply(client, data, len)
- ClientPtr client;
- char *data;
- int len;
+DoLBXReply(ClientPtr client, char *data, int len)
{
if (HandleReply(client, data, len))
WriteToClient (client, len, data);
diff --git a/di/lbxutil.c b/di/lbxutil.c
index a24ac27..93cf923 100644
--- a/di/lbxutil.c
+++ b/di/lbxutil.c
@@ -38,6 +38,7 @@
#include "wire.h"
#include "swap.h"
#include "colormap.h"
+#include "lbxext.h"
Bool compStats = FALSE; /* report stream compression statistics */
@@ -48,11 +49,7 @@ extern int lbxDebug;
extern int lbxMaxMotionEvents;
ReplyStuffPtr
-NewReply(client, major, minor, reply_func)
- ClientPtr client;
- int major;
- int minor;
- ReplyFunc reply_func;
+NewReply(ClientPtr client, int major, int minor, ReplyFunc reply_func)
{
ReplyStuffPtr new,
*end;
@@ -73,9 +70,7 @@ NewReply(client, major, minor, reply_func)
}
void
-RemoveReply(client, rp)
- ClientPtr client;
- ReplyStuffPtr rp;
+RemoveReply(ClientPtr client, ReplyStuffPtr rp)
{
ReplyStuffPtr cur, *prev;
@@ -96,10 +91,7 @@ RemoveReply(client, rp)
}
ReplyStuffPtr
-GetMatchingReply(client, seqno, flush_older)
- ClientPtr client;
- int seqno;
- Bool flush_older;
+GetMatchingReply(ClientPtr client, int seqno, Bool flush_older)
{
ReplyStuffPtr t, old;
@@ -127,16 +119,13 @@ GetMatchingReply(client, seqno, flush_older)
}
Bool
-AnyReplies(client)
- ClientPtr client;
+AnyReplies(ClientPtr client)
{
return (LBXReplyList(client) != NULL);
}
Bool
-AnyTagBearingReplies(server, cache)
- XServerPtr server;
- Cache cache;
+AnyTagBearingReplies(XServerPtr server, Cache cache)
{
int i;
int lbxreq;
@@ -182,11 +171,7 @@ AnyTagBearingReplies(server, cache)
*/
Bool
-SaveReplyData(client, rep, len, data)
- ClientPtr client;
- xReply *rep;
- int len;
- pointer data;
+SaveReplyData(ClientPtr client, xReply *rep, int len, pointer data)
{
ReplyDataPtr new, *end;
@@ -218,8 +203,7 @@ SaveReplyData(client, rep, len, data)
}
Bool
-FlushDelayedReplies(client)
- ClientPtr client;
+FlushDelayedReplies(ClientPtr client)
{
ReplyDataPtr *prev, cur;
@@ -248,8 +232,7 @@ FlushDelayedReplies(client)
}
void
-BumpSequence(client)
- ClientPtr client;
+BumpSequence(ClientPtr client)
{
DBG(DBG_CLIENT, (stderr, "bumping client %d sequence by %d to %d\n",
client->index, LBXSequenceLost(client), LBXSequenceNumber(client)));
@@ -258,8 +241,7 @@ BumpSequence(client)
}
void
-ForceSequenceUpdate(client)
- ClientPtr client;
+ForceSequenceUpdate(ClientPtr client)
{
if (LBXSequenceLost(client)) {
BumpSequence(client);
@@ -267,11 +249,7 @@ ForceSequenceUpdate(client)
}
void
-LbxFreeTag(server, tag, tagtype)
- XServerPtr server;
- XID tag;
- int tagtype;
-
+LbxFreeTag(XServerPtr server, XID tag, int tagtype)
{
Cache tag_cache;
@@ -295,10 +273,7 @@ LbxFreeTag(server, tag, tagtype)
}
void
-LbxSendTagData(client, tag, tagtype)
- ClientPtr client;
- XID tag;
- int tagtype;
+LbxSendTagData(ClientPtr client, XID tag, int tagtype)
{
TagData td;
unsigned long len;
@@ -329,7 +304,7 @@ extern unsigned long raw_stream_out;
extern unsigned long raw_stream_in;
void
-DumpCompressionStats()
+DumpCompressionStats(void)
{
if (raw_stream_out && stream_out_plain) {
fprintf(stderr, "Requests: normal = %ld, reencoded = %ld",
@@ -356,7 +331,7 @@ DumpCompressionStats()
}
void
-ZeroCompressionStats()
+ZeroCompressionStats(void)
{
stream_out_compressed = 0;
stream_out_uncompressed = 0;
@@ -404,14 +379,8 @@ int delta_in_total;
int delta_in_attempts;
int delta_in_hits;
-extern int gfx_gc_hit;
-extern int gfx_gc_miss;
-extern int gfx_draw_hit;
-extern int gfx_draw_miss;
-extern int gfx_total;
-
void
-DumpOtherStats()
+DumpOtherStats(void)
{
fprintf(stderr, "Short-circuit stats\n");
fprintf(stderr, "InternAtom cache hits %d misses %d\n", intern_good, intern_miss);
@@ -451,7 +420,7 @@ DumpOtherStats()
}
void
-ZeroOtherStats()
+ZeroOtherStats(void)
{
intern_good = intern_miss = 0;
getatom_good = getatom_miss = 0;
@@ -481,8 +450,7 @@ ZeroOtherStats()
#endif
void
-SendInitLBXPackets(server)
- XServerPtr server;
+SendInitLBXPackets(XServerPtr server)
{
ZeroCompressionStats();
@@ -494,7 +462,7 @@ SendInitLBXPackets(server)
}
void
-LbxCleanupSession()
+LbxCleanupSession(void)
{
if (compStats)
{
diff --git a/di/main.c b/di/main.c
index 060f188..c8bdba3 100644
--- a/di/main.c
+++ b/di/main.c
@@ -73,12 +73,10 @@ char *display;
int lbxMaxServers = DEFAULT_MAXSERVERS;
-static void InitializeGlobals ();
+static void InitializeGlobals(void);
int
-main (argc, argv)
- int argc;
- char **argv;
+main(int argc, char **argv)
{
display = "63";
@@ -141,7 +139,7 @@ main (argc, argv)
* to a display server.
*/
static void
-InitializeGlobals ()
+InitializeGlobals(void)
{
int i;
ClientPtr tmp;
@@ -180,7 +178,6 @@ InitializeGlobals ()
/* ARGSUSED */
void
-MarkClientException (client)
- ClientPtr client;
+MarkClientException(ClientPtr client)
{
}
diff --git a/di/options.c b/di/options.c
index 11e1f67..c3b4699 100644
--- a/di/options.c
+++ b/di/options.c
@@ -62,28 +62,48 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/lbxzlib.h>
#endif /* NO_ZLIB */
#include "wire.h"
+#include "tags.h"
-static int LbxDeltaReply();
-static int LbxProxyDeltaReq();
-static int LbxServerDeltaReq();
-static int LbxStreamCompReq();
-static int LbxBitmapCompReq();
-static int LbxPixmapCompReq();
-static int LbxSquishReq();
-static int LbxUseTagsReq();
-static int LbxCmapAllReq();
-
-static int LbxProxyDeltaReply();
-static int LbxServerDeltaReply();
-static int LbxStreamCompReply();
-static int LbxBitmapCompReply();
-static int LbxPixmapCompReply();
-static int LbxSquishReply();
-static int LbxUseTagsReply();
-static int LbxCmapAllReply();
-
-static int OptZlibReq();
-static int OptZlibReply();
+static int
+LbxDeltaReply(void *preply, int replylen, short *pn, short *pmaxlen);
+static int
+LbxProxyDeltaReq(XServerPtr server, void *buf);
+static int
+LbxServerDeltaReq(XServerPtr server, void *buf);
+static int
+LbxStreamCompReq(XServerPtr server, void *buf);
+static int
+LbxBitmapCompReq(XServerPtr server, void *buf);
+static int
+LbxPixmapCompReq(XServerPtr server, void *buf);
+static int
+LbxSquishReq(XServerPtr server, void *buf);
+static int
+LbxUseTagsReq(XServerPtr server, void *buf);
+static int
+LbxCmapAllReq(XServerPtr server, void *buf);
+
+static int
+LbxProxyDeltaReply(XServerPtr server, void *preply, int replylen);
+static int
+LbxServerDeltaReply(XServerPtr server, void *preply, int replylen);
+static int
+LbxStreamCompReply(XServerPtr server, void *preply, int replylen);
+static int
+LbxBitmapCompReply(XServerPtr server, void *preply, int replylen);
+static int
+LbxPixmapCompReply(XServerPtr server, void *preply, int replylen);
+static int
+LbxSquishReply(XServerPtr server, void *preply, int replylen);
+static int
+LbxUseTagsReply(XServerPtr server, void *preply, int replylen);
+static int
+LbxCmapAllReply(XServerPtr server, void *preply, int replylen);
+
+static int
+OptZlibReq(XServerPtr server, void *buf);
+static int
+OptZlibReply(XServerPtr server, void *preply, int replylen);
#define OPT_INDEX_STREAM_COMP 2
@@ -96,13 +116,9 @@ static Bool called_LbxNoDelta;
static void
-InitializeOptionsList (server, idx, optcode, negotiate, req, reply)
- XServerPtr server;
- int idx;
- CARD8 optcode;
- Bool negotiate;
- int (*req)();
- int (*reply)();
+InitializeOptionsList(XServerPtr server, int idx, CARD8 optcode, Bool negotiate,
+ int (*req)(XServerPtr, void *),
+ int (*reply)(XServerPtr, void *, int))
{
server->LbxOptions[idx].optcode = optcode;
server->LbxOptions[idx].negotiate = negotiate;
@@ -111,8 +127,7 @@ InitializeOptionsList (server, idx, optcode, negotiate, req, reply)
}
static void
-InitializeDeltaOptions (server)
- XServerPtr server;
+InitializeDeltaOptions(XServerPtr server)
{
server->proxyDeltaOpt.minN = 0;
server->proxyDeltaOpt.maxN = 0xff;
@@ -130,8 +145,7 @@ InitializeDeltaOptions (server)
}
static void
-InitializeStreamComp (server)
- XServerPtr server;
+InitializeStreamComp(XServerPtr server)
{
server->LbxStreamComp[0].typelen = ZLIB_STRCOMP_OPT_LEN;
server->LbxStreamComp[0].type = ZLIB_STRCOMP_OPT;
@@ -140,8 +154,7 @@ InitializeStreamComp (server)
}
static void
-InitializeBitmapCompMethod (server)
- XServerPtr server;
+InitializeBitmapCompMethod(XServerPtr server)
{
/* compression method name */
server->LbxBitmapCompMethods[0].methodName = "XC-FaxG42D";
@@ -164,8 +177,7 @@ InitializeBitmapCompMethod (server)
/*ARGSUSED*/
static void
-InitializePixmapCompMethod (server)
- XServerPtr server;
+InitializePixmapCompMethod(XServerPtr server)
{
/*
* Currently, we don't support any pixmap compression algorithms
@@ -179,8 +191,7 @@ InitializePixmapCompMethod (server)
}
static void
-InitializeCmpaAllMethods (server)
- XServerPtr server;
+InitializeCmpaAllMethods(XServerPtr server)
{
/* colormap allocation method name */
server->LbxCmapAllMethods[0].methodName = "XC-CMAP";
@@ -196,8 +207,7 @@ InitializeCmpaAllMethods (server)
}
void
-LbxOptInit(server)
- XServerPtr server;
+LbxOptInit(XServerPtr server)
{
bzero((char *)&server->lbxNegOpt, sizeof(LbxNegOptsRec));
@@ -255,10 +265,9 @@ LbxOptInit(server)
}
int
-LbxOptBuildReq(server, buf)
- XServerPtr server;
- register char *buf;
+LbxOptBuildReq(XServerPtr server, void *_buf)
{
+ char *buf = _buf;
int i;
char *bufstart = buf;
char *pnopts = buf++;
@@ -284,12 +293,9 @@ LbxOptBuildReq(server, buf)
}
int
-LbxOptParseReply(server, nopts, preply, replylen)
- XServerPtr server;
- int nopts;
- unsigned char *preply;
- int replylen;
+LbxOptParseReply(XServerPtr server, int nopts, void *_preply, int replylen)
{
+ unsigned char *preply = _preply;
int i;
for (i = 0; i < nopts; i++) {
@@ -321,7 +327,7 @@ LbxOptParseReply(server, nopts, preply, replylen)
}
void
-LbxNoDelta()
+LbxNoDelta(void)
{
/*
* All we can do now is to flag that this was called
@@ -332,28 +338,21 @@ LbxNoDelta()
}
static int
-LbxProxyDeltaReq(server, buf)
- XServerPtr server;
- unsigned char *buf;
+LbxProxyDeltaReq(XServerPtr server, void *buf)
{
memcpy(buf, (char *)&server->proxyDeltaOpt, sizeof(LbxDeltaOptionsRec));
return LBX_OPT_DELTA_REQLEN;
}
static int
-LbxServerDeltaReq(server, buf)
- XServerPtr server;
- unsigned char *buf;
+LbxServerDeltaReq(XServerPtr server, void *buf)
{
memcpy(buf, (char *)&server->serverDeltaOpt, sizeof(LbxDeltaOptionsRec));
return LBX_OPT_DELTA_REQLEN;
}
static int
-LbxProxyDeltaReply(server, preply, replylen)
- XServerPtr server;
- unsigned char *preply;
- int replylen;
+LbxProxyDeltaReply(XServerPtr server, void *preply, int replylen)
{
return LbxDeltaReply(preply,
replylen,
@@ -362,10 +361,7 @@ LbxProxyDeltaReply(server, preply, replylen)
}
static int
-LbxServerDeltaReply(server, preply, replylen)
- XServerPtr server;
- unsigned char *preply;
- int replylen;
+LbxServerDeltaReply(XServerPtr server, void *preply, int replylen)
{
return LbxDeltaReply(preply,
replylen,
@@ -374,12 +370,9 @@ LbxServerDeltaReply(server, preply, replylen)
}
static int
-LbxDeltaReply(preply, replylen, pn, pmaxlen)
- unsigned char *preply;
- int replylen;
- short *pn;
- short *pmaxlen;
+LbxDeltaReply(void *_preply, int replylen, short *pn, short *pmaxlen)
{
+ unsigned char *preply = _preply;
if (replylen < 2)
return -1;
*pn = *preply++;
@@ -397,7 +390,7 @@ LbxDeltaReply(preply, replylen, pn, pmaxlen)
void
-LbxNoComp()
+LbxNoComp(void)
{
/*
* All we can do now is to flag that this was called
@@ -408,10 +401,9 @@ LbxNoComp()
}
static int
-LbxStreamCompReq(server, buf)
- XServerPtr server;
- unsigned char *buf;
+LbxStreamCompReq(XServerPtr server, void *_buf)
{
+ unsigned char *buf = _buf;
int i;
int reqlen;
int LBX_N_STRCOMP;
@@ -441,11 +433,9 @@ LbxStreamCompReq(server, buf)
}
static int
-LbxStreamCompReply(server, preply, replylen)
- XServerPtr server;
- unsigned char *preply;
- int replylen;
+LbxStreamCompReply(XServerPtr server, void *_preply, int replylen)
{
+ unsigned char *preply = _preply;
int optindex;
int LBX_N_STRCOMP;
@@ -464,10 +454,9 @@ extern int zlevel;
/*ARGSUSED*/
static int
-OptZlibReq(server, buf)
- XServerPtr server;
- unsigned char *buf;
+OptZlibReq(XServerPtr server, void *_buf)
{
+ unsigned char *buf = _buf;
*buf++ = 1; /* len */
*buf = zlevel;
return (2);
@@ -475,10 +464,7 @@ OptZlibReq(server, buf)
/*ARGSUSED*/
static int
-OptZlibReply(server, preply, replylen)
- XServerPtr server;
- unsigned char *preply;
- int replylen;
+OptZlibReply(XServerPtr server, void *preply, int replylen)
{
server->lbxNegOpt.streamOpts.streamCompInit =
(LbxStreamCompHandle (*)(int, pointer))ZlibInit;
@@ -500,20 +486,17 @@ Bool lbxDoSquishing = TRUE;
/*ARGSUSED*/
static int
-LbxSquishReq(server, buf)
- XServerPtr server;
- unsigned char *buf;
+LbxSquishReq(XServerPtr server, void *_buf)
{
+ unsigned char *buf = _buf;
*buf = lbxDoSquishing;
return 1;
}
static int
-LbxSquishReply(server, preply, replylen)
- XServerPtr server;
- unsigned char *preply;
- int replylen;
+LbxSquishReply(XServerPtr server, void *_preply, int replylen)
{
+ unsigned char *preply = _preply;
if (replylen < 1)
return -1;
server->lbxNegOpt.squish = *preply;
@@ -525,21 +508,18 @@ Bool lbxUseTags = TRUE;
/*ARGSUSED*/
static int
-LbxUseTagsReq(server, buf)
- XServerPtr server;
- unsigned char *buf;
+LbxUseTagsReq(XServerPtr server, void *_buf)
{
+ unsigned char *buf = _buf;
*buf = lbxUseTags;
return 1;
}
static int
-LbxUseTagsReply(server, preply, replylen)
- XServerPtr server;
- unsigned char *preply;
- int replylen;
+LbxUseTagsReply(XServerPtr server, void *_preply, int replylen)
{
+ unsigned char *preply = _preply;
if (replylen < 1)
return -1;
server->lbxNegOpt.useTags = *preply;
@@ -552,10 +532,9 @@ LbxUseTagsReply(server, preply, replylen)
*/
static int
-LbxBitmapCompReq (server, buf)
- XServerPtr server;
- unsigned char *buf;
+LbxBitmapCompReq(XServerPtr server, void *_buf)
{
+ unsigned char *buf = _buf;
unsigned char *bufStart = buf;
int i;
int NUM_BITMAP_METHODS;
@@ -578,11 +557,9 @@ LbxBitmapCompReq (server, buf)
/*ARGSUSED*/
static int
-LbxBitmapCompReply (server, preply, replylen)
- XServerPtr server;
- unsigned char *preply;
- int replylen;
+LbxBitmapCompReply(XServerPtr server, void *_preply, int replylen)
{
+ unsigned char *preply = _preply;
int count = *preply++;
int i;
@@ -610,10 +587,9 @@ LbxBitmapCompReply (server, preply, replylen)
static int
-LbxPixmapCompReq (server, buf)
- XServerPtr server;
- unsigned char *buf;
+LbxPixmapCompReq(XServerPtr server, void *_buf)
{
+ unsigned char *buf = _buf;
unsigned char *bufStart = buf;
int i, j;
@@ -636,11 +612,9 @@ LbxPixmapCompReq (server, buf)
/*ARGSUSED*/
static int
-LbxPixmapCompReply (server, preply, replylen)
- XServerPtr server;
- unsigned char *preply;
- int replylen;
+LbxPixmapCompReply(XServerPtr server, void *_preply, int replylen)
{
+ unsigned char *preply = _preply;
int count = *preply++;
int i, j;
@@ -672,9 +646,7 @@ LbxPixmapCompReply (server, preply, replylen)
LbxBitmapCompMethod *
-LbxLookupBitmapCompMethod (server, methodOpCode)
- XServerPtr server;
- int methodOpCode;
+LbxLookupBitmapCompMethod(XServerPtr server, int methodOpCode)
{
int i;
@@ -694,9 +666,7 @@ LbxLookupBitmapCompMethod (server, methodOpCode)
LbxPixmapCompMethod *
-LbxLookupPixmapCompMethod (server, methodOpCode)
- XServerPtr server;
- int methodOpCode;
+LbxLookupPixmapCompMethod(XServerPtr server, int methodOpCode)
{
int i;
@@ -716,8 +686,7 @@ LbxLookupPixmapCompMethod (server, methodOpCode)
LbxBitmapCompMethod *
-LbxFindPreferredBitmapCompMethod (server)
- XServerPtr server;
+LbxFindPreferredBitmapCompMethod(XServerPtr server)
{
if (server->lbxNegOpt.numBitmapCompMethods == 0)
@@ -728,10 +697,7 @@ LbxFindPreferredBitmapCompMethod (server)
LbxPixmapCompMethod *
-LbxFindPreferredPixmapCompMethod (server, format, depth)
- XServerPtr server;
- int format;
- int depth;
+LbxFindPreferredPixmapCompMethod(XServerPtr server, int format, int depth)
{
if (server->lbxNegOpt.numPixmapCompMethods == 0)
@@ -761,10 +727,9 @@ LbxFindPreferredPixmapCompMethod (server, format, depth)
* Colormap methods
*/
static int
-LbxCmapAllReq (server, buf)
- XServerPtr server;
- unsigned char *buf;
+LbxCmapAllReq(XServerPtr server, void *_buf)
{
+ unsigned char *buf = _buf;
unsigned char *bufStart = buf;
int i;
int NUM_CMAP_METHODS;
@@ -786,11 +751,9 @@ LbxCmapAllReq (server, buf)
}
static int
-LbxCmapAllReply(server, preply, replylen)
- XServerPtr server;
- unsigned char *preply;
- int replylen;
+LbxCmapAllReply(XServerPtr server, void *_preply, int replylen)
{
+ unsigned char *preply = _preply;
int NUM_CMAP_METHODS;
NUM_CMAP_METHODS = sizeof (server->LbxCmapAllMethods) /
diff --git a/di/pm.c b/di/pm.c
index a2472e5..8b10ea2 100644
--- a/di/pm.c
+++ b/di/pm.c
@@ -60,8 +60,12 @@ from The Open Group.
/*
* Static definitions
*/
-static void PMprocessMessages ();
-static Status _ConnectToProxyManager ();
+static void
+PMprocessMessages(IceConn iceConn, IcePointer clientData, int opcode,
+ unsigned long length, Bool swap,
+ IceReplyWaitInfo *replyWait, Bool *replyReadyRet);
+static Status
+_ConnectToProxyManager(char *pmAddr, char *errorString);
static int PMopcode;
static int PMversionCount = 1;
@@ -101,8 +105,7 @@ Bool proxyMngr;
static IceIOErrorHandler prev_handler;
static void
-MyIoErrorHandler (ice_conn)
- IceConn ice_conn;
+MyIoErrorHandler(IceConn ice_conn)
{
if (prev_handler)
(*prev_handler) (ice_conn);
@@ -112,7 +115,7 @@ MyIoErrorHandler (ice_conn)
}
static void
-InstallIOErrorHandler ()
+InstallIOErrorHandler(void)
{
IceIOErrorHandler default_handler;
@@ -124,7 +127,7 @@ InstallIOErrorHandler ()
Bool
-CheckForProxyManager ()
+CheckForProxyManager(void)
{
if (getenv ("PROXY_MANAGER"))
return 1;
@@ -133,7 +136,7 @@ CheckForProxyManager ()
}
void
-ConnectToProxyManager ()
+ConnectToProxyManager(void)
{
char *proxyManagerAddr;
char errorString[ERROR_STRING_SIZE];
@@ -154,9 +157,7 @@ ConnectToProxyManager ()
static Status
-_ConnectToProxyManager (pmAddr, errorString)
- char *pmAddr;
- char *errorString;
+_ConnectToProxyManager(char *pmAddr, char *errorString)
{
IceProtocolSetupStatus setupstat;
char *vendor = NULL;
@@ -268,8 +269,7 @@ SendGetProxyAddrReply (
static int
-casecmp (str1, str2)
- char *str1, *str2;
+casecmp(char *str1, char *str2)
{
char buf1[512],buf2[512];
char c, *s;
@@ -297,15 +297,9 @@ casecmp (str1, str2)
/* ARGSUSED */
static void
-PMprocessMessages (iceConn, clientData, opcode, length,
- swap, replyWait, replyReadyRet)
- IceConn iceConn;
- IcePointer clientData;
- int opcode;
- unsigned long length;
- Bool swap;
- IceReplyWaitInfo *replyWait;
- Bool *replyReadyRet;
+PMprocessMessages(IceConn iceConn, IcePointer clientData, int opcode,
+ unsigned long length, Bool swap,
+ IceReplyWaitInfo *replyWait, Bool *replyReadyRet)
{
switch (opcode)
{
@@ -602,7 +596,7 @@ PMprocessMessages (iceConn, clientData, opcode, length,
}
void
-HandleProxyManagerConnection ()
+HandleProxyManagerConnection(void)
{
/*
* If an IO error occurs, the IO error handler will output
diff --git a/di/props.c b/di/props.c
index 296cdd1..b0a2669 100644
--- a/di/props.c
+++ b/di/props.c
@@ -66,8 +66,10 @@ in this Software without prior written authorization from The Open Group.
#include "proxyopts.h"
#include "atomcache.h"
-static Bool GetLbxChangePropertyReply();
-static Bool GetLbxGetPropertyReply();
+static Bool
+GetLbxChangePropertyReply(ClientPtr client, ReplyStuffPtr nr, char *data);
+static Bool
+GetLbxGetPropertyReply(ClientPtr client, ReplyStuffPtr nr, char *data);
/*
* wrapper for tags
@@ -76,12 +78,8 @@ static Bool GetLbxGetPropertyReply();
* tag cache
*/
static Bool
-propTagStoreData(server, tid, dlen, swapit, ptdp)
- XServerPtr server;
- XID tid;
- unsigned long dlen;
- Bool swapit;
- PropertyTagDataPtr ptdp;
+propTagStoreData(XServerPtr server, XID tid, unsigned long dlen,
+ Bool swapit, PropertyTagDataPtr ptdp)
{
PropertyTagDataPtr new;
@@ -156,8 +154,7 @@ rewrite_change_prop(
}
int
-ProcLBXChangeProperty(client)
- ClientPtr client;
+ProcLBXChangeProperty(ClientPtr client)
{
REQUEST(xChangePropertyReq);
ReplyStuffPtr nr;
@@ -209,10 +206,7 @@ ProcLBXChangeProperty(client)
}
static Bool
-GetLbxChangePropertyReply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+GetLbxChangePropertyReply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLbxChangePropertyReply *rep;
PropertyTagDataPtr ptdp;
@@ -249,8 +243,7 @@ GetLbxChangePropertyReply(client, nr, data)
}
int
-ProcLBXGetProperty(client)
- ClientPtr client;
+ProcLBXGetProperty(ClientPtr client)
{
REQUEST(xGetPropertyReq);
ReplyStuffPtr nr;
@@ -282,10 +275,7 @@ ProcLBXGetProperty(client)
}
static Bool
-GetLbxGetPropertyReply(client, nr, data)
- ClientPtr client;
- ReplyStuffPtr nr;
- char *data;
+GetLbxGetPropertyReply(ClientPtr client, ReplyStuffPtr nr, char *data)
{
xLbxGetPropertyReply *rep;
unsigned long len;
diff --git a/di/reqtype.c b/di/reqtype.c
index b6a779c..4a28cea 100644
--- a/di/reqtype.c
+++ b/di/reqtype.c
@@ -292,9 +292,7 @@ static char cause_events[] = {
Bool
-GeneratesEvents(client, req)
- ClientPtr client;
- xReq *req;
+GeneratesEvents(ClientPtr client, xReq *req)
{
if (req->reqType > X_NoOperation)
return CheckExtensionForEvents(client, req);
@@ -302,9 +300,7 @@ GeneratesEvents(client, req)
}
int
-GeneratesReplies(client, req)
- ClientPtr client;
- xReq *req;
+GeneratesReplies(ClientPtr client, xReq *req)
{
if (req->reqType > X_NoOperation)
return CheckExtensionForReplies(client, req);
diff --git a/di/resource.c b/di/resource.c
index 274a5a2..1bf1179 100644
--- a/di/resource.c
+++ b/di/resource.c
@@ -83,7 +83,8 @@ SOFTWARE.
#include "colormap.h"
#include "wire.h"
-static void RebuildTable();
+static void
+RebuildTable(int client);
#define INITBUCKETS 64
#define INITHASHSIZE 6
@@ -108,7 +109,7 @@ static DeleteType *DeleteFuncs = (DeleteType *)NULL;
*/
Bool
-InitDeleteFuncs()
+InitDeleteFuncs(void)
{
if (DeleteFuncs)
xfree(DeleteFuncs);
@@ -128,8 +129,7 @@ InitDeleteFuncs()
*****************/
Bool
-InitClientResources(client)
- ClientPtr client;
+InitClientResources(ClientPtr client)
{
register int i, j;
@@ -156,9 +156,7 @@ InitClientResources(client)
}
void
-FinishInitClientResources(client, ridBase, ridMask)
- ClientPtr client;
- XID ridBase, ridMask;
+FinishInitClientResources(ClientPtr client, XID ridBase, XID ridMask)
{
client->ridBase = ridBase;
client->ridMask = ridMask;
@@ -168,9 +166,7 @@ FinishInitClientResources(client, ridBase, ridMask)
}
static int
-Hash(client, id)
- int client;
- register XID id;
+Hash(int client, register XID id)
{
id &= clients[client]->ridMask;
switch (clients[client]->server->clientTable[client].hashsize)
@@ -192,9 +188,8 @@ Hash(client, id)
}
static XID
-AvailableID(client, id, maxid, goodid)
- register int client;
- register XID id, maxid, goodid;
+AvailableID(register int client, register XID id,
+ register XID maxid, register XID goodid)
{
register ResourcePtr res;
@@ -220,9 +215,9 @@ AvailableID(client, id, maxid, goodid)
*/
XID
-FakeClientID(client)
- register int client; /* Index of a client for the global clients
- * array and the server's clientTable */
+FakeClientID(register int client) /* Index of a client for the global
+ * clients array and the server's
+ * clientTable */
{
register XID id, maxid;
register ResourcePtr *resp;
@@ -261,11 +256,7 @@ FakeClientID(client)
}
Bool
-AddResource(pclient, id, type, value)
- ClientPtr pclient;
- XID id;
- RESTYPE type;
- pointer value;
+AddResource(ClientPtr pclient, XID id, RESTYPE type, pointer value)
{
int client;
register ClientResourceRec *rrec;
@@ -300,8 +291,7 @@ AddResource(pclient, id, type, value)
}
static void
-RebuildTable(client)
- int client;
+RebuildTable(int client)
{
register int j;
register ResourcePtr res, next;
@@ -350,10 +340,7 @@ RebuildTable(client)
}
void
-FreeResource(client, id, skipDeleteFuncType)
- ClientPtr client;
- XID id;
- RESTYPE skipDeleteFuncType;
+FreeResource(ClientPtr client, XID id, RESTYPE skipDeleteFuncType)
{
int cid;
register ResourcePtr res;
@@ -393,8 +380,7 @@ FreeResource(client, id, skipDeleteFuncType)
}
void
-FreeClientResources(client)
- ClientPtr client;
+FreeClientResources(ClientPtr client)
{
register ResourcePtr *resources;
register ResourcePtr this;
@@ -444,7 +430,7 @@ FreeClientResources(client)
}
void
-FreeAllResources()
+FreeAllResources(void)
{
int j;
@@ -459,10 +445,7 @@ FreeAllResources()
* LookupIDByType returns the object with the given id and type, else NULL.
*/
pointer
-LookupIDByType(pclient, id, rtype)
- ClientPtr pclient;
- XID id;
- RESTYPE rtype;
+LookupIDByType(ClientPtr pclient, XID id, RESTYPE rtype)
{
register ResourcePtr res;
int i, j;
diff --git a/di/swaprep.c b/di/swaprep.c
index c5fc372..763eb00 100644
--- a/di/swaprep.c
+++ b/di/swaprep.c
@@ -55,9 +55,7 @@ in this Software without prior written authorization from The Open Group.
#include "swap.h"
void
-SwapConnSetup(pConnSetup, pConnSetupT)
- xConnSetup *pConnSetup,
- *pConnSetupT;
+SwapConnSetup(xConnSetup *pConnSetup, xConnSetup *pConnSetupT)
{
cpswapl(pConnSetup->release, pConnSetupT->release);
cpswapl(pConnSetup->ridBase, pConnSetupT->ridBase);
@@ -76,9 +74,7 @@ SwapConnSetup(pConnSetup, pConnSetupT)
}
void
-SwapWinRoot(pRoot, pRootT)
- xWindowRoot *pRoot,
- *pRootT;
+SwapWinRoot(xWindowRoot *pRoot, xWindowRoot *pRootT)
{
cpswapl(pRoot->windowId, pRootT->windowId);
cpswapl(pRoot->defaultColormap, pRootT->defaultColormap);
@@ -99,9 +95,7 @@ SwapWinRoot(pRoot, pRootT)
}
void
-SwapVisual(pVis, pVisT)
- xVisualType *pVis,
- *pVisT;
+SwapVisual(xVisualType *pVis, xVisualType *pVisT)
{
cpswapl(pVis->visualID, pVisT->visualID);
pVisT->class = pVis->class;
@@ -113,9 +107,7 @@ SwapVisual(pVis, pVisT)
}
void
-WriteSConnSetupPrefix(pClient, pcsp)
- ClientPtr pClient;
- xConnSetupPrefix *pcsp;
+WriteSConnSetupPrefix(ClientPtr pClient, xConnSetupPrefix *pcsp)
{
xConnSetupPrefix cspT;
@@ -128,10 +120,7 @@ WriteSConnSetupPrefix(pClient, pcsp)
}
void
-WriteSConnectionInfo(pClient, size, pInfo)
- ClientPtr pClient;
- unsigned long size;
- char *pInfo;
+WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo)
{
int i,
j,
@@ -186,8 +175,7 @@ WriteSConnectionInfo(pClient, size, pInfo)
}
void
-SwapGetPropertyReply(rep)
- xGetPropertyReply *rep;
+SwapGetPropertyReply(xGetPropertyReply *rep)
{
char n;
@@ -199,8 +187,7 @@ SwapGetPropertyReply(rep)
}
void
-SwapInternAtomReply(rep)
- xInternAtomReply *rep;
+SwapInternAtomReply(xInternAtomReply *rep)
{
char n;
@@ -210,8 +197,7 @@ SwapInternAtomReply(rep)
}
void
-SwapGetAtomNameReply(rep)
- xGetAtomNameReply *rep;
+SwapGetAtomNameReply(xGetAtomNameReply *rep)
{
char n;
@@ -221,8 +207,7 @@ SwapGetAtomNameReply(rep)
}
void
-SwapLookupColorReply(rep)
- xLookupColorReply *rep;
+SwapLookupColorReply(xLookupColorReply *rep)
{
char n;
@@ -237,8 +222,7 @@ SwapLookupColorReply(rep)
}
void
-SwapAllocColorReply(rep)
- xAllocColorReply *rep;
+SwapAllocColorReply(xAllocColorReply *rep)
{
char n;
@@ -251,8 +235,7 @@ SwapAllocColorReply(rep)
}
void
-SwapAllocNamedColorReply(rep)
- xAllocNamedColorReply *rep;
+SwapAllocNamedColorReply(xAllocNamedColorReply *rep)
{
char n;
@@ -268,8 +251,7 @@ SwapAllocNamedColorReply(rep)
}
void
-SwapModmapReply(rep)
- xGetModifierMappingReply *rep;
+SwapModmapReply(xGetModifierMappingReply *rep)
{
char n;
@@ -278,8 +260,7 @@ SwapModmapReply(rep)
}
void
-SwapKeymapReply(rep)
- xGetKeyboardMappingReply *rep;
+SwapKeymapReply(xGetKeyboardMappingReply *rep)
{
char n;
@@ -288,8 +269,7 @@ SwapKeymapReply(rep)
}
void
-SwapGetImageReply(rep)
- xGetImageReply *rep;
+SwapGetImageReply(xGetImageReply *rep)
{
char n;
@@ -299,8 +279,7 @@ SwapGetImageReply(rep)
}
void
-SwapQueryExtensionReply(rep)
- xQueryExtensionReply *rep;
+SwapQueryExtensionReply(xQueryExtensionReply *rep)
{
char n;
@@ -309,8 +288,7 @@ SwapQueryExtensionReply(rep)
}
static void
-SwapCharInfo(pInfo)
- xCharInfo *pInfo;
+SwapCharInfo(xCharInfo *pInfo)
{
register char n;
@@ -323,8 +301,7 @@ SwapCharInfo(pInfo)
}
static void
-SwapFontInfo(pr)
- xQueryFontReply *pr;
+SwapFontInfo(xQueryFontReply *pr)
{
register char n;
@@ -340,8 +317,7 @@ SwapFontInfo(pr)
}
static void
-SwapLbxFontInfo(pr)
- xLbxFontInfo *pr;
+SwapLbxFontInfo(xLbxFontInfo *pr)
{
register char n;
@@ -360,9 +336,7 @@ SwapLbxFontInfo(pr)
* to swap it for external use
*/
void
-SwapFont(pr, native)
- xQueryFontReply *pr;
- Bool native;
+SwapFont(xQueryFontReply *pr, Bool native)
{
unsigned i;
xCharInfo *pxci;
@@ -396,9 +370,7 @@ SwapFont(pr, native)
}
void
-LbxSwapFontInfo(pr, compressed)
- xLbxFontInfo *pr;
- Bool compressed;
+LbxSwapFontInfo(xLbxFontInfo *pr, Bool compressed)
{
unsigned i;
xCharInfo *pxci;
diff --git a/di/swapreq.c b/di/swapreq.c
index ab35a7b..09ca0f5 100644
--- a/di/swapreq.c
+++ b/di/swapreq.c
@@ -56,9 +56,7 @@ in this Software without prior written authorization from The Open Group.
/* Byte swap a list of longs */
void
-SwapLongs(list, count)
- register CARD32 *list;
- register unsigned long count;
+SwapLongs(register CARD32 *list, register unsigned long count)
{
register char n;
@@ -84,9 +82,7 @@ SwapLongs(list, count)
/* Byte swap a list of shorts */
void
-SwapShorts(list, count)
- register short *list;
- register unsigned long count;
+SwapShorts(register short *list, register unsigned long count)
{
register char n;
@@ -119,8 +115,7 @@ SwapShorts(list, count)
}
void
-SwapConnClientPrefix(pCCP)
- xConnClientPrefix *pCCP;
+SwapConnClientPrefix(xConnClientPrefix *pCCP)
{
register char n;
@@ -131,8 +126,7 @@ SwapConnClientPrefix(pCCP)
}
void
-SwapNewClient(r)
- xLbxNewClientReq *r;
+SwapNewClient(xLbxNewClientReq *r)
{
char n;
@@ -140,8 +134,7 @@ SwapNewClient(r)
}
void
-SwapCloseClient(r)
- xLbxCloseClientReq *r;
+SwapCloseClient(xLbxCloseClientReq *r)
{
char n;
@@ -149,8 +142,7 @@ SwapCloseClient(r)
}
void
-SwapModifySequence(r)
- xLbxModifySequenceReq *r;
+SwapModifySequence(xLbxModifySequenceReq *r)
{
char n;
@@ -158,8 +150,7 @@ SwapModifySequence(r)
}
void
-SwapIncrementPixel(r)
- xLbxIncrementPixelReq *r;
+SwapIncrementPixel(xLbxIncrementPixelReq *r)
{
char n;
@@ -169,21 +160,18 @@ SwapIncrementPixel(r)
/* ARGSUSED */
void
-SwapGetModifierMapping(r)
- xLbxGetModifierMappingReq *r;
+SwapGetModifierMapping(xLbxGetModifierMappingReq *r)
{
}
/* ARGSUSED */
void
-SwapGetKeyboardMapping(r)
- xLbxGetKeyboardMappingReq *r;
+SwapGetKeyboardMapping(xLbxGetKeyboardMappingReq *r)
{
}
void
-SwapQueryFont(r)
- xLbxQueryFontReq *r;
+SwapQueryFont(xLbxQueryFontReq *r)
{
char n;
@@ -191,8 +179,7 @@ SwapQueryFont(r)
}
void
-SwapChangeProperty(r)
- xLbxChangePropertyReq *r;
+SwapChangeProperty(xLbxChangePropertyReq *r)
{
char n;
@@ -203,8 +190,7 @@ SwapChangeProperty(r)
}
void
-SwapGetProperty(r)
- xLbxGetPropertyReq *r;
+SwapGetProperty(xLbxGetPropertyReq *r)
{
char n;
@@ -216,8 +202,7 @@ SwapGetProperty(r)
}
void
-SwapGetImage (r)
- xLbxGetImageReq *r;
+SwapGetImage(xLbxGetImageReq *r)
{
char n;
@@ -231,8 +216,7 @@ SwapGetImage (r)
void
-SwapInternAtoms(r)
- xLbxInternAtomsReq *r;
+SwapInternAtoms(xLbxInternAtomsReq *r)
{
char n;
char *ptr;
@@ -255,8 +239,7 @@ SwapInternAtoms(r)
void
-SwapInvalidateTag(r)
- xLbxInvalidateTagReq *r;
+SwapInvalidateTag(xLbxInvalidateTagReq *r)
{
char n;
@@ -264,8 +247,7 @@ SwapInvalidateTag(r)
}
void
-SwapTagData(r)
- xLbxTagDataReq *r;
+SwapTagData(xLbxTagDataReq *r)
{
char n;
@@ -274,8 +256,7 @@ SwapTagData(r)
}
void
-SwapQueryExtension(r)
- xLbxQueryExtensionReq *r;
+SwapQueryExtension(xLbxQueryExtensionReq *r)
{
char n;
@@ -283,8 +264,7 @@ SwapQueryExtension(r)
}
void
-SwapLbxConnSetupPrefix(csp)
- xLbxConnSetupPrefix *csp;
+SwapLbxConnSetupPrefix(xLbxConnSetupPrefix *csp)
{
char n;
@@ -294,8 +274,7 @@ SwapLbxConnSetupPrefix(csp)
}
void
-SwapAllocColor(r)
- xLbxAllocColorReq *r;
+SwapAllocColor(xLbxAllocColorReq *r)
{
char n;
@@ -308,8 +287,7 @@ SwapAllocColor(r)
void
-SwapGrabCmap(r)
- xLbxGrabCmapReq *r;
+SwapGrabCmap(xLbxGrabCmapReq *r)
{
char n;
@@ -317,8 +295,7 @@ SwapGrabCmap(r)
}
void
-SwapReleaseCmap(r)
- xLbxReleaseCmapReq *r;
+SwapReleaseCmap(xLbxReleaseCmapReq *r)
{
char n;
diff --git a/di/tables.c b/di/tables.c
index 4774d60..49c7532 100644
--- a/di/tables.c
+++ b/di/tables.c
@@ -21,55 +21,21 @@
*
*/
-extern int ProcInitialConnection(), ProcEstablishConnection();
+#undef _XSERVER64
+#include "wire.h"
+#include "util.h"
+#include <X11/Xlibint.h>
+#include <X11/Xutil.h>
+#include "lbx.h"
-extern int ProcStandardRequest();
-
-extern int ProcLBXChangeWindowAttributes(),
- ProcLBXGetWindowAttributes(),
- ProcLBXGetGeometry(),
- ProcLBXInternAtom(),
- ProcLBXGetAtomName(),
- ProcLBXCreateColormap(),
- ProcLBXFreeColormap(),
- ProcLBXCopyColormapAndFree(),
- ProcLBXFreeColors(),
- ProcLBXLookupColor(),
- ProcLBXAllocColor(),
- ProcLBXAllocNamedColor(),
- ProcLBXAllocColorCells(),
- ProcLBXAllocColorPlanes(),
- ProcLBXGetModifierMapping(),
- ProcLBXGetKeyboardMapping(),
- ProcLBXQueryFont(),
- ProcLBXChangeProperty(),
- ProcLBXGetProperty(),
- ProcLBXCopyArea(),
- ProcLBXCopyPlane(),
- ProcLBXPolyPoint(),
- ProcLBXPolyLine(),
- ProcLBXPolySegment(),
- ProcLBXPolyRectangle(),
- ProcLBXPolyArc(),
- ProcLBXFillPoly(),
- ProcLBXPolyFillRectangle(),
- ProcLBXPolyFillArc(),
- ProcLBXPolyText(),
- ProcLBXImageText(),
- ProcLBXQueryExtension(),
- ProcLBXGetImage(),
- ProcLBXPutImage();
-
-extern int ProcBadRequest();
-
-int (*InitialVector[3]) () =
+int (*InitialVector[3])(ClientPtr) =
{
0,
ProcInitialConnection,
ProcEstablishConnection
};
-int (*ProcVector[256]) () =
+int (*ProcVector[256])(ClientPtr client) =
{
ProcBadRequest,
ProcStandardRequest,
@@ -329,11 +295,7 @@ int (*ProcVector[256]) () =
ProcStandardRequest,
};
-
-extern int ServerProcError(), ServerProcReply(),
- ServerProcStandardEvent();
-
-int (*ServerVector[256]) () = {
+int (*ServerVector[256]) (ClientPtr) = {
ServerProcStandardEvent,
ServerProcStandardEvent,
ServerProcStandardEvent,
diff --git a/di/tags.c b/di/tags.c
index 0e800f2..d3428bd 100644
--- a/di/tags.c
+++ b/di/tags.c
@@ -58,9 +58,7 @@ in this Software without prior written authorization from The Open Group.
int lbxTagCacheSize = 1 << 20;
void
-TagsInit(server, useTags)
- XServerPtr server;
- Bool useTags;
+TagsInit(XServerPtr server, Bool useTags)
{
if (!useTags) {
lbxTagCacheSize = 0;
@@ -70,7 +68,7 @@ TagsInit(server, useTags)
}
void
-FreeTags()
+FreeTags(void)
{
int i;
@@ -84,11 +82,7 @@ FreeTags()
/* ARGSUSED */
static void
-cache_free(id, client, data, reason)
- CacheID id;
- ClientPtr client;
- pointer data;
- int reason;
+cache_free(CacheID id, ClientPtr client, pointer data, int reason)
{
TagData tag = (TagData) data;
@@ -100,13 +94,8 @@ cache_free(id, client, data, reason)
}
Bool
-TagStoreData(server, cache, id, size, dtype, data)
- XServerPtr server;
- Cache cache;
- CacheID id;
- int size;
- int dtype;
- pointer data;
+TagStoreData(XServerPtr server, Cache cache, CacheID id,
+ int size, int dtype, pointer data)
{
pointer tdata;
@@ -118,13 +107,8 @@ TagStoreData(server, cache, id, size, dtype, data)
}
Bool
-TagStoreDataNC(server, cache, id, size, dtype, data)
- XServerPtr server;
- Cache cache;
- CacheID id;
- int size;
- int dtype;
- pointer data;
+TagStoreDataNC(XServerPtr server, Cache cache, CacheID id,
+ int size, int dtype, pointer data)
{
TagData tag;
Bool ret;
@@ -149,10 +133,7 @@ TagStoreDataNC(server, cache, id, size, dtype, data)
}
TagData
-TagGetTag(server, cache, id)
- XServerPtr server;
- Cache cache;
- CacheID id;
+TagGetTag(XServerPtr server, Cache cache, CacheID id)
{
TagData tag;
@@ -163,10 +144,7 @@ TagGetTag(server, cache, id)
}
pointer
-TagGetData(server, cache, id)
- XServerPtr server;
- Cache cache;
- CacheID id;
+TagGetData(XServerPtr server, Cache cache, CacheID id)
{
TagData tag;
@@ -180,11 +158,7 @@ TagGetData(server, cache, id)
}
void
-TagFreeData(server, cache, id, notify)
- XServerPtr server;
- Cache cache;
- CacheID id;
- Bool notify;
+TagFreeData(XServerPtr server, Cache cache, CacheID id, Bool notify)
{
assert(server->lbxNegOpt.useTags);
diff --git a/di/unsquish.c b/di/unsquish.c
index 9bf294e..33f72bd 100644
--- a/di/unsquish.c
+++ b/di/unsquish.c
@@ -57,6 +57,7 @@ in this Software without prior written authorization from The Open Group.
#define _XLBX_SERVER_
#include <X11/extensions/lbxstr.h>
#include "proxyopts.h"
+#include "lbx.h"
#include <stdio.h>
@@ -99,9 +100,7 @@ static char lbxevsize[] = {
};
int
-EventLength(ev, squish)
- xEvent *ev;
- Bool squish;
+EventLength(xEvent *ev, Bool squish)
{
if (!squish || ev->u.u.type >= LASTEvent)
return sz_xEvent;
@@ -109,10 +108,7 @@ EventLength(ev, squish)
}
Bool
-UnsquishEvent(rep, ev, lenp)
- xReply *rep;
- xEvent *ev;
- int *lenp;
+UnsquishEvent(xReply *rep, xEvent *ev, int *lenp)
{
if (*lenp < sz_xEvent) {
memcpy((char *)ev, (char *)rep, *lenp);
diff --git a/di/utils.c b/di/utils.c
index 60de792..5df8c06 100644
--- a/di/utils.c
+++ b/di/utils.c
@@ -91,6 +91,9 @@ static void VErrorF(const char*, va_list);
#include "atomcache.h"
#include "proxyopts.h"
+#include "tags.h"
+#include "lbxext.h"
+
#include <stdlib.h>
/*
@@ -99,18 +102,7 @@ static void VErrorF(const char*, va_list);
extern Bool PartialNetwork;
extern int lbxDebug;
-extern char protocolMode;
extern Bool reconnectAfterCloseServer;
-extern Bool resetAfterLastClient;
-extern Bool terminateAfterLastClient;
-extern int lbxTagCacheSize;
-extern Bool lbxUseLbx;
-extern Bool lbxUseTags;
-extern Bool lbxDoSquishing;
-extern Bool lbxCompressImages;
-extern Bool lbxDoAtomShortCircuiting;
-extern Bool lbxDoLbxGfx;
-extern Bool compStats;
/*
* Static vars
@@ -168,9 +160,7 @@ int zlevel = 6;
* The functions
*/
OsSigHandlerPtr
-OsSignal(sig, handler)
- int sig;
- OsSigHandlerPtr handler;
+OsSignal(int sig, OsSigHandlerPtr handler)
{
#ifdef X_NOT_POSIX
return signal(sig, handler);
@@ -191,8 +181,7 @@ OsSignal(sig, handler)
/* ARGSUSED */
SIGVAL
-AutoResetServer (sig)
- int sig;
+AutoResetServer(int sig)
{
dispatchException |= DE_RESET;
isItTimeToYield = TRUE;
@@ -209,15 +198,14 @@ AutoResetServer (sig)
/* ARGSUSED */
SIGVAL
-GiveUp(sig)
- int sig;
+GiveUp(int sig)
{
dispatchException |= DE_TERMINATE;
isItTimeToYield = TRUE;
}
static void
-AbortServer()
+AbortServer(void)
{
fflush(stderr);
if (CoreDump)
@@ -226,13 +214,12 @@ AbortServer()
}
void
-Error(str)
- char *str;
+Error(char *str)
{
perror(str);
}
-void UseMsg()
+void UseMsg(void)
{
ErrorF("use: lbxproxy [:<display>] [option]\n");
#ifdef MEMBUG
@@ -277,19 +264,15 @@ void UseMsg()
ErrorF("-cheatevents cheat on events and errors for better performance\n");
}
-void
-ShowHelpAndExit (status)
- int status;
+static void
+ShowHelpAndExit(int status)
{
UseMsg ();
exit (status);
}
static int
-proxyProcessArgument (argc, argv, i)
- int argc;
- char **argv;
- int i;
+proxyProcessArgument(int argc, char **argv, int i)
{
if (strcmp (argv[i], "-debug") == 0)
{
@@ -453,9 +436,7 @@ proxyProcessArgument (argc, argv, i)
* argc or any of the strings pointed to by argv.
*/
void
-ProcessCommandLine ( argc, argv )
-int argc;
-char *argv[];
+ProcessCommandLine(int argc, char *argv[])
{
int i, skip;
@@ -545,8 +526,7 @@ char *argv[];
*/
unsigned long *
-Xalloc (amount)
- unsigned long amount;
+Xalloc(unsigned long amount)
{
register pointer ptr;
@@ -571,8 +551,7 @@ Xalloc (amount)
*****************/
unsigned long *
-Xcalloc (amount)
- unsigned long amount;
+Xcalloc(unsigned long amount)
{
unsigned long *ret;
@@ -587,9 +566,7 @@ Xcalloc (amount)
*****************/
unsigned long *
-Xrealloc (ptr, amount)
- register pointer ptr;
- unsigned long amount;
+Xrealloc(register pointer ptr, unsigned long amount)
{
#ifdef MEMBUG
if (!Must_have_memory && Memory_fail &&
@@ -620,15 +597,14 @@ Xrealloc (ptr, amount)
*****************/
void
-Xfree(ptr)
- register pointer ptr;
+Xfree(register pointer ptr)
{
if (ptr)
free((char *)ptr);
}
void
-OsInitAllocator ()
+OsInitAllocator(void)
{
#ifdef MEMBUG
static int been_here;
@@ -696,9 +672,7 @@ ErrorF(const char * f, ...)
}
char *
-strnalloc(str, len)
- char *str;
- int len;
+strnalloc(char *str, int len)
{
char *t;
@@ -729,7 +703,7 @@ static WorkQueuePtr *workQueueLast = &workQueue;
/* ARGSUSED */
void
-ProcessWorkQueue()
+ProcessWorkQueue(void)
{
WorkQueuePtr q, n, p;
@@ -767,10 +741,8 @@ ProcessWorkQueue()
}
Bool
-QueueWorkProc (function, client, closure)
- Bool (*function)();
- ClientPtr client;
- pointer closure;
+QueueWorkProc(Bool (*function)(ClientPtr, pointer),
+ ClientPtr client, pointer closure)
{
WorkQueuePtr q;
@@ -797,17 +769,15 @@ QueueWorkProc (function, client, closure)
typedef struct _SleepQueue {
struct _SleepQueue *next;
ClientPtr client;
- Bool (*function)();
+ Bool (*function)(ClientPtr, pointer);
pointer closure;
} SleepQueueRec, *SleepQueuePtr;
static SleepQueuePtr sleepQueue = NULL;
Bool
-ClientSleep (client, function, closure)
- ClientPtr client;
- Bool (*function)();
- pointer closure;
+ClientSleep(ClientPtr client,
+ Bool (*function)(ClientPtr, pointer), pointer closure)
{
SleepQueuePtr q;
@@ -825,8 +795,7 @@ ClientSleep (client, function, closure)
}
Bool
-ClientSignal (client)
- ClientPtr client;
+ClientSignal(ClientPtr client)
{
SleepQueuePtr q;
@@ -839,8 +808,7 @@ ClientSignal (client)
}
void
-ClientWakeup (client)
- ClientPtr client;
+ClientWakeup(ClientPtr client)
{
SleepQueuePtr q, *prev;
@@ -860,8 +828,7 @@ ClientWakeup (client)
}
Bool
-ClientIsAsleep (client)
- ClientPtr client;
+ClientIsAsleep(ClientPtr client)
{
SleepQueuePtr q;
@@ -908,8 +875,7 @@ char *__XOS2RedirRoot(char *fname)
void
-LBXReadAtomsFile (server)
- XServerPtr server;
+LBXReadAtomsFile(XServerPtr server)
{
FILE *f;
char buf[256], *p;
diff --git a/di/wire.c b/di/wire.c
index 6142d92..44a73df 100644
--- a/di/wire.c
+++ b/di/wire.c
@@ -112,18 +112,14 @@ int lbxDebug = 0;
/*
* Local functions
*/
-static void LbxOnlyListenToOneClient();
-static void LbxListenToAllClients();
+static void LbxOnlyListenToOneClient(ClientPtr client);
+static void LbxListenToAllClients(XServerPtr server);
/*
* Any request that could be delta compressed comes through here
*/
void
-WriteReqToServer(client, len, buf, checkLargeRequest)
- ClientPtr client;
- int len;
- char *buf;
- Bool checkLargeRequest;
+WriteReqToServer(ClientPtr client, int len, char *buf, Bool checkLargeRequest)
{
XServerPtr server = client->server;
xLbxDeltaReq *p = (xLbxDeltaReq *) server->tempdeltabuf;
@@ -184,13 +180,8 @@ WriteReqToServer(client, len, buf, checkLargeRequest)
}
void
-_write_to_server(client, compressed, len, buf, checkLarge, startOfRequest)
- ClientPtr client;
- Bool compressed;
- int len;
- char *buf;
- Bool checkLarge;
- Bool startOfRequest;
+_write_to_server(ClientPtr client, Bool compressed, int len, char *buf,
+ Bool checkLarge, Bool startOfRequest)
{
XServerPtr server = client->server;
unsigned reqSize;
@@ -296,22 +287,15 @@ _write_to_server(client, compressed, len, buf, checkLarge, startOfRequest)
}
void
-WriteToServer(client, len, buf, startOfRequest, checkLargeRequest)
- ClientPtr client;
- int len;
- char *buf;
- Bool startOfRequest;
- Bool checkLargeRequest;
+WriteToServer(ClientPtr client, int len, char *buf,
+ Bool startOfRequest, Bool checkLargeRequest)
{
_write_to_server(client, TRUE, len, buf, checkLargeRequest, startOfRequest);
}
void
-WriteToServerUncompressed(client, len, buf, startOfRequest)
- ClientPtr client;
- int len;
- char *buf;
- Bool startOfRequest;
+WriteToServerUncompressed(ClientPtr client,
+ int len, char *buf, Bool startOfRequest)
{
_write_to_server(client, FALSE, len, buf, TRUE, startOfRequest);
}
@@ -320,9 +304,7 @@ WriteToServerUncompressed(client, len, buf, startOfRequest)
* the client they're being executed for
*/
Bool
-NewClient(client, setuplen)
- ClientPtr client;
- int setuplen;
+NewClient(ClientPtr client, int setuplen)
{
xLbxNewClientReq n;
XServerPtr server = client->server;
@@ -338,8 +320,7 @@ NewClient(client, setuplen)
}
void
-CloseClient(client)
- ClientPtr client;
+CloseClient(ClientPtr client)
{
xLbxCloseClientReq n;
XServerPtr server = client->server;
@@ -365,9 +346,7 @@ CloseClient(client)
}
void
-ModifySequence(client, num)
- ClientPtr client;
- int num;
+ModifySequence(ClientPtr client, int num)
{
xLbxModifySequenceReq req;
XServerPtr server = client->server;
@@ -385,18 +364,13 @@ ModifySequence(client, num)
}
void
-AllowMotion(client, num)
- ClientPtr client;
- int num;
+AllowMotion(ClientPtr client, int num)
{
client->server->motion_allowed += num;
}
void
-SendIncrementPixel(client, cmap, pixel)
- ClientPtr client;
- XID cmap;
- unsigned long pixel;
+SendIncrementPixel(ClientPtr client, XID cmap, unsigned long pixel)
{
xLbxIncrementPixelReq req;
XServerPtr server = client->server;
@@ -442,8 +416,7 @@ SendAllocColor(
}
void
-SendGetModifierMapping(client)
- ClientPtr client;
+SendGetModifierMapping(ClientPtr client)
{
xLbxGetModifierMappingReq req;
XServerPtr server = client->server;
@@ -461,8 +434,7 @@ SendGetModifierMapping(client)
}
void
-SendGetKeyboardMapping(client)
- ClientPtr client;
+SendGetKeyboardMapping(ClientPtr client)
{
xLbxGetKeyboardMappingReq req;
XServerPtr server = client->server;
@@ -487,9 +459,7 @@ SendGetKeyboardMapping(client)
}
void
-SendQueryFont(client, fid)
- ClientPtr client;
- XID fid;
+SendQueryFont(ClientPtr client, XID fid)
{
xLbxQueryFontReq req;
XServerPtr server = client->server;
@@ -508,14 +478,8 @@ SendQueryFont(client, fid)
}
void
-SendChangeProperty(client, win, prop, type, format, mode, num)
- ClientPtr client;
- Window win;
- Atom prop,
- type;
- int format,
- mode;
- unsigned long num;
+SendChangeProperty(ClientPtr client, Window win, Atom prop, Atom type,
+ int format, int mode, unsigned long num)
{
xLbxChangePropertyReq req;
XServerPtr server = client->server;
@@ -540,14 +504,8 @@ SendChangeProperty(client, win, prop, type, format, mode, num)
}
void
-SendGetProperty(client, win, prop, type, delete, off, len)
- ClientPtr client;
- Window win;
- Atom prop,
- type;
- Bool delete;
- unsigned long off,
- len;
+SendGetProperty(ClientPtr client, Window win, Atom prop, Atom type,
+ Bool delete, unsigned long off, unsigned long len)
{
xLbxGetPropertyReq req;
XServerPtr server = client->server;
@@ -572,9 +530,7 @@ SendGetProperty(client, win, prop, type, delete, off, len)
}
void
-SendInvalidateTag(client, tag)
- ClientPtr client;
- XID tag;
+SendInvalidateTag(ClientPtr client, XID tag)
{
xLbxInvalidateTagReq req;
XServerPtr server;
@@ -596,11 +552,7 @@ SendInvalidateTag(client, tag)
}
void
-SendTagData(client, tag, len, data)
- ClientPtr client;
- XID tag;
- unsigned long len;
- pointer data;
+SendTagData(ClientPtr client, XID tag, unsigned long len, pointer data)
{
xLbxTagDataReq req,
*reqp;
@@ -636,15 +588,9 @@ SendTagData(client, tag, len, data)
}
void
-SendGetImage(client, drawable, x, y, width, height, planeMask, format)
- ClientPtr client;
- Drawable drawable;
- int x;
- int y;
- unsigned int width;
- unsigned int height;
- unsigned long planeMask;
- int format;
+SendGetImage(ClientPtr client, Drawable drawable, int x, int y,
+ unsigned int width, unsigned int height,
+ unsigned long planeMask, int format)
{
xLbxGetImageReq req;
XServerPtr server = client->server;
@@ -672,8 +618,7 @@ SendGetImage(client, drawable, x, y, width, height, planeMask, format)
}
static Bool
-SendInternAtoms (server)
- XServerPtr server;
+SendInternAtoms(XServerPtr server)
{
xLbxInternAtomsReq *req;
int reqSize, i, num;
@@ -723,10 +668,9 @@ SendInternAtoms (server)
/*ARGSUSED*/
static void
-InternAtomsReply (server, rep)
- XServerPtr server;
- xLbxInternAtomsReply *rep;
+InternAtomsReply(XServerPtr server, void *_rep)
{
+ xLbxInternAtomsReply *rep = _rep;
Atom *atoms = (Atom *) ((char *) rep + sz_xLbxInternAtomsReplyHdr);
int i;
@@ -749,12 +693,10 @@ InternAtomsReply (server, rep)
static unsigned long pendingServerReplySequence;
-static void (*serverReplyFunc) ();
+static void (*serverReplyFunc)(XServerPtr server, void *rep);
static void
-ServerReply(server, rep)
- XServerPtr server;
- xReply *rep;
+ServerReply(XServerPtr server, xReply *rep)
{
if (serverReplyFunc &&
rep->generic.sequenceNumber == pendingServerReplySequence) {
@@ -770,28 +712,23 @@ ServerReply(server, rep)
*/
if (rep->generic.sequenceNumber == pendingServerReplySequence)
- serverReplyFunc = 0;
+ serverReplyFunc = NULL;
}
}
static void
-ExpectServerReply(server, func)
- XServerPtr server;
- void (*func) ();
+ExpectServerReply(XServerPtr server, void (*func)(XServerPtr, void*))
{
pendingServerReplySequence = server->serverClient->sequence;
serverReplyFunc = func;
}
-extern int (*ServerVector[]) ();
+extern int (*ServerVector[])(ClientPtr);
static unsigned long
-ServerRequestLength(req, sc, gotnow, partp)
- xReq *req;
- ClientPtr sc;
- int gotnow;
- Bool *partp;
+ServerRequestLength(void *_req, ClientPtr sc, int gotnow, Bool *partp)
{
+ xReq *req = _req;
XServerPtr server = servers[sc->lbxIndex];
ClientPtr client = server->recv;
xReply *rep;
@@ -841,8 +778,7 @@ ServerRequestLength(req, sc, gotnow, partp)
}
int
-ServerProcStandardEvent(sc)
- ClientPtr sc;
+ServerProcStandardEvent(ClientPtr sc)
{
xReply *rep;
XServerPtr server = servers[sc->lbxIndex];
@@ -1119,8 +1055,7 @@ ServerProcStandardEvent(sc)
}
static void
-LbxIgnoreAllClients(server)
- XServerPtr server;
+LbxIgnoreAllClients(XServerPtr server)
{
if (!server->lbxIgnoringAll) {
if (GrabInProgress) {
@@ -1134,8 +1069,7 @@ LbxIgnoreAllClients(server)
/* ARGSUSED */
static void
-LbxAttendAllClients(server)
- XServerPtr server;
+LbxAttendAllClients(XServerPtr server)
{
if (server->lbxIgnoringAll) {
ListenToAllClients();
@@ -1149,8 +1083,7 @@ LbxAttendAllClients(server)
/* ARGSUSED */
static void
-LbxOnlyListenToOneClient(client)
- ClientPtr client;
+LbxOnlyListenToOneClient(ClientPtr client)
{
/*
* For a multi-display proxy, there is no need to do anything -
@@ -1162,8 +1095,7 @@ LbxOnlyListenToOneClient(client)
/* ARGSUSED */
static void
-LbxListenToAllClients(server)
- XServerPtr server;
+LbxListenToAllClients(XServerPtr server)
{
/*
* For a multi-display proxy, there is no need to do anything -
@@ -1175,14 +1107,12 @@ LbxListenToAllClients(server)
/* ARGSUSED */
static Bool
-ProxyWorkProc(dummy, index)
- pointer dummy;
- int index;
+ProxyWorkProc(ClientPtr unused_client, pointer index)
{
XServerPtr server;
xLbxAllowMotionReq req;
- if ((server = servers[index]) == 0)
+ if ((server = servers[(int)index]) == 0)
return TRUE;
if (!server->initialized)
return TRUE;
@@ -1222,8 +1152,7 @@ ProxyWorkProc(dummy, index)
Bool reconnectAfterCloseServer = FALSE;
void
-CloseServer(client)
- ClientPtr client; /* This client is connected to a display server */
+CloseServer(ClientPtr client /* This client is connected to a display server */)
{
XServerPtr server;
int i;
@@ -1316,10 +1245,9 @@ CloseServer(client)
static void
-StartProxyReply(server, rep)
- XServerPtr server;
- xLbxStartReply *rep;
+StartProxyReply(XServerPtr server, void *_rep)
{
+ xLbxStartReply *rep = _rep;
int replylen;
replylen = (rep->length << 2) + sz_xLbxStartReply - sz_xLbxStartReplyHdr;
@@ -1368,8 +1296,10 @@ StartProxyReply(server, rep)
(*server->lbxNegOpt.streamOpts.streamCompInit) (
server->fd, server->lbxNegOpt.streamOpts.streamCompArg);
SwitchConnectionFuncs(server->serverClient,
- server->lbxNegOpt.streamOpts.streamCompRead,
- server->lbxNegOpt.streamOpts.streamCompWriteV);
+ (int (*)(int, void *, int))
+ server->lbxNegOpt.streamOpts.streamCompRead,
+ (int (*)(int, void *, int))
+ server->lbxNegOpt.streamOpts.streamCompWriteV);
extra += len;
server->lbxNegOpt.streamOpts.streamCompStuffInput(server->fd,
extra,
@@ -1397,8 +1327,7 @@ StartProxyReply(server, rep)
}
static void
-StartProxy(server)
- XServerPtr server;
+StartProxy(XServerPtr server)
{
char buf[1024];
int reqlen;
@@ -1421,11 +1350,7 @@ StartProxy(server)
}
static Bool
-InitServer (dpy_name, i, server, sequencep)
- char* dpy_name;
- int i;
- XServerPtr server;
- int* sequencep;
+InitServer(char *dpy_name, int i, XServerPtr server, int *sequencep)
{
server->index = i;
@@ -1473,7 +1398,7 @@ InitServer (dpy_name, i, server, sequencep)
* When a client connects, its requestVector will be set to its
* server's requestVector.
*/
- server->requestVector = (int (**)()) xalloc (sizeof (ProcVector));
+ server->requestVector = (int (**)(ClientPtr)) xalloc (sizeof (ProcVector));
if (!server->requestVector) return FALSE;
memcpy (server->requestVector, ProcVector, sizeof (ProcVector));
@@ -1492,8 +1417,7 @@ InitServer (dpy_name, i, server, sequencep)
}
Bool
-ConnectToServer(dpy_name)
- char *dpy_name;
+ConnectToServer(char *dpy_name)
{
int i, j;
XServerPtr server;
diff --git a/di/zeropad.c b/di/zeropad.c
index e57f547..14ff08b 100644
--- a/di/zeropad.c
+++ b/di/zeropad.c
@@ -35,11 +35,13 @@ from The Open Group.
*/
#include <X11/Xproto.h>
+#include "lbx.h"
+#include "lbxext.h"
static void
-ZeroEmptyReq (req)
- xReq *req;
+ZeroEmptyReq(void *_req)
{
+ xReq *req = _req;
req->data = 0;
}
@@ -58,9 +60,9 @@ ZeroEmptyReq (req)
static void
-ZeroResourceReq (req)
- xResourceReq *req;
+ZeroResourceReq(void *_req)
{
+ xResourceReq *req = _req;
req->pad = 0;
}
@@ -92,203 +94,203 @@ ZeroResourceReq (req)
static void
-ZeroChangeWindowAttributesReq (req)
- xChangeWindowAttributesReq *req;
+ZeroChangeWindowAttributesReq(void *_req)
{
+ xChangeWindowAttributesReq *req = _req;
req->pad = 0;
}
static void
-ZeroReparentWindowReq (req)
- xReparentWindowReq *req;
+ZeroReparentWindowReq(void *_req)
{
+ xReparentWindowReq *req = _req;
req->pad = 0;
}
static void
-ZeroConfigureWindowReq (req)
- xConfigureWindowReq *req;
+ZeroConfigureWindowReq(void *_req)
{
+ xConfigureWindowReq *req = _req;
req->pad = 0;
req->pad2 = 0;
}
static void
-ZeroInternAtomReq (req)
- xInternAtomReq *req;
+ZeroInternAtomReq(void *_req)
{
+ xInternAtomReq *req = _req;
req->pad = 0;
}
static void
-ZeroChangePropertyReq (req)
- xChangePropertyReq *req;
+ZeroChangePropertyReq(void *_req)
{
+ xChangePropertyReq *req = _req;
req->pad[0] = 0;
req->pad[1] = 0;
req->pad[2] = 0;
}
static void
-ZeroDeletePropertyReq (req)
- xDeletePropertyReq *req;
+ZeroDeletePropertyReq(void *_req)
{
+ xDeletePropertyReq *req = _req;
req->pad = 0;
}
static void
-ZeroSetSelectionOwnerReq (req)
- xSetSelectionOwnerReq *req;
+ZeroSetSelectionOwnerReq(void *_req)
{
+ xSetSelectionOwnerReq *req = _req;
req->pad = 0;
}
static void
-ZeroConvertSelectionReq (req)
- xConvertSelectionReq *req;
+ZeroConvertSelectionReq(void *_req)
{
+ xConvertSelectionReq *req = _req;
req->pad = 0;
}
static void
-ZeroGrabButtonReq (req)
- xGrabButtonReq *req;
+ZeroGrabButtonReq(void *_req)
{
+ xGrabButtonReq *req = _req;
req->pad = 0;
}
static void
-ZeroUngrabButtonReq (req)
- xUngrabButtonReq *req;
+ZeroUngrabButtonReq(void *_req)
{
+ xUngrabButtonReq *req = _req;
req->pad = 0;
}
static void
-ZeroChangeActivePointerGrabReq (req)
- xChangeActivePointerGrabReq *req;
+ZeroChangeActivePointerGrabReq(void *_req)
{
+ xChangeActivePointerGrabReq *req = _req;
req->pad = 0;
req->pad2 = 0;
}
static void
-ZeroGrabKeyboardReq (req)
- xGrabKeyboardReq *req;
+ZeroGrabKeyboardReq(void *_req)
{
+ xGrabKeyboardReq *req = _req;
req->pad = 0;
}
static void
-ZeroGrabKeyReq (req)
- xGrabKeyReq *req;
+ZeroGrabKeyReq(void *_req)
{
+ xGrabKeyReq *req = _req;
req->pad1 = 0;
req->pad2 = 0;
req->pad3 = 0;
}
static void
-ZeroUngrabKeyReq (req)
- xUngrabKeyReq *req;
+ZeroUngrabKeyReq(void *_req)
{
+ xUngrabKeyReq *req = _req;
req->pad = 0;
}
static void
-ZeroGetMotionEventsReq (req)
- xGetMotionEventsReq *req;
+ZeroGetMotionEventsReq(void *_req)
{
+ xGetMotionEventsReq *req = _req;
req->pad = 0;
}
static void
-ZeroTranslateCoordsReq (req)
- xTranslateCoordsReq *req;
+ZeroTranslateCoordsReq(void *_req)
{
+ xTranslateCoordsReq *req = _req;
req->pad = 0;
}
static void
-ZeroWarpPointerReq (req)
- xWarpPointerReq *req;
+ZeroWarpPointerReq(void *_req)
{
+ xWarpPointerReq *req = _req;
req->pad = 0;
}
static void
-ZeroOpenFontReq (req)
- xOpenFontReq *req;
+ZeroOpenFontReq(void *_req)
{
+ xOpenFontReq *req = _req;
req->pad = 0;
req->pad1 = 0;
req->pad2 = 0;
}
static void
-ZeroListFontsReq (req)
- xListFontsReq *req;
+ZeroListFontsReq(void *_req)
{
+ xListFontsReq *req = _req;
req->pad = 0;
}
#define ZeroListFontsWithInfoReq ZeroListFontsReq
static void
-ZeroSetFontPathReq (req)
- xSetFontPathReq *req;
+ZeroSetFontPathReq(void *_req)
{
+ xSetFontPathReq *req = _req;
req->pad = 0;
req->pad1 = 0;
req->pad2 = 0;
}
static void
-ZeroCreateGCReq (req)
- xCreateGCReq *req;
+ZeroCreateGCReq(void *_req)
{
+ xCreateGCReq *req = _req;
req->pad = 0;
}
static void
-ZeroChangeGCReq (req)
- xChangeGCReq *req;
+ZeroChangeGCReq(void *_req)
{
+ xChangeGCReq *req = _req;
req->pad = 0;
}
static void
-ZeroCopyGCReq (req)
- xCopyGCReq *req;
+ZeroCopyGCReq(void *_req)
{
+ xCopyGCReq *req = _req;
req->pad = 0;
}
static void
-ZeroSetDashesReq (req)
- xSetDashesReq *req;
+ZeroSetDashesReq(void *_req)
{
+ xSetDashesReq *req = _req;
req->pad = 0;
}
static void
-ZeroCopyAreaReq (req)
- xCopyAreaReq *req;
+ZeroCopyAreaReq(void *_req)
{
+ xCopyAreaReq *req = _req;
req->pad = 0;
}
static void
-ZeroCopyPlaneReq (req)
- xCopyPlaneReq *req;
+ZeroCopyPlaneReq(void *_req)
{
+ xCopyPlaneReq *req = _req;
req->pad = 0;
}
static void
-ZeroPolySegmentReq (req)
- xPolySegmentReq *req;
+ZeroPolySegmentReq(void *_req)
{
+ xPolySegmentReq *req = _req;
req->pad = 0;
}
@@ -298,24 +300,24 @@ ZeroPolySegmentReq (req)
#define ZeroPolyFillArcReq ZeroPolySegmentReq
static void
-ZeroFillPolyReq (req)
- xFillPolyReq *req;
+ZeroFillPolyReq(void *_req)
{
+ xFillPolyReq *req = _req;
req->pad = 0;
req->pad1 = 0;
}
static void
-ZeroPutImageReq (req)
- xPutImageReq *req;
+ZeroPutImageReq(void *_req)
{
+ xPutImageReq *req = _req;
req->pad = 0;
}
static void
-ZeroPolyTextReq (req)
- xPolyTextReq *req;
+ZeroPolyTextReq(void *_req)
{
+ xPolyTextReq *req = _req;
req->pad = 0;
}
@@ -323,184 +325,184 @@ ZeroPolyTextReq (req)
#define ZeroPolyText16Req ZeroPolyTextReq
static void
-ZeroCopyColormapAndFreeReq (req)
- xCopyColormapAndFreeReq *req;
+ZeroCopyColormapAndFreeReq(void *_req)
{
+ xCopyColormapAndFreeReq *req = _req;
req->pad = 0;
}
static void
-ZeroAllocColorReq (req)
- xAllocColorReq *req;
+ZeroAllocColorReq(void *_req)
{
+ xAllocColorReq *req = _req;
req->pad = 0;
req->pad2 = 0;
}
static void
-ZeroAllocNamedColorReq (req)
- xAllocNamedColorReq *req;
+ZeroAllocNamedColorReq(void *_req)
{
+ xAllocNamedColorReq *req = _req;
req->pad = 0;
req->pad1 = 0;
req->pad2 = 0;
}
static void
-ZeroFreeColorsReq (req)
- xFreeColorsReq *req;
+ZeroFreeColorsReq(void *_req)
{
+ xFreeColorsReq *req = _req;
req->pad = 0;
}
static void
-ZeroStoreColorsReq (req)
- xStoreColorsReq *req;
+ZeroStoreColorsReq(void *_req)
{
+ xStoreColorsReq *req = _req;
req->pad = 0;
}
static void
-ZeroStoreNamedColorReq (req)
- xStoreNamedColorReq *req;
+ZeroStoreNamedColorReq(void *_req)
{
+ xStoreNamedColorReq *req = _req;
req->pad1 = 0;
req->pad2 = 0;
}
static void
-ZeroQueryColorsReq (req)
- xQueryColorsReq *req;
+ZeroQueryColorsReq(void *_req)
{
+ xQueryColorsReq *req = _req;
req->pad = 0;
}
static void
-ZeroLookupColorReq (req)
- xLookupColorReq *req;
+ZeroLookupColorReq(void *_req)
{
+ xLookupColorReq *req = _req;
req->pad = 0;
req->pad1 = 0;
req->pad2 = 0;
}
static void
-ZeroCreateCursorReq (req)
- xCreateCursorReq *req;
+ZeroCreateCursorReq(void *_req)
{
+ xCreateCursorReq *req = _req;
req->pad = 0;
}
static void
-ZeroCreateGlyphCursorReq (req)
- xCreateGlyphCursorReq *req;
+ZeroCreateGlyphCursorReq(void *_req)
{
+ xCreateGlyphCursorReq *req = _req;
req->pad = 0;
}
static void
-ZeroRecolorCursorReq (req)
- xRecolorCursorReq *req;
+ZeroRecolorCursorReq(void *_req)
{
+ xRecolorCursorReq *req = _req;
req->pad = 0;
}
static void
-ZeroQueryExtensionReq (req)
- xQueryExtensionReq *req;
+ZeroQueryExtensionReq(void *_req)
{
+ xQueryExtensionReq *req = _req;
req->pad = 0;
req->pad1 = 0;
req->pad2 = 0;
}
static void
-ZeroGetKeyboardMappingReq (req)
- xGetKeyboardMappingReq *req;
+ZeroGetKeyboardMappingReq(void *_req)
{
+ xGetKeyboardMappingReq *req = _req;
req->pad = 0;
req->pad1 = 0;
}
static void
-ZeroChangeKeyboardMappingReq (req)
- xChangeKeyboardMappingReq *req;
+ZeroChangeKeyboardMappingReq(void *_req)
{
+ xChangeKeyboardMappingReq *req = _req;
req->pad1 = 0;
}
static void
-ZeroChangeKeyboardControlReq (req)
- xChangeKeyboardControlReq *req;
+ZeroChangeKeyboardControlReq(void *_req)
{
+ xChangeKeyboardControlReq *req = _req;
req->pad = 0;
}
static void
-ZeroChangePointerControlReq (req)
- xChangePointerControlReq *req;
+ZeroChangePointerControlReq(void *_req)
{
+ xChangePointerControlReq *req = _req;
req->pad = 0;
}
static void
-ZeroSetScreenSaverReq (req)
- xSetScreenSaverReq *req;
+ZeroSetScreenSaverReq(void *_req)
{
+ xSetScreenSaverReq *req = _req;
req->pad = 0;
req->pad2 = 0;
}
static void
-ZeroChangeHostsReq (req)
- xChangeHostsReq *req;
+ZeroChangeHostsReq(void *_req)
{
+ xChangeHostsReq *req = _req;
req->pad = 0;
}
static void
-ZeroListHostsReq (req)
- xListHostsReq *req;
+ZeroListHostsReq(void *_req)
{
+ xListHostsReq *req = _req;
req->pad = 0;
}
static void
-ZeroRotatePropertiesReq (req)
- xRotatePropertiesReq *req;
+ZeroRotatePropertiesReq(void *_req)
{
+ xRotatePropertiesReq *req = _req;
req->pad = 0;
}
-void (*ZeroPadReqVector[128]) () =
+void (*ZeroPadReqVector[128])(void *) =
{
- 0,
- 0, /* CreateWindowReq */
+ NULL,
+ NULL, /* CreateWindowReq */
ZeroChangeWindowAttributesReq,
ZeroGetWindowAttributesReq,
ZeroDestroyWindowReq,
ZeroDestroySubwindowsReq, /* 5 */
- 0, /* ChangeSaveSetReq */
+ NULL, /* ChangeSaveSetReq */
ZeroReparentWindowReq,
ZeroMapWindowReq,
ZeroMapSubwindowsReq,
ZeroUnmapWindowReq, /* 10 */
ZeroUnmapSubwindowsReq,
ZeroConfigureWindowReq,
- 0, /* CirculateWindowReq */
+ NULL, /* CirculateWindowReq */
ZeroGetGeometryReq,
ZeroQueryTreeReq, /* 15 */
ZeroInternAtomReq,
ZeroGetAtomNameReq,
ZeroChangePropertyReq,
ZeroDeletePropertyReq,
- 0, /* GetPropertyReq */ /* 20 */
+ NULL, /* GetPropertyReq */ /* 20 */
ZeroListPropertiesReq,
ZeroSetSelectionOwnerReq,
ZeroGetSelectionOwnerReq,
ZeroConvertSelectionReq,
- 0, /* SendEventReq */ /* 25 */
- 0, /* GrabPointerReq */
+ NULL, /* SendEventReq */ /* 25 */
+ NULL, /* GrabPointerReq */
ZeroUngrabPointerReq,
ZeroGrabButtonReq,
ZeroUngrabButtonReq,
@@ -509,37 +511,37 @@ void (*ZeroPadReqVector[128]) () =
ZeroUngrabKeyboardReq,
ZeroGrabKeyReq,
ZeroUngrabKeyReq,
- 0, /* AllowEventsReq */ /* 35 */
+ NULL, /* AllowEventsReq */ /* 35 */
ZeroGrabServerReq,
ZeroUngrabServerReq,
ZeroQueryPointerReq,
ZeroGetMotionEventsReq,
ZeroTranslateCoordsReq, /* 40 */
ZeroWarpPointerReq,
- 0, /* SetInputFocusReq */
+ NULL, /* SetInputFocusReq */
ZeroGetInputFocusReq,
ZeroQueryKeymapReq,
ZeroOpenFontReq, /* 45 */
ZeroCloseFontReq,
ZeroQueryFontReq,
- 0, /* QueryTextExtentsReq */
+ NULL, /* QueryTextExtentsReq */
ZeroListFontsReq,
ZeroListFontsWithInfoReq, /* 50 */
ZeroSetFontPathReq,
ZeroGetFontPathReq,
- 0, /* CreatePixmapReq */
+ NULL, /* CreatePixmapReq */
ZeroFreePixmapReq,
ZeroCreateGCReq, /* 55 */
ZeroChangeGCReq,
ZeroCopyGCReq,
ZeroSetDashesReq,
- 0, /* SetClipRectanglesReq */
+ NULL, /* SetClipRectanglesReq */
ZeroFreeGCReq, /* 60 */
- 0, /* ClearToBackgroundReq */
+ NULL, /* ClearToBackgroundReq */
ZeroCopyAreaReq,
ZeroCopyPlaneReq,
- 0, /* PolyPointReq */
- 0, /* PolyLineReq */ /* 65 */
+ NULL, /* PolyPointReq */
+ NULL, /* PolyLineReq */ /* 65 */
ZeroPolySegmentReq,
ZeroPolyRectangleReq,
ZeroPolyArcReq,
@@ -547,12 +549,12 @@ void (*ZeroPadReqVector[128]) () =
ZeroPolyFillRectangleReq, /* 70 */
ZeroPolyFillArcReq,
ZeroPutImageReq,
- 0, /* GetImageReq */
+ NULL, /* GetImageReq */
ZeroPolyText8Req,
ZeroPolyText16Req, /* 75 */
- 0, /* ImageText8Req */
- 0, /* ImageText16Req */
- 0, /* CreateColormapReq */
+ NULL, /* ImageText8Req */
+ NULL, /* ImageText16Req */
+ NULL, /* CreateColormapReq */
ZeroFreeColormapReq,
ZeroCopyColormapAndFreeReq, /* 80 */
ZeroInstallColormapReq,
@@ -560,8 +562,8 @@ void (*ZeroPadReqVector[128]) () =
ZeroListInstalledColormapsReq,
ZeroAllocColorReq,
ZeroAllocNamedColorReq, /* 85 */
- 0, /* AllocColorCellsReq */
- 0, /* AllocColorPlanesReq */
+ NULL, /* AllocColorCellsReq */
+ NULL, /* AllocColorPlanesReq */
ZeroFreeColorsReq,
ZeroStoreColorsReq,
ZeroStoreNamedColorReq, /* 90 */
@@ -571,35 +573,35 @@ void (*ZeroPadReqVector[128]) () =
ZeroCreateGlyphCursorReq,
ZeroFreeCursorReq, /* 95 */
ZeroRecolorCursorReq,
- 0, /* QueryBestSizeReq */
+ NULL, /* QueryBestSizeReq */
ZeroQueryExtensionReq,
ZeroListExtensionsReq,
ZeroChangeKeyboardMappingReq, /* 100 */
ZeroGetKeyboardMappingReq,
ZeroChangeKeyboardControlReq,
ZeroGetKeyboardControlReq,
- 0, /* BellReq */
+ NULL, /* BellReq */
ZeroChangePointerControlReq, /* 105 */
ZeroGetPointerControlReq,
ZeroSetScreenSaverReq,
ZeroGetScreenSaverReq,
ZeroChangeHostsReq,
ZeroListHostsReq, /* 110 */
- 0, /* ChangeAccessControlReq */
- 0, /* ChangeCloseDownModeReq */
+ NULL, /* ChangeAccessControlReq */
+ NULL, /* ChangeCloseDownModeReq */
ZeroKillClientReq,
ZeroRotatePropertiesReq,
- 0, /* ForceScreenSaverReq */ /* 115 */
- 0, /* SetPointerMappingReq */
+ NULL, /* ForceScreenSaverReq */ /* 115 */
+ NULL, /* SetPointerMappingReq */
ZeroGetPointerMappingReq,
- 0, /* SetModifierMappingReq */
+ NULL, /* SetModifierMappingReq */
ZeroGetModifierMappingReq,
- 0, /* 120 */
- 0,
- 0,
- 0,
- 0,
- 0, /* 125 */
- 0,
+ NULL, /* 120 */
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL, /* 125 */
+ NULL,
ZeroNoOperationReq
};
diff --git a/include/cache.h b/include/cache.h
index c8ffdff..9a80b35 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -63,7 +63,7 @@ from The Open Group.
typedef unsigned long CacheID;
typedef unsigned long Cache;
-typedef void (*CacheFree) ();
+typedef void (*CacheFree) (CacheID id, ClientPtr client, pointer data, int flag);
typedef struct _cache *CachePtr;
diff --git a/include/lbx.h b/include/lbx.h
index 130d730..18cf905 100644
--- a/include/lbx.h
+++ b/include/lbx.h
@@ -182,10 +182,10 @@ typedef struct {
typedef struct _ClientPublic {
- int (*writeToClient) ();
- int (*uncompressedWriteToClient) ();
- unsigned long (*requestLength) ();
- int (*readRequest)();
+ int (*writeToClient)(ClientPtr, int, void *);
+ int (*uncompressedWriteToClient)(ClientPtr, int, void *);
+ unsigned long (*requestLength)(void *, ClientPtr, int, Bool *);
+ int (*readRequest)(ClientPtr);
} ClientPublicRec, *ClientPublicPtr;
typedef struct _Client {
@@ -436,62 +436,56 @@ extern int getprop_tag,
extern int tag_bytes_unsent; /* approx data kept off wire by tags */
-extern void DumpOtherStats();
-extern void ZeroOtherStats();
+extern void DumpOtherStats(void);
+extern void ZeroOtherStats(void);
#endif /* LBX_STATS */
-extern void DumpCompressionStats();
-extern void ZeroCompressionStats();
-
-/* tables.c */
-extern int ProcLBXInternAtom(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXGetAtomName(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXCreateColormap(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXAllocColor(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXAllocNamedColor(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXFreeColormap(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXCopyColormapAndFree(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXFreeColors(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXLookupColor(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXGetModifierMapping(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXGetKeyboardMapping(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXQueryFont(
- ClientPtr /*client*/
-);
+extern void DumpCompressionStats(void);
+extern void ZeroCompressionStats(void);
+
+extern void CloseDownClient(ClientPtr client);
+
+extern int ProcBadRequest(ClientPtr client);
+extern int ProcEstablishConnection(ClientPtr client);
+extern int ProcInitialConnection(ClientPtr client);
+
+extern int ProcLBXAllocColor(ClientPtr client);
+extern int ProcLBXAllocColorCells(ClientPtr client);
+extern int ProcLBXAllocColorPlanes(ClientPtr client);
+extern int ProcLBXAllocNamedColor(ClientPtr client);
+extern int ProcLBXChangeProperty(ClientPtr client);
+extern int ProcLBXChangeWindowAttributes(ClientPtr client);
+extern int ProcLBXCopyArea(ClientPtr client);
+extern int ProcLBXCopyColormapAndFree(ClientPtr client);
+extern int ProcLBXCopyPlane(ClientPtr client);
+extern int ProcLBXCreateColormap(ClientPtr client);
+extern int ProcLBXPolyFillArc(ClientPtr client);
+extern int ProcLBXFillPoly(ClientPtr client);
+extern int ProcLBXPolyFillRectangle(ClientPtr client);
+extern int ProcLBXFreeColormap(ClientPtr client);
+extern int ProcLBXFreeColors(ClientPtr client);
+extern int ProcLBXGetAtomName(ClientPtr client);
+extern int ProcLBXGetGeometry(ClientPtr client);
+extern int ProcLBXGetKeyboardMapping(ClientPtr client);
+extern int ProcLBXGetModifierMapping(ClientPtr client);
+extern int ProcLBXGetProperty(ClientPtr client);
+extern int ProcLBXGetWindowAttributes(ClientPtr client);
+extern int ProcLBXGetImage(ClientPtr client);
+extern int ProcLBXImageText(ClientPtr client);
+extern int ProcLBXInternAtom(ClientPtr client);
+extern int ProcLBXLookupColor(ClientPtr client);
+extern int ProcLBXPolyArc(ClientPtr client);
+extern int ProcLBXPolyLine(ClientPtr client);
+extern int ProcLBXPolyPoint(ClientPtr client);
+extern int ProcLBXPolyRectangle(ClientPtr client);
+extern int ProcLBXPolySegment(ClientPtr client);
+extern int ProcLBXPolyText(ClientPtr client);
+extern int ProcLBXPutImage(ClientPtr client);
+extern int ProcLBXQueryExtension(ClientPtr client);
+extern int ProcLBXQueryFont(ClientPtr client);
+
+extern int ProcStandardRequest(ClientPtr client);
extern void FinishLBXRequest(
ClientPtr /*client*/,
@@ -516,8 +510,6 @@ extern void SendLbxSync(
ClientPtr /*client*/
);
-/* dispatch.c */
-
extern int Dispatch(
void
);
@@ -535,26 +527,6 @@ extern ClientPtr NextAvailableClient(
int /* connect_fd */ /* the fd the client connected on */
);
-extern int ProcInitialConnection(
- ClientPtr /*client*/
-);
-
-extern int ProcEstablishConnection(
- ClientPtr /*client*/
-);
-
-extern void CloseDownClient(
- ClientPtr /*client*/
-);
-
-extern int ProcStandardRequest(
- ClientPtr /*client*/
-);
-
-extern int ProcBadRequest(
- ClientPtr /*client*/
-);
-
extern void AdjustProcVector(
void
);
@@ -635,14 +607,4 @@ extern Bool UnsquishEvent(
int * /*lenp*/
);
-/* props.c */
-
-extern int ProcLBXChangeProperty(
- ClientPtr /*client*/
-);
-
-extern int ProcLBXGetProperty(
- ClientPtr /*client*/
-);
-
#endif
diff --git a/include/lbxext.h b/include/lbxext.h
index 637ec04..566b32d 100644
--- a/include/lbxext.h
+++ b/include/lbxext.h
@@ -85,6 +85,9 @@ typedef struct _vectors {
SExtensionRequests sreq_vector;
} ExtensionVectors;
+extern int (*InitialVector[3]) (
+ ClientPtr /* client */
+);
extern int (*ProcVector[256]) (
ClientPtr /*client*/
);
@@ -131,4 +134,20 @@ extern int ProcLBXQueryExtension(
ClientPtr /*client*/
);
+extern char protocolMode;
+extern void (*ZeroPadReqVector[128])(void *);
+extern Bool lbxCompressImages;
+extern Bool lbxDoAtomShortCircuiting;
+extern Bool lbxDoLbxGfx;
+extern Bool lbxUseLbx;
+extern Bool lbxZeroPad;
+extern Bool resetAfterLastClient;
+extern Bool terminateAfterLastClient;
+
+extern int gfx_gc_hit;
+extern int gfx_gc_miss;
+extern int gfx_draw_hit;
+extern int gfx_draw_miss;
+extern int gfx_total;
+
#endif /* _LBXEXT_H_ */
diff --git a/include/os.h b/include/os.h
index 4f58fe5..ec20525 100644
--- a/include/os.h
+++ b/include/os.h
@@ -42,15 +42,11 @@ extern fd_set ClientsWithInput;
extern fd_set ClientsWriteBlocked;
extern fd_set OutputPending;
-/* WaitFor.c */
-
extern int WaitForSomething(
int * /*pClientsReady*/,
Bool /* poll */
);
-/* connection.c */
-
extern Bool NewOutputPending;
extern Bool AnyClientsWriteBlocked;
extern int GrabInProgress;
@@ -96,14 +92,14 @@ extern ClientPtr AllocNewConnection(
extern void SwitchConnectionFuncs(
ClientPtr /*client*/,
- int (* /*Read*/)(),
- int (* /*Writev*/)()
+ int (* /*Read*/)(int, void *, int),
+ int (* /*Writev*/)(int, void *, int)
);
extern void StartOutputCompression(
ClientPtr /*client*/,
- void (* /*CompressOn*/)(),
- void (* /*CompressOff*/)()
+ void (* /*CompressOn*/)(int),
+ void (* /*CompressOff*/)(int)
);
extern Bool EstablishNewConnections(
@@ -147,10 +143,8 @@ extern void MakeClientGrabPervious(
ClientPtr /*client*/
);
-/* io.c */
-
extern unsigned long StandardRequestLength(
- xReq * /*req*/,
+ void * /*req*/,
ClientPtr /*client*/,
int /*got*/,
Bool * /*partp*/
@@ -198,23 +192,23 @@ extern void FlushAllOutput(
extern int StandardWriteToClient(
ClientPtr /*who*/,
int /*count*/,
- char * /*buf*/
+ void * /*buf*/
);
extern int UncompressWriteToClient(
ClientPtr /*who*/,
int /*count*/,
- char * /*buf*/
+ void * /*buf*/
);
extern void ResetOsBuffers(
void
);
-/* osinit.c */
-
extern void OsInit(
void
);
+extern void MarkClientException(ClientPtr client);
+
#endif
diff --git a/include/proxyopts.h b/include/proxyopts.h
index 3d29ee2..3036efb 100644
--- a/include/proxyopts.h
+++ b/include/proxyopts.h
@@ -80,13 +80,13 @@ extern void LbxOptInit(
extern int LbxOptBuildReq(
XServerPtr /*server*/,
- char * /*buf*/
+ void * /*buf*/
);
extern int LbxOptParseReply(
XServerPtr /*server*/,
int /*nopts*/,
- unsigned char * /*preply*/,
+ void * /*preply*/,
int /*replylen*/
);
diff --git a/include/tags.h b/include/tags.h
index 866a5b8..0bf7693 100644
--- a/include/tags.h
+++ b/include/tags.h
@@ -115,5 +115,9 @@ extern Bool AnyTagBearingReplies(
extern Cache global_cache;
extern Cache prop_cache;
+extern int lbxTagCacheSize;
+extern Bool lbxUseTags;
+extern Bool lbxDoSquishing;
+extern Bool compStats;
#endif /* _TAGS_H_ */
diff --git a/include/util.h b/include/util.h
index 178459e..bff9856 100644
--- a/include/util.h
+++ b/include/util.h
@@ -157,14 +157,14 @@ extern void ProcessWorkQueue(
);
extern Bool QueueWorkProc(
- Bool (* /*function*/)(),
+ Bool (* /*function*/)(ClientPtr, pointer),
ClientPtr /*client*/,
pointer /*closure*/
);
extern Bool ClientSleep(
ClientPtr /*client*/,
- Bool (* /*function*/)(),
+ Bool (* /*function*/)(ClientPtr, pointer),
pointer /*closure*/
);
diff --git a/include/wire.h b/include/wire.h
index 2bdd54e..eb4f26a 100644
--- a/include/wire.h
+++ b/include/wire.h
@@ -96,8 +96,8 @@ typedef struct _extinfo *ExtensionInfoPtr;
typedef struct _LbxOptionsListRec {
CARD8 optcode;
Bool negotiate;
- int (*req)();
- int (*reply)();
+ int (*req)(XServerPtr, void *);
+ int (*reply)(XServerPtr, void *, int);
} LbxOptionsListRec;
typedef struct _LbxDeltaOptionsRec {
@@ -112,8 +112,8 @@ typedef struct _LbxDeltaOptionsRec {
typedef struct _LbxStreamComp {
int typelen;
char *type;
- int (*req)();
- int (*reply)();
+ int (*req)(XServerPtr, void *);
+ int (*reply)(XServerPtr, void *, int);
} LbxStreamCompRec;
typedef struct _LbxCmapAllMethod {
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 7abda8b..8722663 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -95,9 +95,7 @@ mffs(fd_mask mask)
*****************/
int
-WaitForSomething(pClientsReady, poll)
- int *pClientsReady;
- Bool poll;
+WaitForSomething(int *pClientsReady, Bool poll)
{
int i;
struct timeval zerowt = {0, 0};
diff --git a/os/connection.c b/os/connection.c
index c9d6350..cbb3721 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -165,8 +165,7 @@ static void ErrorConnMax(
static Bool
-PickNewListenDisplay (displayP)
- char **displayP;
+PickNewListenDisplay(char **displayP)
{
static char newDisplay[16];
long displayNum;
@@ -176,15 +175,14 @@ PickNewListenDisplay (displayP)
if ((displayNum >= 65535) || (displayNum < 0) || (errno != 0))
return (FALSE);
- sprintf (newDisplay, "%d", displayNum + 1);
+ sprintf (newDisplay, "%d", (int)(displayNum + 1));
*displayP = newDisplay;
return (TRUE);
}
static XtransConnInfo
-lookup_trans_conn (fd)
- int fd;
+lookup_trans_conn(int fd)
{
if (ListenTransFds)
{
@@ -201,7 +199,7 @@ lookup_trans_conn (fd)
/* Set MaxClients and lastfdesc, and allocate ConnectionTranslation */
void
-InitConnectionLimits()
+InitConnectionLimits(void)
{
lastfdesc = -1;
@@ -250,8 +248,7 @@ InitConnectionLimits()
* Create the socket(s) that clients will used for one server.
*/
void
-CreateServerSockets(fds)
- int fds[];
+CreateServerSockets(int fds[])
{
int done = 0;
int partial;
@@ -348,7 +345,7 @@ CreateServerSockets(fds)
}
void
-CloseServerSockets()
+CloseServerSockets(void)
{
int i;
@@ -363,7 +360,7 @@ CloseServerSockets()
* requested.
*****************/
void
-CreateWellKnownSockets()
+CreateWellKnownSockets(void)
{
int i;
@@ -407,21 +404,20 @@ CreateWellKnownSockets()
}
void
-ListenToProxyManager ()
+ListenToProxyManager(void)
{
if (proxy_manager_fd >= 0)
FD_SET(proxy_manager_fd, &AllSockets);
}
void
-ListenWellKnownSockets ()
+ListenWellKnownSockets(void)
{
XFD_ORSET (&AllSockets, &AllSockets, &WellKnownConnections);
}
void
-AvailableClientInput (client)
- ClientPtr client;
+AvailableClientInput(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
@@ -430,10 +426,7 @@ AvailableClientInput (client)
}
static int
-ClientRead (fd, buf, len)
- int fd;
- char *buf;
- int len;
+ClientRead(int fd, void *buf, int len)
{
int n;
n = read(fd, buf, len);
@@ -443,23 +436,17 @@ ClientRead (fd, buf, len)
}
static int
-ClientWritev(fd, iov, iovcnt)
- int fd;
- struct iovec *iov;
- int iovcnt;
+ClientWritev(int fd, void *iov, int iovcnt)
{
int n;
- n = writev(fd, iov, iovcnt);
+ n = writev(fd, (struct iovec *)iov, iovcnt);
if (n > 0)
raw_stream_in += n;
return n;
}
static int
-ServerRead (fd, buf, len)
- int fd;
- char *buf;
- int len;
+ServerRead(int fd, void *buf, int len)
{
int n;
n = read(fd, buf, len);
@@ -469,24 +456,18 @@ ServerRead (fd, buf, len)
}
static int
-ServerWritev(fd, iov, iovcnt)
- int fd;
- struct iovec *iov;
- int iovcnt;
+ServerWritev(int fd, void *iov, int iovcnt)
{
int n;
- n = writev(fd, iov, iovcnt);
+ n = writev(fd, (struct iovec *)iov, iovcnt);
if (n > 0)
stream_out_plain += n;
return n;
}
ClientPtr
-AllocNewConnection (fd, connect_fd, to_server, trans_conn)
- int fd;
- int connect_fd;
- Bool to_server;
- XtransConnInfo trans_conn;
+AllocNewConnection(int fd, int connect_fd, Bool to_server,
+ XtransConnInfo trans_conn)
{
OsCommPtr oc;
ClientPtr client;
@@ -538,10 +519,9 @@ AllocNewConnection (fd, connect_fd, to_server, trans_conn)
}
void
-SwitchConnectionFuncs (client, Read, Writev)
- ClientPtr client;
- int (*Read)();
- int (*Writev)();
+SwitchConnectionFuncs(ClientPtr client,
+ int (*Read)(int, void *, int),
+ int (*Writev)(int, void *, int))
{
OsCommPtr oc = (OsCommPtr) client->osPrivate;
@@ -550,10 +530,9 @@ SwitchConnectionFuncs (client, Read, Writev)
}
void
-StartOutputCompression(client, CompressOn, CompressOff)
- ClientPtr client;
- void (*CompressOn)();
- void (*CompressOff)();
+StartOutputCompression(ClientPtr client,
+ void (*CompressOn)(int),
+ void (*CompressOff)(int))
{
OsCommPtr oc = (OsCommPtr) client->osPrivate;
@@ -571,9 +550,7 @@ StartOutputCompression(client, CompressOn, CompressOff)
/*ARGSUSED*/
Bool
-EstablishNewConnections(clientUnused, closure)
- ClientPtr clientUnused;
- pointer closure;
+EstablishNewConnections(ClientPtr clientUnused, pointer closure)
{
fd_set readyconnections; /* set of listeners that are ready */
int curconn; /* fd of listener that's ready */
@@ -629,8 +606,7 @@ EstablishNewConnections(clientUnused, closure)
************/
static void
-ErrorConnMax(trans_conn)
-XtransConnInfo trans_conn;
+ErrorConnMax(XtransConnInfo trans_conn)
{
register int fd = _LBXPROXYTransGetConnectionNumber (trans_conn);
xConnSetupPrefix csp;
@@ -681,8 +657,7 @@ XtransConnInfo trans_conn;
************/
void
-CloseDownFileDescriptor(client)
- ClientPtr client;
+CloseDownFileDescriptor(ClientPtr client)
{
register OsCommPtr oc = (OsCommPtr) client->osPrivate;
int connection = oc->fd;
@@ -721,7 +696,7 @@ CloseDownFileDescriptor(client)
*****************/
void
-CheckConnections()
+CheckConnections(void)
{
fd_mask mask;
fd_set tmask;
@@ -757,8 +732,7 @@ CheckConnections()
*****************/
void
-CloseDownConnection(client)
- ClientPtr client;
+CloseDownConnection(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
@@ -786,8 +760,7 @@ CloseDownConnection(client)
*****************/
void
-OnlyListenToOneClient(client)
- ClientPtr client;
+OnlyListenToOneClient(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
int connection = oc->fd;
@@ -821,7 +794,7 @@ OnlyListenToOneClient(client)
****************/
void
-ListenToAllClients()
+ListenToAllClients(void)
{
if (GrabInProgress)
{
@@ -839,8 +812,7 @@ ListenToAllClients()
****************/
void
-IgnoreClient (client)
- ClientPtr client;
+IgnoreClient(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
int connection = oc->fd;
@@ -875,8 +847,7 @@ IgnoreClient (client)
****************/
void
-AttendClient (client)
- ClientPtr client;
+AttendClient(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
int connection = oc->fd;
@@ -902,8 +873,7 @@ AttendClient (client)
/* make client impervious to grabs; assume only executing client calls this */
void
-MakeClientGrabImpervious(client)
- ClientPtr client;
+MakeClientGrabImpervious(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
int connection = oc->fd;
@@ -914,8 +884,7 @@ MakeClientGrabImpervious(client)
/* make client pervious to grabs; assume only executing client calls this */
void
-MakeClientGrabPervious(client)
- ClientPtr client;
+MakeClientGrabPervious(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
int connection = oc->fd;
diff --git a/os/io.c b/os/io.c
index 56604f8..c879a7c 100644
--- a/os/io.c
+++ b/os/io.c
@@ -84,7 +84,6 @@ SOFTWARE.
#endif
#endif
-extern void MarkClientException();
static int timesThisConnection = 0;
static ConnectionInputPtr FreeInputs = (ConnectionInputPtr)NULL;
static ConnectionOutputPtr FreeOutputs = (ConnectionOutputPtr)NULL;
@@ -105,13 +104,10 @@ static ConnectionOutputPtr AllocateUncompBuffer(
unsigned long
-StandardRequestLength(req,client,got,partp)
- xReq *req;
- ClientPtr client;
- int got;
- Bool *partp;
+StandardRequestLength(void *_req, ClientPtr client, int got, Bool *partp)
{
- int len;
+ int len;
+ xReq *req = (xReq *)_req;
if (got < sizeof (xReq))
{
@@ -206,8 +202,7 @@ StandardRequestLength(req,client,got,partp)
{ timesThisConnection = 0; }
int
-StandardReadRequestFromClient(client)
- ClientPtr client;
+StandardReadRequestFromClient(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
register ConnectionInputPtr oci = oc->input;
@@ -456,8 +451,7 @@ StandardReadRequestFromClient(client)
}
int
-PendingClientOutput (client)
- ClientPtr client;
+PendingClientOutput(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr) client->osPrivate;
ConnectionOutputPtr oco = oc->output;
@@ -466,8 +460,7 @@ PendingClientOutput (client)
}
int
-CheckPendingClientInput (client)
- ClientPtr client;
+CheckPendingClientInput(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
register ConnectionInputPtr oci = oc->input;
@@ -490,8 +483,7 @@ CheckPendingClientInput (client)
}
void
-MarkConnectionWriteBlocked (client)
- ClientPtr client;
+MarkConnectionWriteBlocked(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
@@ -500,8 +492,7 @@ MarkConnectionWriteBlocked (client)
}
int
-BytesInClientBuffer (client)
- ClientPtr client;
+BytesInClientBuffer(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
register ConnectionInputPtr oci = oc->input;
@@ -512,10 +503,7 @@ BytesInClientBuffer (client)
}
void
-SkipInClientBuffer (client, nbytes, lenLastReq)
- ClientPtr client;
- int nbytes;
- int lenLastReq;
+SkipInClientBuffer(ClientPtr client, int nbytes, int lenLastReq)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
register ConnectionInputPtr oci = oc->input;
@@ -533,10 +521,7 @@ SkipInClientBuffer (client, nbytes, lenLastReq)
**********************/
Bool
-InsertFakeRequest(client, data, count)
- ClientPtr client;
- char *data;
- int count;
+InsertFakeRequest(ClientPtr client, char *data, int count)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
register ConnectionInputPtr oci = oc->input;
@@ -612,8 +597,7 @@ InsertFakeRequest(client, data, count)
**********************/
void
-ResetCurrentRequest(client)
- ClientPtr client;
+ResetCurrentRequest(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
register ConnectionInputPtr oci = oc->input;
@@ -651,12 +635,10 @@ static int padlength[4] = {0, 3, 2, 1};
**********************/
int
-StandardFlushClient(who, oc, extraBuf, extraCount)
- ClientPtr who;
- OsCommPtr oc;
- char *extraBuf;
- int extraCount; /* do not modify... returned below */
+StandardFlushClient(ClientPtr who, OsCommPtr oc, void *_extraBuf,
+ int extraCount /* do not modify... returned below */)
{
+ char *extraBuf = _extraBuf;
register ConnectionOutputPtr oco = oc->output;
int connection = oc->fd;
XtransConnInfo trans_conn = oc->trans_conn;
@@ -830,9 +812,7 @@ StandardFlushClient(who, oc, extraBuf, extraCount)
}
static int
-ExpandOutputBuffer(oco, len)
- ConnectionOutputPtr oco;
- int len;
+ExpandOutputBuffer(ConnectionOutputPtr oco, int len)
{
unsigned char *obuf;
@@ -850,12 +830,10 @@ ExpandOutputBuffer(oco, len)
}
int
-LbxFlushClient(who, oc, extraBuf, extraCount)
- ClientPtr who;
- OsCommPtr oc;
- char *extraBuf;
- int extraCount; /* do not modify... returned below */
+LbxFlushClient(ClientPtr who, OsCommPtr oc, void *_extraBuf,
+ int extraCount /* do not modify... returned below */)
{
+ char *extraBuf = _extraBuf;
ConnectionOutputPtr obuf;
register ConnectionOutputPtr oco;
int retval;
@@ -921,7 +899,7 @@ LbxFlushClient(who, oc, extraBuf, extraCount)
**********************/
void
-FlushAllOutput()
+FlushAllOutput(void)
{
register int index, base;
register fd_mask mask;
@@ -976,11 +954,9 @@ FlushAllOutput()
*****************/
int
-StandardWriteToClient (who, count, buf)
- ClientPtr who;
- char *buf;
- int count;
+StandardWriteToClient(ClientPtr who, int count, void *_buf)
{
+ char *buf = _buf;
OsCommPtr oc = (OsCommPtr)who->osPrivate;
register ConnectionOutputPtr oco = oc->output;
int padBytes;
@@ -1031,11 +1007,9 @@ StandardWriteToClient (who, count, buf)
}
int
-UncompressWriteToClient (who, count, buf)
- ClientPtr who;
- char *buf;
- int count;
+UncompressWriteToClient(ClientPtr who, int count, void *_buf)
{
+ char *buf = _buf;
OsCommPtr oc = (OsCommPtr)who->osPrivate;
register ConnectionOutputPtr oco;
int paddedLen = count + padlength[count & 3];
@@ -1071,7 +1045,7 @@ UncompressWriteToClient (who, count, buf)
if (oco) {
FreeOutputs = oco->next;
- oco->next = 0;
+ oco->next = NULL;
oco->count = 0;
oco->nocompress = TRUE;
@@ -1116,7 +1090,7 @@ UncompressWriteToClient (who, count, buf)
}
static ConnectionInputPtr
-AllocateInputBuffer()
+AllocateInputBuffer(void)
{
register ConnectionInputPtr oci;
@@ -1137,7 +1111,7 @@ AllocateInputBuffer()
}
static ConnectionOutputPtr
-AllocateOutputBuffer()
+AllocateOutputBuffer(void)
{
register ConnectionOutputPtr oco;
@@ -1157,8 +1131,7 @@ AllocateOutputBuffer()
}
static ConnectionOutputPtr
-AllocateUncompBuffer(count)
- int count;
+AllocateUncompBuffer(int count)
{
register ConnectionOutputPtr oco;
int len = (count > BUFSIZE) ? count : BUFSIZE;
@@ -1179,8 +1152,7 @@ AllocateUncompBuffer(count)
}
void
-FreeOsBuffers(oc)
- OsCommPtr oc;
+FreeOsBuffers(OsCommPtr oc)
{
register ConnectionInputPtr oci;
register ConnectionOutputPtr oco;
diff --git a/os/lbxproxytrans.c b/os/lbxproxytrans.c
index 05fd378..56e2e82 100644
--- a/os/lbxproxytrans.c
+++ b/os/lbxproxytrans.c
@@ -26,8 +26,10 @@
#include <config.h>
#endif
-#define LBXPROXY_t
-#define TRANS_CLIENT
-#define TRANS_SERVER
+#ifndef LBXPROXY_t
+# define LBXPROXY_t
+# define TRANS_CLIENT
+# define TRANS_SERVER
+#endif
#include <X11/Xtrans/transport.c>
diff --git a/os/osdep.h b/os/osdep.h
index 88672f2..617f19d 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -124,20 +124,21 @@ typedef struct _connectionOutput {
Bool nocompress;
} ConnectionOutput, *ConnectionOutputPtr;
-typedef struct _osComm {
+typedef struct _osComm OsCommRec, *OsCommPtr;
+struct _osComm {
int fd;
ConnectionInputPtr input;
ConnectionOutputPtr output;
ConnectionOutputPtr ofirst;
ConnectionOutputPtr olast;
- void (*Close) ();
- int (*Writev) ();
- int (*Read) ();
- int (*flushClient) ();
- void (*compressOff) ();
- void (*compressOn) ();
+ void (*Close)(ClientPtr);
+ int (*Writev)(int, void *, int);
+ int (*Read)(int, void *, int);
+ int (*flushClient)(ClientPtr, OsCommPtr, void *, int);
+ void (*compressOff)(int);
+ void (*compressOn)(int);
struct _XtransConnInfo *trans_conn; /* transport connection object */
-} OsCommRec, *OsCommPtr;
+};
#define FlushClient(who, oc, extraBuf, extraCount) \
(*((OsCommPtr)((who)->osPrivate))->flushClient)(who, oc, extraBuf, extraCount)
@@ -149,14 +150,14 @@ extern void FreeOsBuffers(
extern int StandardFlushClient(
ClientPtr /*who*/,
OsCommPtr /*oc*/,
- char * /*extraBuf*/,
+ void * /*extraBuf*/,
int /*extraCount*/
);
extern int LbxFlushClient(
ClientPtr /*who*/,
OsCommPtr /*oc*/,
- char * /*extraBuf*/,
+ void * /*extraBuf*/,
int /*extraCount*/
);
diff --git a/os/osinit.c b/os/osinit.c
index 95a98b9..a496742 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -49,9 +49,10 @@ SOFTWARE.
#include <stdio.h>
#include "misc.h"
#include "util.h"
+#include "os.h"
void
-OsInit()
+OsInit(void)
{
static Bool been_here = FALSE;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 17:10:57 +0000