From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 18 Nov 2022 01:14:41 +0000 (-0800)
Subject: neatogen computeScaleXY: use cgraph wrapper for allocation
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48b5e238b3352d5002e33aae7ebeef9c3e6177f6;p=graphviz

neatogen computeScaleXY: 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/neatogen/constraint.c b/lib/neatogen/constraint.c
index e8cb838a2..98a550096 100644
--- a/lib/neatogen/constraint.c
+++ b/lib/neatogen/constraint.c
@@ -730,7 +730,6 @@ static pointf *mkOverlapSet(info *nl, size_t nn, size_t *cntp) {
 }
 
 static pointf computeScaleXY(pointf *aarr, size_t m) {
-    pointf *barr;
     double cost, bestcost;
     pointf scale;
 
@@ -738,7 +737,7 @@ static pointf computeScaleXY(pointf *aarr, size_t m) {
     aarr[0].y = HUGE_VAL;
     qsort(aarr + 1, m - 1, sizeof(pointf), (sortfn_t)sortf);
 
-    barr = N_GNEW(m, pointf);
+    pointf *barr = gv_calloc(m, sizeof(pointf));
     barr[m - 1].x = aarr[m - 1].x;
     barr[m - 1].y = 1;
     for (size_t k = m - 2; m > 1; k--) {