diff options
author | Thomas White <taw@physics.org> | 2024-01-16 12:03:15 +0100 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2024-02-06 16:59:34 +0100 |
commit | 4ad424f132dc3311502567e58b695fecdeb10106 (patch) | |
tree | 94fc0c1fe085de5f7e8553dced1f1b2a235fdf92 /libcrystfel/src/rational.c | |
parent | 5960cc81e3e35e4d38fdd720680c98bef070d695 (diff) |
Use libcrystfel memory allocation routines everywhere
Diffstat (limited to 'libcrystfel/src/rational.c')
-rw-r--r-- | libcrystfel/src/rational.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libcrystfel/src/rational.c b/libcrystfel/src/rational.c index 800decf5..88294745 100644 --- a/libcrystfel/src/rational.c +++ b/libcrystfel/src/rational.c @@ -198,7 +198,7 @@ Rational rtnl_abs(Rational a) */ char *rtnl_format(Rational rt) { - char *v = malloc(32); + char *v = cfmalloc(32); if ( v == NULL ) return NULL; if ( rt.den == 1 ) { snprintf(v, 31, "%lli", rt.num); @@ -217,7 +217,7 @@ Rational *rtnl_list(signed int num_min, signed int num_max, Rational *list; int n = 0; - list = malloc((1+num_max-num_min)*(1+den_max-den_min)*sizeof(Rational)); + list = cfmalloc((1+num_max-num_min)*(1+den_max-den_min)*sizeof(Rational)); if ( list == NULL ) return NULL; for ( num=num_min; num<=num_max; num++ ) { @@ -263,12 +263,12 @@ RationalMatrix *rtnl_mtx_new(unsigned int rows, unsigned int cols) RationalMatrix *m; int i; - m = malloc(sizeof(RationalMatrix)); + m = cfmalloc(sizeof(RationalMatrix)); if ( m == NULL ) return NULL; - m->v = calloc(rows*cols, sizeof(Rational)); + m->v = cfcalloc(rows*cols, sizeof(Rational)); if ( m->v == NULL ) { - free(m); + cffree(m); return NULL; } @@ -372,8 +372,8 @@ IntegerMatrix *intmat_from_rtnl_mtx(const RationalMatrix *m) void rtnl_mtx_free(RationalMatrix *mtx) { if ( mtx == NULL ) return; - free(mtx->v); - free(mtx); + cffree(mtx->v); + cffree(mtx); } @@ -412,7 +412,7 @@ int transform_fractional_coords_rtnl(const RationalMatrix *P, cm = rtnl_mtx_copy(P); if ( cm == NULL ) return 1; - vec = malloc(cm->rows*sizeof(Rational)); + vec = cfmalloc(cm->rows*sizeof(Rational)); if ( vec == NULL ) return 1; for ( h=0; h<cm->rows; h++ ) vec[h] = ivec[h]; @@ -489,7 +489,7 @@ int transform_fractional_coords_rtnl(const RationalMatrix *P, ans[i] = rtnl_div(sum, rtnl_mtx_get(cm, i, i)); } - free(vec); + cffree(vec); rtnl_mtx_free(cm); return 0; @@ -517,7 +517,7 @@ void rtnl_mtx_print(const RationalMatrix *m) for ( j=0; j<m->cols; j++ ) { char *v = rtnl_format(rtnl_mtx_get(m, i, j)); fprintf(stderr, "%4s ", v); - free(v); + cffree(v); } fprintf(stderr, "]\n"); } |