From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 18 Nov 2022 01:14:41 +0000 (-0800)
Subject: fdpgen mkDeriveNode: use cgraph wrappers for allocation
X-Git-Tag: 7.0.3~7^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2f1fc6812bfb1309388e12b268aa1c1c3536108;p=graphviz

fdpgen mkDeriveNode: 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/fdpgen/layout.c b/lib/fdpgen/layout.c
index 61a036424..a4226ab4b 100644
--- a/lib/fdpgen/layout.c
+++ b/lib/fdpgen/layout.c
@@ -32,6 +32,7 @@
 #include <limits.h>
 #include <inttypes.h>
 #include <assert.h>
+#include <cgraph/alloc.h>
 #include <fdpgen/tlayout.h>
 #include <math.h>
 #include <neatogen/neatoprocs.h>
@@ -184,8 +185,8 @@ static node_t *mkDeriveNode(graph_t * dg, char *name)
 
     dn = agnode(dg, name,1);
     agbindrec(dn, "Agnodeinfo_t", sizeof(Agnodeinfo_t), true);	//node custom data
-    ND_alg(dn) = NEW(dndata);	/* free in freeDeriveNode */
-    ND_pos(dn) = N_GNEW(GD_ndim(dg), double);
+    ND_alg(dn) = gv_alloc(sizeof(dndata)); // free in freeDeriveNode
+    ND_pos(dn) = gv_calloc(GD_ndim(dg), sizeof(double));
     /* fprintf (stderr, "Creating %s\n", dn->name); */
     return dn;
 }