ortho PQgen: 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/fPQ.c b/lib/ortho/fPQ.c
index 4f2de2947a2d85fb9803c2871d4c998b993f5c32..39de81aa8a2dfd8a0c754362cf7ee5159b250a45 100644 (file)
--- a/lib/ortho/fPQ.c
+++ b/lib/ortho/fPQ.c
@@ -11,7 +11,7 @@
 /* Priority Queue Code for shortest path in graph */
 
 #include "config.h"
-#include <common/memory.h>
+#include <cgraph/alloc.h>
 #include <assert.h>
 
 #include <ortho/fPQ.h>
@@ -25,7 +25,7 @@ void
 PQgen(int sz)
 {
   if (!pq) {
-    pq = N_NEW(sz+1,snode*);
+    pq = gv_calloc(sz + 1, sizeof(snode*));
     pq[0] = &guard;
     PQsize = sz;
   }

diff --git a/lib/ortho/fPQ.h b/lib/ortho/fPQ.h
index 40bb68d7d59e47c27fc6af3098950fc3f6503f78..47b8302f8f7412b2e99ae385879a521c4e11cd10 100644 (file)
--- a/lib/ortho/fPQ.h
+++ b/lib/ortho/fPQ.h
@@ -13,6 +13,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#include <cgraph/alloc.h>
 #include <ortho/sgraph.h>
 
 #define N_VAL(n) (n)->n_val
@@ -34,7 +35,7 @@ static void
 PQgen(int sz)
 {
   if (!pq) {
-    pq = N_NEW(sz+1,snode*);
+    pq = gv_calloc(sz + 1, sizeof(snode*));
     pq[0] = &guard;
     PQsize = sz;
   }