ortho orthoEdges: use cgraph wrappers for allocation

The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.

diff --git a/lib/ortho/ortho.c b/lib/ortho/ortho.c
index dbfe7bc83da743bd8806c6d1d322ffaf6ee3be26..e99bc6cd6d8ab4d36be70b3075ec7e8bdef1270f 100644 (file)
--- a/lib/ortho/ortho.c
+++ b/lib/ortho/ortho.c
@@ -31,7 +31,6 @@
 #include <cgraph/alloc.h>
 #include <cgraph/exit.h>
 #include <cgraph/unused.h>
-#include <common/memory.h>
 #include <common/geomprocs.h>
 #include <common/globals.h>
 #include <common/render.h>
@@ -1250,7 +1249,7 @@ orthoEdges (Agraph_t* g, int doLbls)
     Agedge_t* e;
     snode* sn;
     snode* dn;
-    epair_t* es = N_GNEW(agnedges(g), epair_t);
+    epair_t* es = gv_calloc(agnedges(g), sizeof(epair_t));
     cell* start;
     cell* dest;
     PointSet* ps = NULL;
@@ -1320,7 +1319,7 @@ orthoEdges (Agraph_t* g, int doLbls)
        }
     }
 
-    route_list = N_NEW (n_edges, route);
+    route_list = gv_calloc(n_edges, sizeof(route));
 
     qsort(es, n_edges, sizeof(epair_t), (qsort_cmpf) edgecmp);