]> granicus.if.org Git - graphviz/commitdiff
dotgen make_regular_edge: use cgraph wrappers for allocation
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Wed, 14 Sep 2022 01:38:00 +0000 (18:38 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Wed, 14 Sep 2022 01:39:23 +0000 (18:39 -0700)
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.

lib/dotgen/dotsplines.c

index f9a9f58415067332ad32f2b6a1d93eeef27f453a..13e10fc2756cbdf1336d9f06d48a61b772fabdce 100644 (file)
@@ -15,7 +15,6 @@
 
 #include <assert.h>
 #include <cgraph/alloc.h>
-#include <common/memory.h>
 #include <dotgen/dot.h>
 #include <limits.h>
 #include <math.h>
@@ -1850,8 +1849,8 @@ make_regular_edge(graph_t* g, spline_info_t* sp, path * P, edge_t ** edges, int
     fwdedge.out.base.data = (Agrec_t*)&fwdedgei;
 
     if (!pointfs) {
-       pointfs = N_GNEW(NUMPTS, pointf);
-       pointfs2 = N_GNEW(NUMPTS, pointf);
+       pointfs = gv_calloc(NUMPTS, sizeof(pointf));
+       pointfs2 = gv_calloc(NUMPTS, sizeof(pointf));
        numpts = NUMPTS;
        numpts2 = NUMPTS;
     }