Make keys const void * Signed-off-by: Keith Packard <kei...@keithp.com> --- Xext/hashtable.c | 6 +++--- Xext/hashtable.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Xext/hashtable.c b/Xext/hashtable.c index 9d9ef89..76ebc6d 100644 --- a/Xext/hashtable.c +++ b/Xext/hashtable.c @@ -118,7 +118,7 @@ double_size(HashTable ht) } pointer -ht_add(HashTable ht, pointer key) +ht_add(HashTable ht, const void *key) { unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); struct xorg_list *bucket = &ht->buckets[index]; @@ -164,7 +164,7 @@ ht_add(HashTable ht, pointer key) } void -ht_remove(HashTable ht, pointer key) +ht_remove(HashTable ht, const void *key) { unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); struct xorg_list *bucket = &ht->buckets[index]; @@ -183,7 +183,7 @@ ht_remove(HashTable ht, pointer key) } pointer -ht_find(HashTable ht, pointer key) +ht_find(HashTable ht, const void *key) { unsigned index = ht->hash(ht->cdata, key, ht->bucketBits); struct xorg_list *bucket = &ht->buckets[index]; diff --git a/Xext/hashtable.h b/Xext/hashtable.h index 5d15984..8a65732 100644 --- a/Xext/hashtable.h +++ b/Xext/hashtable.h @@ -75,12 +75,12 @@ extern _X_EXPORT void ht_destroy(HashTable ht); to avoid returning NULL. Obviously the data pointed cannot be modified, as implied by dataSize being 0. */ -extern _X_EXPORT pointer ht_add(HashTable ht, pointer key); +extern _X_EXPORT pointer ht_add(HashTable ht, const void *key); /** @brief Removes a key from the hash table along with its associated data, which will be free'd. */ -extern _X_EXPORT void ht_remove(HashTable ht, pointer key); +extern _X_EXPORT void ht_remove(HashTable ht, const void *key); /** @brief Finds the associated data of a key from the hash table. @@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, pointer key); use HtMember instead to determine if a key has been inserted. */ -extern _X_EXPORT pointer ht_find(HashTable ht, pointer key); +extern _X_EXPORT pointer ht_find(HashTable ht, const void *key); /** @brief A generic hash function */ extern _X_EXPORT unsigned ht_generic_hash(void *cdata, -- 1.8.4.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel