From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 28 Aug 2022 20:09:30 +0000 (-0700)
Subject: sfdpgen beautify_leaves: use cgraph wrappers for allocation
X-Git-Tag: 6.0.1~14^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2200740c4ac71f405f0f1f601b7dbccfafb8097;p=graphviz

sfdpgen beautify_leaves: 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/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index 5bb85de25..e316c46d6 100644
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -374,9 +374,8 @@ static void beautify_leaves(int dim, SparseMatrix A, double *x){
   assert(!SparseMatrix_has_diagonal(A));
 
   bitarray_t checked = bitarray_new_or_exit(m);
-  angles = MALLOC(sizeof(double)*nangles_max);
-  leaves = MALLOC(sizeof(int)*nleaves_max);
-
+  angles = gv_calloc(nangles_max, sizeof(double));
+  leaves = gv_calloc(nleaves_max, sizeof(int));
 
   for (i = 0; i < m; i++){
     if (ia[i+1] - ia[i] != 1) continue;