From 9755994609973ee5325530052a241f85469da864 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Wed, 13 Sep 2017 13:41:00 +0200 Subject: Make proj_destroy and proj_context_destroy behave in the same way. --- src/pj_obs_api.c | 7 ++++--- src/proj.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/pj_obs_api.c b/src/pj_obs_api.c index 6f9644b1..df8cfa3d 100644 --- a/src/pj_obs_api.c +++ b/src/pj_obs_api.c @@ -501,15 +501,16 @@ PJ_CONTEXT *proj_context_create (void) { } -void proj_context_destroy (PJ_CONTEXT *ctx) { +PJ_CONTEXT *proj_context_destroy (PJ_CONTEXT *ctx) { if (0==ctx) - return; + return 0; /* Trying to free the default context is a no-op (since it is statically allocated) */ if (pj_get_default_ctx ()==ctx) - return; + return 0; pj_ctx_free (ctx); + return 0; } diff --git a/src/proj.h b/src/proj.h index badde4cc..e1990e34 100644 --- a/src/proj.h +++ b/src/proj.h @@ -357,7 +357,7 @@ typedef struct projCtx_t PJ_CONTEXT; /* Functionality for handling thread contexts */ #define PJ_DEFAULT_CTX 0 PJ_CONTEXT *proj_context_create (void); -void proj_context_destroy (PJ_CONTEXT *ctx); +PJ_CONTEXT *proj_context_destroy (PJ_CONTEXT *ctx); -- cgit v1.2.3