frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resource: s/NullResource/NULL/g 

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2010-04-15 08:46:28 -04:00
parent f953ae7d8a
commit 3282e3c627
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dix/resource.c
View File

@ -167,7 +167,6 @@ typedef struct _Resource {
RESTYPE type; RESTYPE type;
pointer value; pointer value;
} ResourceRec, *ResourcePtr; } ResourceRec, *ResourcePtr;
#define NullResource ((ResourcePtr)NULL)
typedef struct _ClientResource { typedef struct _ClientResource {
ResourcePtr *resources; ResourcePtr *resources;
@ -326,7 +325,7 @@ InitClientResources(ClientPtr client)
clientTable[i].expectID = client->clientAsMask; clientTable[i].expectID = client->clientAsMask;
for (j=0; j<INITBUCKETS; j++) for (j=0; j<INITBUCKETS; j++)
{ {
clientTable[i].resources[j] = NullResource; clientTable[i].resources[j] = NULL;
} }
return TRUE; return TRUE;
} }
@ -543,7 +542,7 @@ RebuildTable(int client)
} }
for (rptr = resources, tptr = tails; --j >= 0; rptr++, tptr++) for (rptr = resources, tptr = tails; --j >= 0; rptr++, tptr++)
{ {
*rptr = NullResource; *rptr = NULL;
*tptr = rptr; *tptr = rptr;
} }
clientTable[client].hashsize++; clientTable[client].hashsize++;
@ -555,7 +554,7 @@ RebuildTable(int client)
for (res = *rptr; res; res = next) for (res = *rptr; res; res = next)
{ {
next = res->next; next = res->next;
res->next = NullResource; res->next = NULL;
tptr = &tails[Hash(client, res->id)]; tptr = &tails[Hash(client, res->id)];
**tptr = res; **tptr = res;
*tptr = &res->next; *tptr = &res->next;