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

index ae67a7923ebe55fb2fc3be8921ecb40a1d855c1c..8b7440f31cb055cb9fc0ee3c8d16f7bab1110ebc 100644 (file)
@@ -195,11 +195,10 @@ static void computeLayerWidths(graph_t * g)
     /* allocate memory
      * the number of layers can go up to the number of node groups
      */
-    layerWidthInfo = N_NEW(nNodeGroups, layerWidthInfo_t);
+    layerWidthInfo = gv_calloc(nNodeGroups, sizeof(layerWidthInfo_t));
 
     for (i = 0; i < nNodeGroups; i++) {
-       layerWidthInfo[i].nodeGroupsInLayer =
-           N_NEW(nNodeGroups, nodeGroup_t *);
+       layerWidthInfo[i].nodeGroupsInLayer = gv_calloc(nNodeGroups, sizeof(nodeGroup_t*));
 
        assert(nNodeGroups >= 0);
        layerWidthInfo[i].removed = bitarray_new_or_exit((size_t)nNodeGroups);