fdpgen newBlock: 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/fdpgen/grid.c b/lib/fdpgen/grid.c
index 71fdbaab785dbc4c2895001e87952c431d0d605e..e71780cc67bc7d639fe3d515dab8754d04db902a 100644 (file)
--- a/lib/fdpgen/grid.c
+++ b/lib/fdpgen/grid.c
@@ -21,6 +21,7 @@
 /* uses PRIVATE interface for NOTUSED */
 #define FDP_PRIVATE 1
 
+#include <cgraph/alloc.h>
 #include <fdpgen/fdp.h>
 #include <fdpgen/grid.h>
 #include <common/macros.h>
@@ -40,11 +41,9 @@ typedef struct _block {
  */
 static block_t *newBlock(int size)
 {
-    block_t *newb;
-
-    newb = GNEW(block_t);
+    block_t *newb = gv_alloc(sizeof(block_t));
     newb->next = 0;
-    newb->mem = N_GNEW(size, cell);
+    newb->mem = gv_calloc(size, sizeof(cell));
     newb->endp = newb->mem + size;
     newb->cur = newb->mem;