fix a bunch of warnings reported by clang analyzer

[libfirm] / ir / adt / pmap.c

diff --git a/ir/adt/pmap.c b/ir/adt/pmap.c
index a18d5bb..5003d54 100644 (file)
--- 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"
 
@@ -56,7 +55,7 @@ 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(size_t slots)
 {
        return (pmap *)new_set(pmap_entry_cmp, slots);
 }
@@ -76,40 +75,41 @@ void pmap_insert(pmap *map, const void *key, void *value)
        pmap_entry entry, *p;
 
        entry.key = key;
-       p = (pmap_entry*) 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;
+       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 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));
+       return set_first(pmap_entry, M2S(map));
 }
 
 pmap_entry *pmap_next(pmap *map)
 {
-       return (pmap_entry *) set_next(M2S(map));
+       return set_next(pmap_entry, M2S(map));
 }
 
 void pmap_break(pmap *map)