KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util: Rename from u_* to util_* while we're at it. 

To be consistent with the rest.
This commit is contained in:
José Fonseca 2009-10-17 11:45:04 +01:00
parent 60a39b6799
commit 5d42e3988d
3 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/gallium/auxiliary/util/u_hash_table.c
View File

@ -47,7 +47,7 @@
#include "util/u_hash_table.h"
struct u_hash_table
struct util_hash_table
{
struct cso_hash *cso;
@ -61,27 +61,27 @@ struct u_hash_table
};
struct hash_table_item
struct util_hash_table_item
{
void *key;
void *value;
};
static INLINE struct hash_table_item *
hash_table_item(struct cso_hash_iter iter)
static INLINE struct util_hash_table_item *
util_hash_table_item(struct cso_hash_iter iter)
{
return (struct hash_table_item *)cso_hash_iter_data(iter);
return (struct util_hash_table_item *)cso_hash_iter_data(iter);
}
struct u_hash_table *
u_hash_table_create(unsigned (*hash)(void *key),
int (*compare)(void *key1, void *key2))
struct util_hash_table *
util_hash_table_create(unsigned (*hash)(void *key),
int (*compare)(void *key1, void *key2))
{
struct u_hash_table *ht;
struct util_hash_table *ht;
ht = MALLOC_STRUCT(u_hash_table);
ht = MALLOC_STRUCT(util_hash_table);
if(!ht)
return NULL;
@ -99,16 +99,16 @@ u_hash_table_create(unsigned (*hash)(void *key),
static INLINE struct cso_hash_iter
hash_table_find_iter(struct u_hash_table *ht,
void *key,
unsigned key_hash)
util_hash_table_find_iter(struct util_hash_table *ht,
void *key,
unsigned key_hash)
{
struct cso_hash_iter iter;
struct hash_table_item *item;
struct util_hash_table_item *item;
iter = cso_hash_find(ht->cso, key_hash);
while (!cso_hash_iter_is_null(iter)) {
item = (struct hash_table_item *)cso_hash_iter_data(iter);
item = (struct util_hash_table_item *)cso_hash_iter_data(iter);
if (!ht->compare(item->key, key))
break;
iter = cso_hash_iter_next(iter);
@ -118,17 +118,17 @@ hash_table_find_iter(struct u_hash_table *ht,
}
static INLINE struct hash_table_item *
hash_table_find_item(struct u_hash_table *ht,
void *key,
unsigned key_hash)
static INLINE struct util_hash_table_item *
util_hash_table_find_item(struct util_hash_table *ht,
void *key,
unsigned key_hash)
{
struct cso_hash_iter iter;
struct hash_table_item *item;
struct util_hash_table_item *item;
iter = cso_hash_find(ht->cso, key_hash);
while (!cso_hash_iter_is_null(iter)) {
item = (struct hash_table_item *)cso_hash_iter_data(iter);
item = (struct util_hash_table_item *)cso_hash_iter_data(iter);
if (!ht->compare(item->key, key))
return item;
iter = cso_hash_iter_next(iter);
@ -139,12 +139,12 @@ hash_table_find_item(struct u_hash_table *ht,
enum pipe_error
u_hash_table_set(struct u_hash_table *ht,
void *key,
void *value)
util_hash_table_set(struct util_hash_table *ht,
void *key,
void *value)
{
unsigned key_hash;
struct hash_table_item *item;
struct util_hash_table_item *item;
struct cso_hash_iter iter;
assert(ht);
@ -153,14 +153,14 @@ u_hash_table_set(struct u_hash_table *ht,
key_hash = ht->hash(key);
item = hash_table_find_item(ht, key, key_hash);
item = util_hash_table_find_item(ht, key, key_hash);
if(item) {
/* TODO: key/value destruction? */
item->value = value;
return PIPE_OK;
}
item = MALLOC_STRUCT(hash_table_item);
item = MALLOC_STRUCT(util_hash_table_item);
if(!item)
return PIPE_ERROR_OUT_OF_MEMORY;
@ -178,11 +178,11 @@ u_hash_table_set(struct u_hash_table *ht,
void *
u_hash_table_get(struct u_hash_table *ht,
void *key)
util_hash_table_get(struct util_hash_table *ht,
void *key)
{
unsigned key_hash;
struct hash_table_item *item;
struct util_hash_table_item *item;
assert(ht);
if (!ht)
@ -190,7 +190,7 @@ u_hash_table_get(struct u_hash_table *ht,
key_hash = ht->hash(key);
item = hash_table_find_item(ht, key, key_hash);
item = util_hash_table_find_item(ht, key, key_hash);
if(!item)
return NULL;
@ -199,12 +199,12 @@ u_hash_table_get(struct u_hash_table *ht,
void
u_hash_table_remove(struct u_hash_table *ht,
void *key)
util_hash_table_remove(struct util_hash_table *ht,
void *key)
{
unsigned key_hash;
struct cso_hash_iter iter;
struct hash_table_item *item;
struct util_hash_table_item *item;
assert(ht);
if (!ht)
@ -212,11 +212,11 @@ u_hash_table_remove(struct u_hash_table *ht,
key_hash = ht->hash(key);
iter = hash_table_find_iter(ht, key, key_hash);
iter = util_hash_table_find_iter(ht, key, key_hash);
if(cso_hash_iter_is_null(iter))
return;
item = hash_table_item(iter);
item = util_hash_table_item(iter);
assert(item);
FREE(item);
@ -225,10 +225,10 @@ u_hash_table_remove(struct u_hash_table *ht,
void
u_hash_table_clear(struct u_hash_table *ht)
util_hash_table_clear(struct util_hash_table *ht)
{
struct cso_hash_iter iter;
struct hash_table_item *item;
struct util_hash_table_item *item;
assert(ht);
if (!ht)
@ -236,7 +236,7 @@ u_hash_table_clear(struct u_hash_table *ht)
iter = cso_hash_first_node(ht->cso);
while (!cso_hash_iter_is_null(iter)) {
item = (struct hash_table_item *)cso_hash_take(ht->cso, cso_hash_iter_key(iter));
item = (struct util_hash_table_item *)cso_hash_take(ht->cso, cso_hash_iter_key(iter));
FREE(item);
iter = cso_hash_first_node(ht->cso);
}
@ -244,13 +244,13 @@ u_hash_table_clear(struct u_hash_table *ht)
enum pipe_error
u_hash_table_foreach(struct u_hash_table *ht,
util_hash_table_foreach(struct util_hash_table *ht,
enum pipe_error (*callback)
(void *key, void *value, void *data),
void *data)
{
struct cso_hash_iter iter;
struct hash_table_item *item;
struct util_hash_table_item *item;
enum pipe_error result;
assert(ht);
@ -259,7 +259,7 @@ u_hash_table_foreach(struct u_hash_table *ht,
iter = cso_hash_first_node(ht->cso);
while (!cso_hash_iter_is_null(iter)) {
item = (struct hash_table_item *)cso_hash_iter_data(iter);
item = (struct util_hash_table_item *)cso_hash_iter_data(iter);
result = callback(item->key, item->value, data);
if(result != PIPE_OK)
return result;
@ -271,10 +271,10 @@ u_hash_table_foreach(struct u_hash_table *ht,
void
u_hash_table_destroy(struct u_hash_table *ht)
util_hash_table_destroy(struct util_hash_table *ht)
{
struct cso_hash_iter iter;
struct hash_table_item *item;
struct util_hash_table_item *item;
assert(ht);
if (!ht)
@ -282,7 +282,7 @@ u_hash_table_destroy(struct u_hash_table *ht)
iter = cso_hash_first_node(ht->cso);
while (!cso_hash_iter_is_null(iter)) {
item = (struct hash_table_item *)cso_hash_iter_data(iter);
item = (struct util_hash_table_item *)cso_hash_iter_data(iter);
FREE(item);
iter = cso_hash_iter_next(iter);
}

36
src/gallium/auxiliary/util/u_hash_table.h
View File

@ -46,7 +46,7 @@ extern "C" {
/**
* Generic purpose hash table.
*/
struct u_hash_table;
struct util_hash_table;
/**
@ -55,38 +55,38 @@ struct u_hash_table;
* @param hash hash function
* @param compare should return 0 for two equal keys.
*/
struct u_hash_table *
u_hash_table_create(unsigned (*hash)(void *key),
int (*compare)(void *key1, void *key2));
struct util_hash_table *
util_hash_table_create(unsigned (*hash)(void *key),
int (*compare)(void *key1, void *key2));
enum pipe_error
u_hash_table_set(struct u_hash_table *ht,
void *key,
void *value);
util_hash_table_set(struct util_hash_table *ht,
void *key,
void *value);
void *
u_hash_table_get(struct u_hash_table *ht,
void *key);
void
u_hash_table_remove(struct u_hash_table *ht,
util_hash_table_get(struct util_hash_table *ht,
void *key);
void
u_hash_table_clear(struct u_hash_table *ht);
util_hash_table_remove(struct util_hash_table *ht,
void *key);
void
util_hash_table_clear(struct util_hash_table *ht);
enum pipe_error
u_hash_table_foreach(struct u_hash_table *ht,
enum pipe_error (*callback)
util_hash_table_foreach(struct util_hash_table *ht,
enum pipe_error (*callback)
(void *key, void *value, void *data),
void *data);
void *data);
void
u_hash_table_destroy(struct u_hash_table *ht);
util_hash_table_destroy(struct util_hash_table *ht);
#ifdef __cplusplus

2
src/gallium/auxiliary/util/u_keymap.c
View File

@ -28,7 +28,7 @@
/**
* Key lookup/associative container.
*
* Like Jose's u_hash_table, based on CSO cache code for now.
* Like Jose's util_hash_table, based on CSO cache code for now.
*
* Author: Brian Paul
*/