X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fpmap.c;h=5003d540a0c6c48f7496cbda3a654e756e242411;hb=20a0283f7453dfdb20894df38d860b27de4997b9;hp=1395361cd8a72f586771e177adefb498786d1afd;hpb=0fbcef83aa6060534172bb13e71cdadb04428806;p=libfirm

diff --git a/ir/adt/pmap.c b/ir/adt/pmap.c
index 1395361cd..5003d540a 100644
--- a/ir/adt/pmap.c
+++ b/ir/adt/pmap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,7 +22,6 @@
  * @brief       simplified hashmap for pointer -> pointer mappings
  * @author      Hubert Schmid
  * @date        09.06.2002
- * @version     $Id$
  */
 #include "config.h"
 
@@ -34,7 +33,7 @@
 
 
 struct pmap {
-  	int dummy; /* dummy entry */
+	int dummy; /* dummy entry */
 };
 
 
@@ -46,61 +45,74 @@ struct pmap {
 /**
  * compare the keys of two entry pairs
  */
-static int pmap_entry_cmp(const void *p1, const void *p2, size_t size) {
-	const pmap_entry *entry1 = p1;
-	const pmap_entry *entry2 = p2;
+static int pmap_entry_cmp(const void *p1, const void *p2, size_t size)
+{
+	const pmap_entry *entry1 = (const pmap_entry*) p1;
+	const pmap_entry *entry2 = (const pmap_entry*) p2;
 	(void) size;
 
 	return entry1->key != entry2->key;
 }
 
 /* Creates a new empty map with an initial number of slots. */
-pmap *pmap_create_ex(int slots) {
-  	return (pmap *)new_set(pmap_entry_cmp, slots);
+pmap *pmap_create_ex(size_t 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;
-	p = set_insert(M2S(map), &entry, sizeof(pmap_entry), HASH_PTR(key));
+	p = set_insert(pmap_entry, M2S(map), &entry, sizeof(pmap_entry), hash_ptr(key));
 	p->value = value;
 }
 
-int pmap_contains(pmap *map, const void *key) {
-	return set_find(M2S(map), &key, sizeof(pmap_entry), HASH_PTR(key)) != NULL;
+int pmap_contains(pmap *map, const void *key)
+{
+	return pmap_find(map, key) != NULL;
 }
 
-pmap_entry * pmap_find(pmap *map, const void *key) {
-	return (pmap_entry *)set_find(M2S(map), &key, sizeof(pmap_entry), HASH_PTR(key));
+pmap_entry * pmap_find(pmap *map, const void *key)
+{
+	pmap_entry const entry = { key, 0 };
+	return set_find(pmap_entry, M2S(map), &entry, sizeof(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) {
+size_t pmap_count(pmap *map)
+{
 	return set_count(M2S(map));
 }
 
-pmap_entry *pmap_first(pmap *map) {
-	return (pmap_entry *) set_first(M2S(map));
+pmap_entry *pmap_first(pmap *map)
+{
+	return set_first(pmap_entry, M2S(map));
 }
 
-pmap_entry *pmap_next(pmap *map) {
-	return (pmap_entry *) set_next(M2S(map));
+pmap_entry *pmap_next(pmap *map)
+{
+	return set_next(pmap_entry, M2S(map));
 }
 
-void pmap_break(pmap *map) {
+void pmap_break(pmap *map)
+{
 	set_break(M2S(map));
 }