projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we can do without the odd align.h
[libfirm]
/
ir
/
adt
/
pmap.c
diff --git
a/ir/adt/pmap.c
b/ir/adt/pmap.c
index
e16ad06
..
a18b49f
100644
(file)
--- a/
ir/adt/pmap.c
+++ b/
ir/adt/pmap.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-24,9
+24,7
@@
* @date 09.06.2002
* @version $Id$
*/
* @date 09.06.2002
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include "pmap.h"
#include "pmap.h"
@@
-48,27
+46,33
@@
struct pmap {
/**
* compare the keys of two entry pairs
*/
/**
* 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;
const pmap_entry *entry1 = p1;
const pmap_entry *entry2 = p2;
+ (void) size;
return entry1->key != entry2->key;
}
/* Creates a new empty map with an initial number of slots. */
return entry1->key != entry2->key;
}
/* 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);
}
return (pmap *)new_set(pmap_entry_cmp, slots);
}
-pmap *pmap_create(void) {
+pmap *pmap_create(void)
+{
return pmap_create_ex(INITIAL_SLOTS);
}
return pmap_create_ex(INITIAL_SLOTS);
}
-void pmap_destroy(pmap *map) {
+void pmap_destroy(pmap *map)
+{
del_set(M2S(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;
pmap_entry entry, *p;
entry.key = key;
@@
-76,32
+80,39
@@
void pmap_insert(pmap *map, const void *key, void *value) {
p->value = 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;
}
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));
}
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;
}
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));
}
return set_count(M2S(map));
}
-pmap_entry *pmap_first(pmap *map) {
+pmap_entry *pmap_first(pmap *map)
+{
return (pmap_entry *) set_first(M2S(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));
}
return (pmap_entry *) set_next(M2S(map));
}
-void pmap_break(pmap *map) {
+void pmap_break(pmap *map)
+{
set_break(M2S(map));
}
set_break(M2S(map));
}