From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 26 Dec 2022 05:41:23 +0000 (-0800)
Subject: neatogen new_array: use cgraph wrappers for allocation
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4029c2df565775431ff4e33817ec463642d97db6;p=graphviz

neatogen new_array: 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/neatogen/stuff.c b/lib/neatogen/stuff.c
index 6ea155d47..bb892b7df 100644
--- a/lib/neatogen/stuff.c
+++ b/lib/neatogen/stuff.c
@@ -10,7 +10,7 @@
 
 
 #include "config.h"
-
+#include	<cgraph/alloc.h>
 #include	<neatogen/neato.h>
 #include	<neatogen/stress.h>
 #include	<time.h>
@@ -44,12 +44,10 @@ static double distvec(double *p0, double *p1, double *vec)
 
 double **new_array(int m, int n, double ival)
 {
-    double **rv;
-    double *mem;
     int i, j;
 
-    rv = N_NEW(m, double *);
-    mem = N_NEW(m * n, double);
+    double **rv = gv_calloc(m, sizeof(double*));
+    double *mem = gv_calloc(m * n, sizeof(double));
     for (i = 0; i < m; i++) {
 	rv[i] = mem;
 	mem += n;