From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 21 Sep 2022 02:13:48 +0000 (-0700)
Subject: pack genPoly: use cgraph wrapper for allocation
X-Git-Tag: 6.0.2~31^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed3549fdfe6ba1d253dbefc86a9497ccbf414992;p=graphviz

pack genPoly: use cgraph wrapper 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/pack/pack.c b/lib/pack/pack.c
index 4f07356a5..b1cc17756 100644
--- a/lib/pack/pack.c
+++ b/lib/pack/pack.c
@@ -16,6 +16,7 @@
 
 #include <math.h>
 #include <assert.h>
+#include <cgraph/alloc.h>
 #include <common/render.h>
 #include <pack/pack.h>
 #include <common/pointset.h>
@@ -306,10 +307,9 @@ genPoly(Agraph_t * root, Agraph_t * g, ginfo * info,
 
     if (pinfo->mode == l_clust) {
 	int i;
-	void **alg;
 
 	/* backup the alg data */
-	alg = N_GNEW(agnnodes(g), void *);
+	void **alg = gv_calloc(agnnodes(g), sizeof(void*));
 	for (i = 0, n = agfstnode(g); n; n = agnxtnode(g, n)) {
 	    alg[i++] = ND_alg(n);
 	    ND_alg(n) = 0;