From 37c5bc96d051b4d244051d38a10702b4841ff22e Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Thu, 17 Nov 2022 17:14:41 -0800 Subject: [PATCH] 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. --- lib/fdpgen/clusteredges.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/fdpgen/clusteredges.c b/lib/fdpgen/clusteredges.c index 3135a4b94..1971560d8 100644 --- a/lib/fdpgen/clusteredges.c +++ b/lib/fdpgen/clusteredges.c @@ -19,7 +19,7 @@ #define FDP_PRIVATE 1 #include "config.h" - +#include #include #include #include @@ -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; } } -- 2.50.1