Put opening curly brace of functions on a separate line. Last time I missed some.

[libfirm] / ir / ir / irnodeset.c

diff --git a/ir/ir/irnodeset.c b/ir/ir/irnodeset.c
index ec325f5..80417fb 100644 (file)
--- a/ir/ir/irnodeset.c
+++ b/ir/ir/irnodeset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,7 +21,7 @@
  * @file
  * @author    Matthias Braun
  * @date      30.03.2007
- * @brief     A nodeset. This should be prefered over a simple pset, because it
+ * @brief     A nodeset. This should be preferred over a simple pset, because it
               tries to guarantee deterministic behavior.
  * @version   $Id$
  */
@@ -38,14 +38,9 @@
 #define ValueType                 ir_node*
 #define NullValue                 NULL
 #define DeletedValue              ((ir_node*)-1)
-#ifdef DEBUG_libfirm
 #define Hash(this,key)            ((unsigned)((key)->node_nr))
-#else
-#define Hash(this,key)            HASH_PTR(key)
-#endif
 #define KeysEqual(this,key1,key2) (key1) == (key2)
 #define SetRangeEmpty(ptr,size)   memset(ptr, 0, (size) * sizeof((ptr)[0]))
-#define ValueCmp(a,b)             ((int) get_irn_idx(a) - (int) get_irn_idx(b))
 
 #define hashset_init            _ir_nodeset_init
 #define hashset_init_size       ir_nodeset_init_size
@@ -58,25 +53,14 @@
 #define hashset_iterator_next   ir_nodeset_iterator_next
 #define hashset_remove_iterator ir_nodeset_remove_iterator
 
-#ifdef IR_NODESET_USE_ORDERED_SETS
-
-#define hashset_insert_quick    ir_nodeset_insert_quick
-#define hashset_remove_quick    ir_nodeset_remove_quick
-#define hashset_fixup           ir_nodeset_fixup
-#include "arrayset.c"
-
-#else
-
 #include "hashset.c"
 
-#endif /* IR_NODESET_USE_ORDERED_SETS */
-
 void ir_nodeset_init(ir_nodeset_t *nodeset)
 {
        ir_nodeset_init_size(nodeset, 16);
 }
 
-int ir_nodeset_contains(const ir_nodeset_t *this, const ir_node *node)
+int ir_nodeset_contains(const ir_nodeset_t *nodeset, const ir_node *node)
 {
-       return _ir_nodeset_find(this, node) != NULL;
+       return _ir_nodeset_find(nodeset, node);
 }