aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/detgeom.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2024-01-16 12:03:15 +0100
committerThomas White <taw@physics.org>2024-02-06 16:59:34 +0100
commit4ad424f132dc3311502567e58b695fecdeb10106 (patch)
tree94fc0c1fe085de5f7e8553dced1f1b2a235fdf92 /libcrystfel/src/detgeom.c
parent5960cc81e3e35e4d38fdd720680c98bef070d695 (diff)
Use libcrystfel memory allocation routines everywhere
Diffstat (limited to 'libcrystfel/src/detgeom.c')
-rw-r--r--libcrystfel/src/detgeom.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libcrystfel/src/detgeom.c b/libcrystfel/src/detgeom.c
index b4835317..39b00663 100644
--- a/libcrystfel/src/detgeom.c
+++ b/libcrystfel/src/detgeom.c
@@ -74,9 +74,9 @@ static void free_group(struct detgeom_panel_group *g)
free_group(g->children[i]);
}
- free(g->name);
- free(g->children);
- free(g);
+ cffree(g->name);
+ cffree(g->children);
+ cffree(g);
}
@@ -87,12 +87,12 @@ void detgeom_free(struct detgeom *detgeom)
if ( detgeom == NULL ) return;
for ( i=0; i<detgeom->n_panels; i++ ) {
- free(detgeom->panels[i].name);
+ cffree(detgeom->panels[i].name);
}
free_group(detgeom->top_group);
- free(detgeom->panels);
- free(detgeom);
+ cffree(detgeom->panels);
+ cffree(detgeom);
}
@@ -250,7 +250,7 @@ gsl_matrix **make_panel_minvs(struct detgeom *dg)
int i;
gsl_matrix **Minvs;
- Minvs = malloc(dg->n_panels * sizeof(gsl_matrix *));
+ Minvs = cfmalloc(dg->n_panels * sizeof(gsl_matrix *));
if ( Minvs == NULL ) return NULL;
for ( i=0; i<dg->n_panels; i++ ) {