bearch: Disallow passing Projs to get_irn_ops().

[libfirm] / ir / adt / pmap.c

diff --git a/ir/adt/pmap.c b/ir/adt/pmap.c
index 3ce03a9..8d5090c 100644 (file)
--- a/ir/adt/pmap.c
+++ b/ir/adt/pmap.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -22,7 +8,6 @@
  * @brief       simplified hashmap for pointer -> pointer mappings
  * @author      Hubert Schmid
  * @date        09.06.2002
- * @version     $Id$
  */
 #include "config.h"
 
@@ -76,22 +61,23 @@ 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;
@@ -104,12 +90,12 @@ size_t pmap_count(pmap *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)