Make many functions in dotprocs.h static to help me keep my sanity

trying to track down who can be called.

diff --git a/lib/dotgen/acyclic.c b/lib/dotgen/acyclic.c
index cdcc3f72b358d6792ce94e9354c678c30eb8ae1d..8af661628f4d6fd4ec1db400c736f2cbcef93ada 100644 (file)
--- a/lib/dotgen/acyclic.c
+++ b/lib/dotgen/acyclic.c
@@ -21,22 +21,19 @@
 
 #include "dot.h"
 
-
-void acyclic(graph_t * g)
+void reverse_edge(edge_t * e)
 {
-    int c;
-    node_t *n;
+    edge_t *f;
 
-    for (c = 0; c < GD_comp(g).size; c++) {
-       GD_nlist(g) = GD_comp(g).list[c];
-       for (n = GD_nlist(g); n; n = ND_next(n))
-           ND_mark(n) = FALSE;
-       for (n = GD_nlist(g); n; n = ND_next(n))
-           dfs(n);
-    }
+    delete_fast_edge(e);
+    if ((f = find_fast_edge(e->head, e->tail)))
+       merge_oneway(e, f);
+    else
+       virtual_edge(e->head, e->tail, e);
 }
 
-void dfs(node_t * n)
+static void 
+dfs(node_t * n)
 {
     int i;
     edge_t *e;
@@ -59,13 +56,18 @@ void dfs(node_t * n)
     ND_onstack(n) = FALSE;
 }
 
-void reverse_edge(edge_t * e)
+
+void acyclic(graph_t * g)
 {
-    edge_t *f;
+    int c;
+    node_t *n;
 
-    delete_fast_edge(e);
-    if ((f = find_fast_edge(e->head, e->tail)))
-       merge_oneway(e, f);
-    else
-       virtual_edge(e->head, e->tail, e);
+    for (c = 0; c < GD_comp(g).size; c++) {
+       GD_nlist(g) = GD_comp(g).list[c];
+       for (n = GD_nlist(g); n; n = ND_next(n))
+           ND_mark(n) = FALSE;
+       for (n = GD_nlist(g); n; n = ND_next(n))
+           dfs(n);
+    }
 }
+

diff --git a/lib/dotgen/class1.c b/lib/dotgen/class1.c
index 4aba37beaa094e50ad7156036e8816944f2b9a92..45a49739966d458480a3752e7841d5e8b0122c18 100644 (file)
--- a/lib/dotgen/class1.c
+++ b/lib/dotgen/class1.c
@@ -34,6 +34,38 @@ int nonconstraint_edge(edge_t * e)
     return FALSE;
 }
 
+static void 
+interclust1(graph_t * g, node_t * t, node_t * h, edge_t * e)
+{
+    node_t *v, *t0, *h0;
+    int offset, t_len, h_len, t_rank, h_rank;
+    edge_t *rt, *rh;
+
+    if (ND_clust(e->tail))
+       t_rank = ND_rank(e->tail) - ND_rank(GD_leader(ND_clust(e->tail)));
+    else
+       t_rank = 0;
+    if (ND_clust(e->head))
+       h_rank = ND_rank(e->head) - ND_rank(GD_leader(ND_clust(e->head)));
+    else
+       h_rank = 0;
+    offset = ED_minlen(e) + t_rank - h_rank;
+    if (offset > 0) {
+       t_len = 0;
+       h_len = offset;
+    } else {
+       t_len = -offset;
+       h_len = 0;
+    }
+
+    v = virtual_node(g);
+    ND_node_type(v) = SLACKNODE;
+    t0 = UF_find(t);
+    h0 = UF_find(h);
+    rt = make_aux_edge(v, t0, t_len, CL_BACK * ED_weight(e));
+    rh = make_aux_edge(v, h0, h_len, ED_weight(e));
+    ED_to_orig(rt) = ED_to_orig(rh) = e;
+}
 void class1(graph_t * g)
 {
     node_t *n, *t, *h;
@@ -92,34 +124,3 @@ void class1(graph_t * g)
     }
 }
 
-void interclust1(graph_t * g, node_t * t, node_t * h, edge_t * e)
-{
-    node_t *v, *t0, *h0;
-    int offset, t_len, h_len, t_rank, h_rank;
-    edge_t *rt, *rh;
-
-    if (ND_clust(e->tail))
-       t_rank = ND_rank(e->tail) - ND_rank(GD_leader(ND_clust(e->tail)));
-    else
-       t_rank = 0;
-    if (ND_clust(e->head))
-       h_rank = ND_rank(e->head) - ND_rank(GD_leader(ND_clust(e->head)));
-    else
-       h_rank = 0;
-    offset = ED_minlen(e) + t_rank - h_rank;
-    if (offset > 0) {
-       t_len = 0;
-       h_len = offset;
-    } else {
-       t_len = -offset;
-       h_len = 0;
-    }
-
-    v = virtual_node(g);
-    ND_node_type(v) = SLACKNODE;
-    t0 = UF_find(t);
-    h0 = UF_find(h);
-    rt = make_aux_edge(v, t0, t_len, CL_BACK * ED_weight(e));
-    rh = make_aux_edge(v, h0, h_len, ED_weight(e));
-    ED_to_orig(rt) = ED_to_orig(rh) = e;
-}