use macros

diff --git a/lib/pack/ptest.c b/lib/pack/ptest.c
index 6446f8eb542323fefceceb8f242aeab4deeb0899..89f593238ac8479e3c976988ca0e20fd01703904 100644 (file)
--- a/lib/pack/ptest.c
+++ b/lib/pack/ptest.c
@@ -165,8 +165,8 @@ static void initPos(Agraph_t * g)
     char *p;
     point *sp;
     int pn;
-    attrsym_t *N_pos = agfindattr(g->proto->n, "pos");
-    attrsym_t *E_pos = agfindattr(g->proto->e, "pos");
+    attrsym_t *N_pos = agfindnodeattr(g, "pos");
+    attrsym_t *E_pos = agfindedgeattr(g, "pos");
 
     assert(N_pos);
     if (!E_pos) {

diff --git a/lib/twopigen/circle.c b/lib/twopigen/circle.c
index 8bf26e354bec5316f36cd305ddebeeaa6a285b61..99ba44c96d752200ee19ea76aa555771b7f11020 100644 (file)
--- a/lib/twopigen/circle.c
+++ b/lib/twopigen/circle.c
@@ -258,11 +258,7 @@ static void setAbsolutePos(Agraph_t * g)
     double xf;
     double hyp;
 
-#ifndef WITH_CGRAPH
-    p = late_string(g, agfindattr(g->root, "ranksep"), NULL);
-#else /* WITH_CGRAPH */
-    p = late_string(g, agattr(g->root,AGRAPH, "ranksep", NULL), NULL);
-#endif /* WITH_CGRAPH */
+    p = late_string(g, agfindgraphattr(g->root, "ranksep"), NULL);
     if (p) {
        if (sscanf(p, "%lf", &xf) == 0)
            xf = DEF_RANKSEP;