X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fpmap.c;h=a18b49f9f7a1f06cbd595d33108426f911cefadf;hb=3da5ed2598245b896255bc444aaa1768f6098cfe;hp=caa6fc1d82dd9724bfd0562950450c4cd6f05b49;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm diff --git a/ir/adt/pmap.c b/ir/adt/pmap.c index caa6fc1d8..a18b49f9f 100644 --- a/ir/adt/pmap.c +++ b/ir/adt/pmap.c @@ -24,9 +24,7 @@ * @date 09.06.2002 * @version $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "pmap.h" @@ -48,7 +46,8 @@ struct pmap { /** * compare the keys of two entry pairs */ -static int pmap_entry_cmp(const void *p1, const void *p2, size_t size) { +static int pmap_entry_cmp(const void *p1, const void *p2, size_t size) +{ const pmap_entry *entry1 = p1; const pmap_entry *entry2 = p2; (void) size; @@ -57,19 +56,23 @@ static int pmap_entry_cmp(const void *p1, const void *p2, size_t size) { } /* Creates a new empty map with an initial number of slots. */ -pmap *pmap_create_ex(int slots) { +pmap *pmap_create_ex(int slots) +{ return (pmap *)new_set(pmap_entry_cmp, slots); } -pmap *pmap_create(void) { +pmap *pmap_create(void) +{ return pmap_create_ex(INITIAL_SLOTS); } -void pmap_destroy(pmap *map) { +void pmap_destroy(pmap *map) +{ del_set(M2S(map)); } -void pmap_insert(pmap *map, const void *key, void *value) { +void pmap_insert(pmap *map, const void *key, void *value) +{ pmap_entry entry, *p; entry.key = key; @@ -77,32 +80,39 @@ void pmap_insert(pmap *map, const void *key, void *value) { p->value = value; } -int pmap_contains(pmap *map, const void *key) { +int pmap_contains(pmap *map, const void *key) +{ return set_find(M2S(map), &key, sizeof(pmap_entry), HASH_PTR(key)) != NULL; } -pmap_entry * pmap_find(pmap *map, const void *key) { +pmap_entry * pmap_find(pmap *map, const void *key) +{ return (pmap_entry *)set_find(M2S(map), &key, sizeof(pmap_entry), HASH_PTR(key)); } -void * pmap_get(pmap *map, const void *key) { +void * pmap_get(pmap *map, const void *key) +{ pmap_entry * entry = pmap_find(map, key); return entry == NULL ? NULL : entry->value; } -int pmap_count(pmap *map) { +int pmap_count(pmap *map) +{ return set_count(M2S(map)); } -pmap_entry *pmap_first(pmap *map) { +pmap_entry *pmap_first(pmap *map) +{ return (pmap_entry *) set_first(M2S(map)); } -pmap_entry *pmap_next(pmap *map) { +pmap_entry *pmap_next(pmap *map) +{ return (pmap_entry *) set_next(M2S(map)); } -void pmap_break(pmap *map) { +void pmap_break(pmap *map) +{ set_break(M2S(map)); }