aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xext/xres.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
commit4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (patch)
treec1e02b9d3509aa97703aa4b540d4cd22ec4600ed /xorg-server/Xext/xres.c
parentdc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff)
downloadvcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.gz
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.bz2
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.zip
Added xorg-server-1.6.2.tar.gz
Diffstat (limited to 'xorg-server/Xext/xres.c')
-rw-r--r--xorg-server/Xext/xres.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c
index f444c4e69..bdc534c91 100644
--- a/xorg-server/Xext/xres.c
+++ b/xorg-server/Xext/xres.c
@@ -94,7 +94,7 @@ ProcXResQueryClients (ClientPtr client)
scratch.resource_mask = RESOURCE_ID_MASK;
if(client->swapped) {
- register int n;
+ int n;
swapl (&scratch.resource_base, n);
swapl (&scratch.resource_mask, n);
}
@@ -133,9 +133,7 @@ ProcXResQueryClientResources (ClientPtr client)
return BadValue;
}
- counts = xalloc((lastResourceType + 1) * sizeof(int));
-
- memset(counts, 0, (lastResourceType + 1) * sizeof(int));
+ counts = xcalloc(lastResourceType + 1, sizeof(int));
FindAllClientResources(clients[clientID], ResFindAllRes, counts);
@@ -177,7 +175,7 @@ ProcXResQueryClientResources (ClientPtr client)
scratch.count = counts[i];
if(client->swapped) {
- register int n;
+ int n;
swapl (&scratch.resource_type, n);
swapl (&scratch.count, n);
}
@@ -301,10 +299,6 @@ ProcXResQueryClientPixmapBytes (ClientPtr client)
return (client->noClientException);
}
-
-static void
-ResResetProc (ExtensionEntry *extEntry) { }
-
static int
ProcResDispatch (ClientPtr client)
{
@@ -386,5 +380,5 @@ ResExtensionInit(INITARGS)
{
(void) AddExtension(XRES_NAME, 0, 0,
ProcResDispatch, SProcResDispatch,
- ResResetProc, StandardMinorOpcode);
+ NULL, StandardMinorOpcode);
}