From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Thu, 15 Sep 2022 00:55:32 +0000 (-0700)
Subject: sparse SparseMatrix_multiply_vector: use cgraph wrappers for allocation
X-Git-Tag: 6.0.2~35^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c268f29cf6403dfc0370c97945fbc49bebdabcf4;p=graphviz

sparse SparseMatrix_multiply_vector: 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/sparse/SparseMatrix.c b/lib/sparse/SparseMatrix.c
index 83400e9c2..c3a7e9900 100644
--- a/lib/sparse/SparseMatrix.c
+++ b/lib/sparse/SparseMatrix.c
@@ -1045,7 +1045,7 @@ void SparseMatrix_multiply_vector(SparseMatrix A, double *v, double **res) {
   case MATRIX_TYPE_REAL:
     a = (double*) A->a;
     if (v){
-      if (!u) u = MALLOC(sizeof(double)*((size_t)m));
+      if (!u) u = gv_calloc((size_t)m, sizeof(double));
       for (i = 0; i < m; i++){
 	u[i] = 0.;
 	for (j = ia[i]; j < ia[i+1]; j++){
@@ -1054,7 +1054,7 @@ void SparseMatrix_multiply_vector(SparseMatrix A, double *v, double **res) {
       }
     } else {
       /* v is assumed to be all 1's */
-      if (!u) u = MALLOC(sizeof(double)*((size_t)m));
+      if (!u) u = gv_calloc((size_t)m, sizeof(double));
       for (i = 0; i < m; i++){
 	u[i] = 0.;
 	for (j = ia[i]; j < ia[i+1]; j++){
@@ -1066,7 +1066,7 @@ void SparseMatrix_multiply_vector(SparseMatrix A, double *v, double **res) {
   case MATRIX_TYPE_INTEGER:
     ai = (int*) A->a;
     if (v){
-      if (!u) u = MALLOC(sizeof(double)*((size_t)m));
+      if (!u) u = gv_calloc((size_t)m, sizeof(double));
       for (i = 0; i < m; i++){
 	u[i] = 0.;
 	for (j = ia[i]; j < ia[i+1]; j++){
@@ -1075,7 +1075,7 @@ void SparseMatrix_multiply_vector(SparseMatrix A, double *v, double **res) {
       }
     } else {
       /* v is assumed to be all 1's */
-      if (!u) u = MALLOC(sizeof(double)*((size_t)m));
+      if (!u) u = gv_calloc((size_t)m, sizeof(double));
       for (i = 0; i < m; i++){
 	u[i] = 0.;
 	for (j = ia[i]; j < ia[i+1]; j++){