smyrna initFocus: use cgraph wrapper for allocations

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/cmd/smyrna/hier.c b/cmd/smyrna/hier.c
index d73149c419bdd9e44d5cd0f0b34df4f24414f277..6cdf6b7c5bfbb3f30770d4e75cbd427cb03901f1 100644 (file)
--- a/cmd/smyrna/hier.c
+++ b/cmd/smyrna/hier.c
@@ -13,7 +13,6 @@
 #include "hier.h"
 #include <math.h>
 #include <neatogen/delaunay.h>
-#include <common/memory.h>
 
 /* scale_coords:
  */
@@ -195,10 +194,10 @@ Hierarchy *makeHier(int nn, int ne, v_data * graph, double *x_coords,
 
 focus_t *initFocus(int ncnt)
 {
-    focus_t *fs = NEW(focus_t);
+    focus_t *fs = gv_alloc(sizeof(focus_t));
     fs->num_foci = 0;
-    fs->foci_nodes = N_NEW(ncnt, int);
-    fs->x_foci = N_NEW(ncnt, double);
-    fs->y_foci = N_NEW(ncnt, double);
+    fs->foci_nodes = gv_calloc(ncnt, sizeof(int));
+    fs->x_foci = gv_calloc(ncnt, sizeof(double));
+    fs->y_foci = gv_calloc(ncnt, sizeof(double));
     return fs;
 }