From bda3618497133476f98ca10c186b67be54395e9a Mon Sep 17 00:00:00 2001
From: Sebastian Buchwald <Sebastian.Buchwald@kit.edu>
Date: Tue, 2 Dec 2008 23:11:52 +0000
Subject: [PATCH 1/1] More refactoring.

[r24240]
---
 heuristical.c | 14 +++++++-------
 html_dumper.c | 15 +++++++--------
 html_dumper.h |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/heuristical.c b/heuristical.c
index a2ec4c6a1..e24d5f43d 100644
--- a/heuristical.c
+++ b/heuristical.c
@@ -450,7 +450,7 @@ num determine_solution(pbqp *pbqp)
 				node->costs->entries[node->solution].data);
 		if (pbqp->dump_file) {
 			fprintf(pbqp->dump_file, "node n%d is set to %d<br>\n", node->index, node->solution);
-			dump_node(pbqp, node);
+			dump_node(pbqp->dump_file, node);
 		}
 	}
 
@@ -538,8 +538,8 @@ void apply_RI(pbqp *pbqp)
 		dump_section(pbqp->dump_file, 2, txt);
 		pbqp_dump_graph(pbqp);
 		fputs("<br>\nBefore reduction:<br>\n", pbqp->dump_file);
-		dump_node(pbqp, node);
-		dump_node(pbqp, other_node);
+		dump_node(pbqp->dump_file, node);
+		dump_node(pbqp->dump_file, other_node);
 		dump_edge(pbqp, edge);
 	}
 
@@ -554,7 +554,7 @@ void apply_RI(pbqp *pbqp)
 
 	if (pbqp->dump_file) {
 		fputs("<br>\nAfter reduction:<br>\n", pbqp->dump_file);
-		dump_node(pbqp, other_node);
+		dump_node(pbqp->dump_file, other_node);
 	}
 
 	reorder_node(other_node);
@@ -622,11 +622,11 @@ void apply_RII(pbqp *pbqp)
 		dump_section(pbqp->dump_file, 2, txt);
 		pbqp_dump_graph(pbqp);
 		fputs("<br>\nBefore reduction:<br>\n", pbqp->dump_file);
-		dump_node(pbqp, src_node);
+		dump_node(pbqp->dump_file, src_node);
 		dump_edge(pbqp, src_edge);
-		dump_node(pbqp, node);
+		dump_node(pbqp->dump_file, node);
 		dump_edge(pbqp, tgt_edge);
-		dump_node(pbqp, tgt_node);
+		dump_node(pbqp->dump_file, tgt_node);
 	}
 
 	src_mat = src_edge->costs;
diff --git a/html_dumper.c b/html_dumper.c
index 4f1915091..018f12c8b 100644
--- a/html_dumper.c
+++ b/html_dumper.c
@@ -94,15 +94,14 @@ static void dump_edge_costs(pbqp *pbqp)
 	fputs("</p>", pbqp->dump_file);
 }
 
-void dump_node(pbqp *pbqp, pbqp_node *node)
+void dump_node(FILE *file, pbqp_node *node)
 {
-	assert(pbqp);
-	assert(pbqp->dump_file);
+	assert(file);
 
 	if (node) {
-		fprintf(pbqp->dump_file, "\tc<sub>%d</sub> = ", node->index);
-		dump_vector(pbqp->dump_file, node->costs);
-		fputs("<br>\n", pbqp->dump_file);
+		fprintf(file, "\tc<sub>%d</sub> = ", node->index);
+		dump_vector(file, node->costs);
+		fputs("<br>\n", file);
 	}
 }
 
@@ -189,7 +188,7 @@ void dump_simplifyedge(pbqp *pbqp, pbqp_edge *edge)
 	assert(pbqp);
 	assert(pbqp->dump_file);
 
-	dump_node(pbqp, edge->src);
+	dump_node(pbqp->dump_file, edge->src);
 	dump_edge(pbqp, edge);
-	dump_node(pbqp, edge->tgt);
+	dump_node(pbqp->dump_file, edge->tgt);
 }
diff --git a/html_dumper.h b/html_dumper.h
index dccb817b2..6bb050983 100644
--- a/html_dumper.h
+++ b/html_dumper.h
@@ -11,7 +11,7 @@ void dump_simplifyedge(pbqp *pbqp, pbqp_edge *edge);
 
 void dump_section(FILE *f, int level, char *txt);
 
-void dump_node(pbqp *pbqp, pbqp_node *node);
+void dump_node(FILE *file, pbqp_node *node);
 void dump_edge(pbqp *pbqp, pbqp_edge *edge);
 
 #endif /* KAPS_HTML_DUMPER_H */
-- 
2.20.1