From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 3 Sep 2022 18:01:45 +0000 (-0700)
Subject: ortho initSEdges: use cgraph wrappers for allocation
X-Git-Tag: 6.0.1~11^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bbb803d79912012d2b9627bae5a2a0ead70463f;p=graphviz

ortho initSEdges: 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/ortho/sgraph.c b/lib/ortho/sgraph.c
index 2e7d4b9b9..591a34a54 100644
--- a/lib/ortho/sgraph.c
+++ b/lib/ortho/sgraph.c
@@ -10,7 +10,7 @@
 
 
 #include "config.h"
-
+#include <cgraph/alloc.h>
 #include <limits.h>
 #include <common/memory.h>
 #include <ortho/sgraph.h>
@@ -42,8 +42,8 @@ void
 initSEdges (sgraph* g, int maxdeg)
 {
     int i;
-    int* adj = N_NEW (6*g->nnodes + 2*maxdeg, int);
-    g->edges = N_NEW (3*g->nnodes + maxdeg, sedge);
+    int* adj = gv_calloc(6 * g->nnodes + 2 * maxdeg, sizeof(int));
+    g->edges = gv_calloc(3 * g->nnodes + maxdeg, sizeof(sedge));
     for (i = 0; i < g->nnodes; i++) {
 	g->nodes[i].adj_edge_list = adj;
 	adj += 6;