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

ortho createSGraph: 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 591a34a54..215888396 100644
--- a/lib/ortho/sgraph.c
+++ b/lib/ortho/sgraph.c
@@ -12,7 +12,6 @@
 #include "config.h"
 #include <cgraph/alloc.h>
 #include <limits.h>
-#include <common/memory.h>
 #include <ortho/sgraph.h>
 #include <ortho/fPQ.h>
 
@@ -57,11 +56,11 @@ initSEdges (sgraph* g, int maxdeg)
 sgraph*
 createSGraph (int nnodes)
 {
-    sgraph* g = NEW(sgraph);
+    sgraph* g = gv_alloc(sizeof(sgraph));
 
 	/* create the nodes vector in the search graph */
     g->nnodes = 0;
-    g->nodes = N_NEW(nnodes, snode);
+    g->nodes = gv_calloc(nnodes, sizeof(snode));
     return g;
 }