diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2017-11-27 20:21:52 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2017-11-27 20:23:25 +0100 |
| commit | f0181b0a24d9d3a8bb593811945fea008128f94a (patch) | |
| tree | c4ef5fc40f00481755c86f383be839b7b81eac68 /src/pj_malloc.c | |
| parent | 25b011042fdff451ca2826afe82251c06d883fb8 (diff) | |
| parent | 1f48f4c333bfe135296d3be643ef4981dc401c38 (diff) | |
| download | PROJ-f0181b0a24d9d3a8bb593811945fea008128f94a.tar.gz PROJ-f0181b0a24d9d3a8bb593811945fea008128f94a.zip | |
Merge remote-tracking branch 'osgeo/master' into docs-release-4.10.0
Diffstat (limited to 'src/pj_malloc.c')
| -rw-r--r-- | src/pj_malloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pj_malloc.c b/src/pj_malloc.c index c003c717..c9275074 100644 --- a/src/pj_malloc.c +++ b/src/pj_malloc.c @@ -103,7 +103,7 @@ void pj_dalloc(void *ptr) { /**********************************************************************/ free(ptr); } - + /**********************************************************************/ void *pj_dealloc (void *ptr) { @@ -150,7 +150,7 @@ void *pj_dealloc_params (projCtx ctx, paralist *start, int errlev) { Also called from pj_init_ctx when encountering errors before the PJ proper is allocated. -******************************************************************************/ +******************************************************************************/ paralist *t, *n; for (t = start; t; t = n) { n = t->next; @@ -177,12 +177,12 @@ void *pj_default_destructor (PJ *P, int errlev) { /* Destructor */ if (0==P) return 0; - + /* free grid lists */ pj_dealloc( P->gridlist ); pj_dealloc( P->vgridlist_geoid ); pj_dealloc( P->catalog_name ); - + /* We used to call pj_dalloc( P->catalog ), but this will leak */ /* memory. The safe way to clear catalog and grid is to call */ /* pj_gc_unloadall(pj_get_default_ctx()); and pj_deallocate_grids(); */ @@ -191,7 +191,7 @@ void *pj_default_destructor (PJ *P, int errlev) { /* Destructor */ /* free the interface to Charles Karney's geodesic library */ pj_dealloc( P->geod ); - + /* free parameter list elements */ pj_dealloc_params (pj_get_ctx(P), P->params, errlev); |
