X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fhash.c;fp=src%2Flibgame%2Fhash.c;h=e021da5c5959be418610e078e212d1e150e279e7;hb=c42db18f39053cf2ec85943c37a20b8caa742d09;hp=6bd7f1b96622596f3dd4df7925dc2a53f0e0540f;hpb=90faeaee222acbf966229f09465e90e46c4ae6aa;p=rocksndiamonds.git diff --git a/src/libgame/hash.c b/src/libgame/hash.c index 6bd7f1b9..e021da5c 100644 --- a/src/libgame/hash.c +++ b/src/libgame/hash.c @@ -43,7 +43,7 @@ struct hashtable * create_hashtable(unsigned int minsize, float maxloadfactor, unsigned int (*hashf) (void*), - int (*eqf) (void*,void*)) + int (*eqf) (void*, void*)) { struct hashtable *h; unsigned int i, size = 1u; @@ -134,7 +134,7 @@ hashtable_expand(struct hashtable *h) while ((e = h->table[i]) != NULL) { h->table[i] = e->next; - index = indexFor(newsize,e->h); + index = indexFor(newsize, e->h); e->next = newtable[index]; newtable[index] = e; } @@ -160,7 +160,7 @@ hashtable_expand(struct hashtable *h) { for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { - index = indexFor(newsize,e->h); + index = indexFor(newsize, e->h); if (index == i) { @@ -216,8 +216,8 @@ hashtable_insert(struct hashtable *h, void *k, void *v) return 0; } - e->h = hash(h,k); - index = indexFor(h->tablelength,e->h); + e->h = hash(h, k); + index = indexFor(h->tablelength, e->h); e->k = k; e->v = v; e->next = h->table[index]; @@ -233,8 +233,8 @@ hashtable_change(struct hashtable *h, void *k, void *v) struct entry *e; unsigned int hashvalue, index; - hashvalue = hash(h,k); - index = indexFor(h->tablelength,hashvalue); + hashvalue = hash(h, k); + index = indexFor(h->tablelength, hashvalue); e = h->table[index]; while (e != NULL) @@ -261,8 +261,8 @@ hashtable_search(struct hashtable *h, void *k) struct entry *e; unsigned int hashvalue, index; - hashvalue = hash(h,k); - index = indexFor(h->tablelength,hashvalue); + hashvalue = hash(h, k); + index = indexFor(h->tablelength, hashvalue); e = h->table[index]; while (e != NULL) @@ -287,7 +287,7 @@ hashtable_remove(struct hashtable *h, void *k) struct entry *e; struct entry **pE; void *v; - unsigned int index = indexFor(h->tablelength,hash(h,k)); + unsigned int index = indexFor(h->tablelength, hash(h, k)); pE = &(h->table[index]); e = *pE; @@ -379,7 +379,7 @@ hashtable_iterator(struct hashtable *h) } /*****************************************************************************/ -/* key - return the key of the (key,value) pair at the current position */ +/* key - return the key of the (key, value) pair at the current position */ void * hashtable_iterator_key(struct hashtable_itr *i) @@ -388,7 +388,7 @@ hashtable_iterator_key(struct hashtable_itr *i) } /*****************************************************************************/ -/* value - return the value of the (key,value) pair at the current position */ +/* value - return the value of the (key, value) pair at the current position */ void * hashtable_iterator_value(struct hashtable_itr *i) @@ -403,7 +403,7 @@ hashtable_iterator_value(struct hashtable_itr *i) int hashtable_iterator_advance(struct hashtable_itr *itr) { - unsigned int j,tablelength; + unsigned int j, tablelength; struct entry **table; struct entry *next;