X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fset.c;h=0db15e7d58f83152daf16bdff24eb021f4e470b1;hb=6b124543aff56817fcfe6d5b5ff181ac5c790e73;hp=debb59f4a33c53201aa62f1ae15b17752accf584;hpb=0fbcef83aa6060534172bb13e71cdadb04428806;p=libfirm

diff --git a/ir/adt/set.c b/ir/adt/set.c
index debb59f4a..0db15e7d5 100644
--- a/ir/adt/set.c
+++ b/ir/adt/set.c
@@ -126,7 +126,7 @@ MANGLEP(stats) (SET *table)
 	  table->naccess, table->ncollision, table->nkey, table->ndups, table->max_chain_len, nfree);
 }
 
-static INLINE void
+static inline void
 stat_chain_len (SET *table, int chain_len)
 {
   table->ncollision += chain_len;
@@ -206,10 +206,7 @@ SET *
 
   /* Make segments */
   for (i = 0;  i < nslots;  ++i) {
-    table->dir[i] = (Segment *)obstack_alloc (&table->obst,
-					      sizeof (Segment) * SEGMENT_SIZE);
-
-    memset(table->dir[i], 0, sizeof (Segment) * SEGMENT_SIZE);
+    table->dir[i] = OALLOCNZ(&table->obst, Segment, SEGMENT_SIZE);
     table->nseg++;
   }
 
@@ -244,7 +241,7 @@ MANGLEP(count) (SET *table)
  * do one iteration step, return 1
  * if still data in the set, 0 else
  */
-static INLINE int
+static inline int
 iter_step (SET *table)
 {
   if (++table->iter_j >= SEGMENT_SIZE) {
@@ -305,7 +302,7 @@ MANGLEP(break) (SET *table)
 /*
  * limit the hash value
  */
-static INLINE unsigned
+static inline unsigned
 Hash (SET *table, unsigned h)
 {
   unsigned address;
@@ -319,7 +316,7 @@ Hash (SET *table, unsigned h)
  * returns non-zero if the number of elements in
  * the set is greater then number of segments * MAX_LOAD_FACTOR
  */
-static INLINE int
+static inline int
 loaded (SET *table)
 {
   return (  ++table->nkey
@@ -357,10 +354,7 @@ expand_table (SET *table)
     NewSegmentDir   = NewAddress >> SEGMENT_SIZE_SHIFT;
     NewSegmentIndex = NewAddress & (SEGMENT_SIZE-1);
     if (NewSegmentIndex == 0) {
-      table->dir[NewSegmentDir] =
-	(Segment *)obstack_alloc (&table->obst,
-				  sizeof(Segment) * SEGMENT_SIZE);
-      memset(table->dir[NewSegmentDir], 0, sizeof(Segment) * SEGMENT_SIZE);
+      table->dir[NewSegmentDir] = OALLOCNZ(&table->obst, Segment, SEGMENT_SIZE);
       table->nseg++;
     }
     NewSegment = table->dir[NewSegmentDir];
@@ -443,7 +437,7 @@ MANGLE(_,_search) (SET *table,
       q = table->free_list;
       table->free_list = table->free_list->chain;
     } else {
-      q = obstack_alloc (&table->obst, sizeof (Element));
+      q = OALLOC(&table->obst, Element);
     }
     q->entry.dptr = (void *)key;
 #else