summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2010-04-15 08:46:28 -0400
committerAdam Jackson <ajax@redhat.com>2011-01-20 21:08:17 -0500
commit3282e3c627f97f079e3a9af756a6b13bd9a5f227 (patch)
treed31aadceb0679e868b99db1a881d5064a6fe403f /dix
parentf953ae7d8a578d135a6faaf69d9c06eae7c85ede (diff)
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>
Diffstat (limited to 'dix')
-rw-r--r--dix/resource.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/dix/resource.c b/dix/resource.c
index 6bd240368..18ed68223 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -167,7 +167,6 @@ typedef struct _Resource {
RESTYPE type;
pointer value;
} ResourceRec, *ResourcePtr;
-#define NullResource ((ResourcePtr)NULL)
typedef struct _ClientResource {
ResourcePtr *resources;
@@ -326,7 +325,7 @@ InitClientResources(ClientPtr client)
clientTable[i].expectID = client->clientAsMask;
for (j=0; j<INITBUCKETS; j++)
{
- clientTable[i].resources[j] = NullResource;
+ clientTable[i].resources[j] = NULL;
}
return TRUE;
}
@@ -543,7 +542,7 @@ RebuildTable(int client)
}
for (rptr = resources, tptr = tails; --j >= 0; rptr++, tptr++)
{
- *rptr = NullResource;
+ *rptr = NULL;
*tptr = rptr;
}
clientTable[client].hashsize++;
@@ -555,7 +554,7 @@ RebuildTable(int client)
for (res = *rptr; res; res = next)
{
next = res->next;
- res->next = NullResource;
+ res->next = NULL;
tptr = &tails[Hash(client, res->id)];
**tptr = res;
*tptr = &res->next;