From 563719dd7682895391c51d5deebce9723108447d Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Thu, 23 Oct 2008 20:23:55 +0000
Subject: [PATCH] use agfindnode/agfindedge macros

---
 lib/circogen/blockpath.c | 4 ----
 lib/circogen/blocktree.c | 4 ----
 lib/common/arrows.c      | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/lib/circogen/blockpath.c b/lib/circogen/blockpath.c
index 986b30640..888e2de88 100644
--- a/lib/circogen/blockpath.c
+++ b/lib/circogen/blockpath.c
@@ -154,11 +154,7 @@ static void find_pair_edges(Agraph_t * g, Agnode_t * n, Agraph_t * outg)
 	    n2 = aghead(ep);
 	    if (n2 == n)
 		n2 = agtail(ep);
-#ifndef WITH_CGRAPH
 	    ex = agfindedge(g, n1, n2);
-#else /* WITH_CGRAPH */
-	    ex = agedge(g, n1, n2, NULL, 0);
-#endif /* WITH_CGRAPH */
 	    if (ex) {
 		has_pair_edge = 1;
 		if (n1 < n2) {	/* count edge only once */
diff --git a/lib/circogen/blocktree.c b/lib/circogen/blocktree.c
index 04b55d0d4..118462503 100644
--- a/lib/circogen/blocktree.c
+++ b/lib/circogen/blocktree.c
@@ -205,11 +205,7 @@ static void find_blocks(Agraph_t * g, circ_state * state)
     /*      check to see if there is a node which is set to be the root
      */
     if (state->rootname) {
-#ifndef WITH_CGRAPH
 	root = agfindnode(g, state->rootname);
-#else /* WITH_CGRAPH */
-	root = agnode(g, state->rootname,0);
-#endif /* WITH_CGRAPH */
     }
     if (!root && state->N_root) {
 	for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
diff --git a/lib/common/arrows.c b/lib/common/arrows.c
index 7338b7614..c77b25e68 100644
--- a/lib/common/arrows.c
+++ b/lib/common/arrows.c
@@ -213,11 +213,7 @@ void arrow_flags(Agedge_t * e, int *sflag, int *eflag)
 	edge_t *f;
 	int s0, e0;
 	/* pick up arrowhead of opposing edge */
-#ifdef WITH_CGRAPH
-	f = agedge(agraphof(aghead(e)), aghead(e), agtail(e), (char *)NULL, FALSE);
-#else
 	f = agfindedge(agraphof(aghead(e)), aghead(e), agtail(e));
-#endif
 	arrow_flags(f, &s0, &e0);
 	*eflag = *eflag | s0;
 	*sflag = *sflag | e0;
-- 
2.40.0