Small cleanup and replace np->name with agnameof(np)

diff --git a/lib/fdpgen/fdp.h b/lib/fdpgen/fdp.h
index 6dcab4eb476cda2b263ff97d4c6789a1da5ce225..06f1b63cf0ac33c372dcd0db9340173a755640b4 100644 (file)
--- a/lib/fdpgen/fdp.h
+++ b/lib/fdpgen/fdp.h
@@ -128,8 +128,8 @@ struct fdpParms_s {
 typedef struct fdpParms_s fdpParms_t;
 
     extern void fdp_layout(Agraph_t * g);
+    extern void fdp_init_node_edge(Agraph_t * g);
     extern void fdp_cleanup(Agraph_t * g);
-    extern void fdp_init_node_edge(graph_t * g);
 
 #ifdef __cplusplus
 }

diff --git a/lib/fdpgen/tlayout.c b/lib/fdpgen/tlayout.c
index 444711dd194afca15a68a5f9b735d8e0cb4ff4a5..98d2ff2b680b318ca06c86df23bb9f4ddae18fe3 100644 (file)
--- a/lib/fdpgen/tlayout.c
+++ b/lib/fdpgen/tlayout.c
@@ -593,17 +593,17 @@ static pointf initPositions(graph_t * g, bport_t * pp)
                if (cnt > 1) {
                    ND_pos(np)[0] = p.x;
                    ND_pos(np)[1] = p.y;
-/* fprintf (stderr, "%s 1 (%g,%g)\n", np->name, p.x, p.y); */
+/* fprintf (stderr, "%s 1 (%g,%g)\n", agnameof(np), p.x, p.y); */
                } else if (cnt == 1) {
                    ND_pos(np)[0] = 0.98 * p.x + 0.1 * ctr.x;
                    ND_pos(np)[1] = 0.9 * p.y + 0.1 * ctr.y;
-/* fprintf (stderr, "%s %d (%g,%g)\n", np->name, cnt, ND_pos(np)[0], ND_pos(np)[1]); */
+/* fprintf (stderr, "%s %d (%g,%g)\n", agnameof(np), cnt, ND_pos(np)[0], ND_pos(np)[1]); */
                } else {
                    double angle = PItimes2 * drand48();
                    double radius = 0.9 * drand48();
                    ND_pos(np)[0] = radius * T_Wd * cos(angle);
                    ND_pos(np)[1] = radius * T_Ht * sin(angle);
-/* fprintf (stderr, "%s 0 (%g,%g)\n", np->name, ND_pos(np)[0], ND_pos(np)[1]); */
+/* fprintf (stderr, "%s 0 (%g,%g)\n", agnameof(np), ND_pos(np)[0], ND_pos(np)[1]); */
                }
                ND_pinned(np) = P_SET;
            }