X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fpmap.c;h=3ce03a94bb8b57d5c89d64b590351b43906281f3;hb=63e1d96cef672a5792fefb59ca846d76b5711d6f;hp=e16ad06d3b3a5b8f5879eece943a03d68f89ced0;hpb=974215da1a935f250766874d0f7a7ddfa34bc4ef;p=libfirm

diff --git a/ir/adt/pmap.c b/ir/adt/pmap.c
index e16ad06d3..3ce03a94b 100644
--- a/ir/adt/pmap.c
+++ b/ir/adt/pmap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -24,9 +24,7 @@
  * @date        09.06.2002
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "pmap.h"
 
@@ -36,7 +34,7 @@
 
 
 struct pmap {
-  	int dummy; /* dummy entry */
+	int dummy; /* dummy entry */
 };
 
 
@@ -48,60 +46,73 @@ 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 = (pmap_entry*) set_insert(M2S(map), &entry, sizeof(pmap_entry), HASH_PTR(key));
 	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) {
+size_t 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));
 }