From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 5 Sep 2022 15:48:16 +0000 (-0700)
Subject: label xlnew: use cgraph wrapper for allocation
X-Git-Tag: 6.0.1~8^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=572f1480d9a851ed84427e967fdf05255b415916;p=graphviz

label xlnew: 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/label/xlabels.c b/lib/label/xlabels.c
index 4574eb334..b09c3ad92 100644
--- a/lib/label/xlabels.c
+++ b/lib/label/xlabels.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #define XLABEL_INT
 #include <label/xlabels.h>
-#include <common/memory.h>
 
 extern int Verbose;
 
@@ -45,7 +44,7 @@ static int icompare(Dt_t * dt, void * v1, void * v2, Dtdisc_t * disc)
 static XLabels_t *xlnew(object_t * objs, int n_objs, xlabel_t * lbls,
                         int n_lbls, label_params_t * params)
 {
-    XLabels_t *xlp = NEW(XLabels_t);
+    XLabels_t *xlp = gv_alloc(sizeof(XLabels_t));
 
     /* used to load the rtree in hilbert space filling curve order */
     if (!(xlp->hdx = dtopen(&Hdisc, Dtobag))) {