X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fdfs_t.h;h=dbc488455356df9188145d4ff7b9af5791f54350;hb=27dc6d14e0ea17d599ae396bfd59a0826dbe48f6;hp=a94c1118bca66d1c4fafc79265d94de1fd1430e7;hpb=800e4d37cd161f66232656944211a718ce007a4b;p=libfirm

diff --git a/ir/ana/dfs_t.h b/ir/ana/dfs_t.h
index a94c1118b..dbc488455 100644
--- a/ir/ana/dfs_t.h
+++ b/ir/ana/dfs_t.h
@@ -21,7 +21,6 @@
  * @file    dfs_t.h
  * @author  Sebastian Hack
  * @date    21.04.2007
- * @version $Id$
  * @brief
  *
  * depth first search internal stuff.
@@ -34,23 +33,23 @@
 #include "obst.h"
 #include "dfs.h"
 
-struct _dfs_node_t {
+struct dfs_node_t {
 	int visited;
 	const void *node;
 	const void *ancestor;
 	int pre_num;
 	int max_pre_num;
-	int	post_num;
-	int	level;
+	int post_num;
+	int level;
 };
 
-struct _dfs_edge_t {
+struct dfs_edge_t {
 	const void *src, *tgt;
 	dfs_node_t *s, *t;
 	dfs_edge_kind_t kind;
 };
 
-struct _dfs_t {
+struct dfs_t {
 	void *graph;
 	const absgraph_t *graph_impl;
 	struct obstack obst;
@@ -66,20 +65,20 @@ struct _dfs_t {
 	unsigned edges_classified : 1;
 };
 
-static struct _dfs_node_t *_dfs_get_node(const struct _dfs_t *self, const void *node)
+static dfs_node_t *_dfs_get_node(const dfs_t *self, const void *node)
 {
-	struct _dfs_node_t templ;
+	dfs_node_t templ;
 	memset(&templ, 0, sizeof(templ));
 	templ.node = node;
-	return set_insert(self->nodes, &templ, sizeof(templ), HASH_PTR(node));
+	return set_insert(dfs_node_t, self->nodes, &templ, sizeof(templ), hash_ptr(node));
 }
 
 #define _dfs_int_is_ancestor(n, m) ((m)->pre_num >= (n)->pre_num && (m)->pre_num <= (n)->max_pre_num)
 
-static inline int _dfs_is_ancestor(const struct _dfs_t *dfs, const void *a, const void *b)
+static inline int _dfs_is_ancestor(const dfs_t *dfs, const void *a, const void *b)
 {
-	struct _dfs_node_t *n = _dfs_get_node(dfs, a);
-	struct _dfs_node_t *m = _dfs_get_node(dfs, b);
+	dfs_node_t *n = _dfs_get_node(dfs, a);
+	dfs_node_t *m = _dfs_get_node(dfs, b);
 	return _dfs_int_is_ancestor(n, m);
 }