From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 14 Sep 2022 01:38:00 +0000 (-0700)
Subject: dotgen make_regular_edge: use cgraph wrappers for allocation
X-Git-Tag: 6.0.2~38^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80c242ec99402c8e86ffccb5938b8852e78694ce;p=graphviz

dotgen make_regular_edge: 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/dotgen/dotsplines.c b/lib/dotgen/dotsplines.c
index f9a9f5841..13e10fc27 100644
--- a/lib/dotgen/dotsplines.c
+++ b/lib/dotgen/dotsplines.c
@@ -15,7 +15,6 @@
 
 #include <assert.h>
 #include <cgraph/alloc.h>
-#include <common/memory.h>
 #include <dotgen/dot.h>
 #include <limits.h>
 #include <math.h>
@@ -1850,8 +1849,8 @@ make_regular_edge(graph_t* g, spline_info_t* sp, path * P, edge_t ** edges, int
     fwdedge.out.base.data = (Agrec_t*)&fwdedgei;
 
     if (!pointfs) {
-	pointfs = N_GNEW(NUMPTS, pointf);
-   	pointfs2 = N_GNEW(NUMPTS, pointf);
+	pointfs = gv_calloc(NUMPTS, sizeof(pointf));
+   	pointfs2 = gv_calloc(NUMPTS, sizeof(pointf));
 	numpts = NUMPTS;
 	numpts2 = NUMPTS;
     }