fdpgen addObj: 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/clusteredges.c b/lib/fdpgen/clusteredges.c
index 3135a4b9474f3a47b7f422de3038e2cdcfb8fa89..1971560d8c382ca5854387f01eef60effad6505f 100644 (file)
--- a/lib/fdpgen/clusteredges.c
+++ b/lib/fdpgen/clusteredges.c
@@ -19,7 +19,7 @@
 #define FDP_PRIVATE 1
 
 #include "config.h"
-
+#include <cgraph/alloc.h>
 #include <fdpgen/clusteredges.h>
 #include <fdpgen/fdp.h>
 #include <neatogen/neatoprocs.h>
@@ -63,10 +63,10 @@ static void addObj(objlist * l, Ppoly_t * obj)
 {
     if (l->sz == l->cnt) {
        if (l->obs) {
+           l->obs = gv_recalloc(l->obs, l->sz, l->sz * 2, sizeof(Ppoly_t*));
            l->sz *= 2;
-           l->obs = RALLOC(l->sz, l->obs, Ppoly_t *);
        } else {
-           l->obs = N_GNEW(INIT_SZ, Ppoly_t *);
+           l->obs = gv_calloc(INIT_SZ, sizeof(Ppoly_t*));
            l->sz = INIT_SZ;
        }
     }