summaryrefslogtreecommitdiff
path: root/Xext/hashtable.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-12-15 01:05:51 -0800
committerKeith Packard <keithp@keithp.com>2014-01-12 10:24:11 -0800
commit60014a4a98ff924ae7f6840781f768c1cc93bbab (patch)
treea956a03a6a7c87cac4d48fb95b66fec313d87fde /Xext/hashtable.c
parent93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff)
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'Xext/hashtable.c')
-rw-r--r--Xext/hashtable.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Xext/hashtable.c b/Xext/hashtable.c
index 76ebc6dd2..471ecca1c 100644
--- a/Xext/hashtable.c
+++ b/Xext/hashtable.c
@@ -23,7 +23,7 @@ struct HashTableRec {
HashFunc hash;
HashCompareFunc compare;
- pointer cdata;
+ void *cdata;
};
typedef struct {
@@ -37,7 +37,7 @@ ht_create(int keySize,
int dataSize,
HashFunc hash,
HashCompareFunc compare,
- pointer cdata)
+ void *cdata)
{
int c;
int numBuckets;
@@ -117,7 +117,7 @@ double_size(HashTable ht)
}
}
-pointer
+void *
ht_add(HashTable ht, const void *key)
{
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
@@ -182,7 +182,7 @@ ht_remove(HashTable ht, const void *key)
}
}
-pointer
+void *
ht_find(HashTable ht, const void *key)
{
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);