no environment anymore for emitters

[libfirm] / ir / common / firmwalk.c

diff --git a/ir/common/firmwalk.c b/ir/common/firmwalk.c
index 36cf5b0..d1c8d78 100644 (file)
--- a/ir/common/firmwalk.c
+++ b/ir/common/firmwalk.c
@@ -1,15 +1,29 @@
 /*
- * Project:     libFIRM
- * File name:   ir/common/firmwalk.c
- * Purpose:     Walker that touches all Firm data structures
- * Author:      Sebastian Felis
- * Modified by:
- * Created:     7.2003
- * CVS-ID:      $Id$
- * Copyright:   (c) 2003 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2007 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.
  */
 
+/**
+ * @file
+ * @brief    Walker that touches all Firm data structures
+ * @author   Sebastian Felis
+ * @date     7.2003
+ * @version  $Id$
+ */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -24,7 +38,6 @@
 #include "irnode_t.h"
 #include "irprog_t.h"
 #include "irgwalk.h"
-#include "typewalk.h"
 #include "irtools.h"
 
 #include "array.h"
@@ -219,11 +232,11 @@ static
 void fw_collect_tore(type_or_ent *tore, void *env)
 {
   ir_type *tp;
-  entity *ent;
+  ir_entity *ent;
 
   switch (get_kind(tore)) {
   case k_entity:
-    ent = (entity *)tore;
+    ent = (ir_entity *)tore;
     /*  append entity to list */
     set_entity_link(ent, NULL);
     if (!pmap_contains(entity_map, ent))
@@ -253,6 +266,7 @@ static
 void fw_collect_irn(ir_node *irn, void *env)
 {
   fw_data *data;
+  (void) env;
 
   /* block nodes. */
   if (is_Block(irn)) {
@@ -273,6 +287,7 @@ void fw_collect_irn(ir_node *irn, void *env)
 static
 void fw_free_colleted_data(ir_node *irn, void *env)
 {
+  (void) env;
   /* Free node list from blocks */
   if (is_Block(irn))
   {
@@ -384,7 +399,7 @@ void firm_walk(firm_walk_interface *wif)
   if (wif->do_entity)
   {
     for (entry = pmap_first(entity_map); entry; entry = pmap_next(entity_map))
-      wif->do_entity((entity *)entry->key, wif->env);
+      wif->do_entity((ir_entity *)entry->key, wif->env);
   }
   if (wif->do_entity_finalize) wif->do_entity_finalize(wif->env);