sfdpgen shorting_edge_label_nodes: 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/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index 3ea60eddb6d8e1ef7f929b473701d1d58e774a18..5d733ee590ee56f497266709bcb7c26708ee23bb 100644 (file)
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -1776,12 +1776,11 @@ static void attach_edge_label_coordinates(int dim, SparseMatrix A, int n_edge_la
 }
 
 static SparseMatrix shorting_edge_label_nodes(SparseMatrix A, int n_edge_label_nodes, int *edge_label_nodes){
-  int *mask;
   int i, id = 0, nz, j, jj, ii;
   int *ia = A->ia, *ja = A->ja, *irn = NULL, *jcn = NULL;
   SparseMatrix B;
 
-  mask = MALLOC(sizeof(int)*A->m);
+  int *mask = gv_calloc(A->m, sizeof(int));
 
   for (i = 0; i < A->m; i++) mask[i] = 1;
 
@@ -1809,8 +1808,8 @@ static SparseMatrix shorting_edge_label_nodes(SparseMatrix A, int n_edge_label_n
   }
 
   if (nz > 0) {
-    irn = MALLOC(sizeof(int)*nz);
-    jcn = MALLOC(sizeof(int)*nz);
+    irn = gv_calloc(nz, sizeof(int));
+    jcn = gv_calloc(nz, sizeof(int));
   }
 
   nz = 0;